-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add implementation for TransformerFactory XXE recipe (#97)
Co-authored-by: Tim te Beek <[email protected]>
- Loading branch information
Showing
5 changed files
with
939 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
src/main/java/org/openrewrite/java/security/xml/TransformerFactoryFixVisitor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
/* | ||
* Copyright 2023 the original author or authors. | ||
* <p> | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* <p> | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* <p> | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.openrewrite.java.security.xml; | ||
|
||
import lombok.AllArgsConstructor; | ||
import org.openrewrite.Cursor; | ||
import org.openrewrite.ExecutionContext; | ||
import org.openrewrite.Preconditions; | ||
import org.openrewrite.TreeVisitor; | ||
import org.openrewrite.java.JavaIsoVisitor; | ||
import org.openrewrite.java.MethodMatcher; | ||
import org.openrewrite.java.search.UsesType; | ||
import org.openrewrite.java.tree.J; | ||
import org.openrewrite.java.tree.TypeUtils; | ||
|
||
import javax.xml.XMLConstants; | ||
|
||
@AllArgsConstructor | ||
public class TransformerFactoryFixVisitor<P> extends JavaIsoVisitor<P> { | ||
static final MethodMatcher TRANSFORMER_FACTORY_INSTANCE = new MethodMatcher("javax.xml.transform.TransformerFactory new*()"); | ||
static final MethodMatcher TRANSFORMER_FACTORY_SET_ATTRIBUTE = new MethodMatcher("javax.xml.transform.TransformerFactory setAttribute(java.lang.String, ..)"); | ||
static final MethodMatcher TRANSFORMER_FACTORY_SET_FEATURE = new MethodMatcher("javax.xml.transform.TransformerFactory setFeature(java.lang.String, ..)"); | ||
|
||
private static final String TRANSFORMER_FACTORY_FQN = "javax.xml.transform.TransformerFactory"; | ||
private static final String ACCESS_EXTERNAL_DTD_NAME = "ACCESS_EXTERNAL_DTD"; | ||
private static final String ACCESS_EXTERNAL_STYLESHEET_NAME = "ACCESS_EXTERNAL_STYLESHEET"; | ||
private static final String FEATURE_SECURE_PROCESSING_NAME = "FEATURE_SECURE_PROCESSING"; | ||
|
||
private static final String TRANSFORMER_FACTORY_INITIALIZATION_METHOD = "transformer-factory-initialization-method"; | ||
private static final String TRANSFORMER_FACTORY_VARIABLE_NAME = "transformer-factory-variable-name"; | ||
|
||
private static final String DISALLOW_MODIFY_FLAG = "DISALLOW_MODIFY_FLAG"; | ||
|
||
@Override | ||
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, P ctx) { | ||
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx); | ||
Cursor supportsExternalCursor = getCursor().getMessage(ACCESS_EXTERNAL_DTD_NAME); | ||
Cursor supportsStylesheetCursor = getCursor().getMessage(ACCESS_EXTERNAL_STYLESHEET_NAME); | ||
Cursor supportsFeatureSecureProcessing = getCursor().getMessage(FEATURE_SECURE_PROCESSING_NAME); | ||
Cursor initializationCursor = getCursor().getMessage(TRANSFORMER_FACTORY_INITIALIZATION_METHOD); | ||
Cursor disallowModifyFlagCursor = getCursor().getMessage(DISALLOW_MODIFY_FLAG); | ||
String transformerFactoryVariableName = getCursor().getMessage(TRANSFORMER_FACTORY_VARIABLE_NAME); | ||
|
||
Cursor setAttributeBlockCursor = null; | ||
if (supportsExternalCursor == null && supportsStylesheetCursor == null && supportsFeatureSecureProcessing == null) { | ||
setAttributeBlockCursor = initializationCursor; | ||
} else if ((supportsExternalCursor == null ^ supportsStylesheetCursor == null) || (supportsStylesheetCursor == null ^ supportsFeatureSecureProcessing == null)) { | ||
if (supportsExternalCursor != null) { | ||
setAttributeBlockCursor = supportsExternalCursor; | ||
} else if (supportsStylesheetCursor != null) { | ||
setAttributeBlockCursor = supportsStylesheetCursor; | ||
} else { | ||
setAttributeBlockCursor = supportsFeatureSecureProcessing; | ||
} | ||
} | ||
if (disallowModifyFlagCursor == null && setAttributeBlockCursor != null && transformerFactoryVariableName != null) { | ||
doAfterVisit(new TransformerFactoryInsertAttributeStatementVisitor<>( | ||
setAttributeBlockCursor.getValue(), | ||
transformerFactoryVariableName, | ||
supportsExternalCursor == null, | ||
supportsStylesheetCursor == null, | ||
supportsFeatureSecureProcessing == null | ||
)); | ||
} | ||
return cd; | ||
} | ||
|
||
@Override | ||
public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, P ctx) { | ||
J.VariableDeclarations.NamedVariable v = super.visitVariable(variable, ctx); | ||
if (TypeUtils.isOfClassType(v.getType(), TRANSFORMER_FACTORY_FQN)) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, TRANSFORMER_FACTORY_VARIABLE_NAME, v.getSimpleName()); | ||
} | ||
return v; | ||
} | ||
|
||
@Override | ||
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, P ctx) { | ||
J.MethodInvocation m = super.visitMethodInvocation(method, ctx); | ||
if (TRANSFORMER_FACTORY_INSTANCE.matches(m)) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, TRANSFORMER_FACTORY_INITIALIZATION_METHOD, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} else if (TRANSFORMER_FACTORY_SET_ATTRIBUTE.matches(m) && m.getArguments().get(0) instanceof J.FieldAccess) { | ||
// If either attribute value is not equal to the empty string, do not make any changes | ||
if (m.getArguments().get(1) instanceof J.Literal) { | ||
J.Literal string = (J.Literal) m.getArguments().get(1); | ||
assert string.getValue() != null; | ||
if (!(((String) string.getValue()).isEmpty())) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, DISALLOW_MODIFY_FLAG, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} | ||
} | ||
J.FieldAccess fa = (J.FieldAccess) m.getArguments().get(0); | ||
if (ACCESS_EXTERNAL_DTD_NAME.equals(fa.getSimpleName())) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, ACCESS_EXTERNAL_DTD_NAME, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} else if (ACCESS_EXTERNAL_STYLESHEET_NAME.equals(fa.getSimpleName())) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, ACCESS_EXTERNAL_STYLESHEET_NAME, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} | ||
} else if (TRANSFORMER_FACTORY_SET_FEATURE.matches(m)) { | ||
// If FEATURE_SECURE_PROCESSING is set to false, do not make any changes | ||
if (m.getArguments().get(1) instanceof J.Literal) { | ||
J.Literal bool = (J.Literal) m.getArguments().get(1); | ||
assert bool.getValue() != null; | ||
if (!((Boolean) bool.getValue())) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, DISALLOW_MODIFY_FLAG, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} | ||
} | ||
if (m.getArguments().get(0) instanceof J.FieldAccess) { | ||
J.FieldAccess fa = (J.FieldAccess) m.getArguments().get(0); | ||
if (FEATURE_SECURE_PROCESSING_NAME.equals(fa.getSimpleName())) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, FEATURE_SECURE_PROCESSING_NAME, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} | ||
} else if (m.getArguments().get(0) instanceof J.Literal) { | ||
J.Literal literal = (J.Literal) m.getArguments().get(0); | ||
if (XMLConstants.FEATURE_SECURE_PROCESSING.equals(literal.getValue())) { | ||
getCursor().putMessageOnFirstEnclosing(J.ClassDeclaration.class, FEATURE_SECURE_PROCESSING_NAME, getCursor().dropParentUntil(J.Block.class::isInstance)); | ||
} | ||
} | ||
} | ||
return m; | ||
} | ||
|
||
public static TreeVisitor<?, ExecutionContext> create(ExternalDTDAccumulator acc) { | ||
return Preconditions.check(new UsesType<>(TRANSFORMER_FACTORY_FQN, true), new TransformerFactoryFixVisitor<>()); | ||
} | ||
} |
91 changes: 91 additions & 0 deletions
91
.../org/openrewrite/java/security/xml/TransformerFactoryInsertAttributeStatementVisitor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
/* | ||
* Copyright 2023 the original author or authors. | ||
* <p> | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* <p> | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* <p> | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.openrewrite.java.security.xml; | ||
|
||
import org.openrewrite.Cursor; | ||
import org.openrewrite.java.JavaIsoVisitor; | ||
import org.openrewrite.java.JavaTemplate; | ||
import org.openrewrite.java.tree.J; | ||
import org.openrewrite.java.tree.JavaCoordinates; | ||
import org.openrewrite.java.tree.Statement; | ||
|
||
public class TransformerFactoryInsertAttributeStatementVisitor<P> extends JavaIsoVisitor<P> { | ||
private final J.Block scope; | ||
private final StringBuilder attributeTemplate = new StringBuilder(); | ||
private final String transformerFactoryVariableName; | ||
|
||
public TransformerFactoryInsertAttributeStatementVisitor( | ||
J.Block scope, | ||
String factoryVariableName, | ||
boolean needsExternalEntitiesDisabled, | ||
boolean needsStylesheetsDisabled, | ||
boolean needsFeatureSecureProcessing | ||
) { | ||
this.scope = scope; | ||
this.transformerFactoryVariableName = factoryVariableName; | ||
|
||
if (needsExternalEntitiesDisabled) { | ||
attributeTemplate.append(transformerFactoryVariableName).append(".setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, \"\");"); | ||
} | ||
if (needsStylesheetsDisabled) { | ||
attributeTemplate.append(transformerFactoryVariableName).append(".setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, \"\");"); | ||
} | ||
if (needsFeatureSecureProcessing) { | ||
attributeTemplate.append(transformerFactoryVariableName).append(".setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);"); | ||
} | ||
} | ||
|
||
@Override | ||
public J.Block visitBlock(J.Block block, P ctx) { | ||
J.Block b = super.visitBlock(block, ctx); | ||
Statement beforeStatement = null; | ||
if (b.isScope(scope)) { | ||
for (int i = b.getStatements().size() - 2; i > -1; i--) { | ||
Statement st = b.getStatements().get(i); | ||
Statement stBefore = b.getStatements().get(i + 1); | ||
if (st instanceof J.MethodInvocation) { | ||
J.MethodInvocation m = (J.MethodInvocation) st; | ||
if (TransformerFactoryFixVisitor.TRANSFORMER_FACTORY_INSTANCE.matches(m) || TransformerFactoryFixVisitor.TRANSFORMER_FACTORY_SET_ATTRIBUTE.matches(m)) { | ||
beforeStatement = stBefore; | ||
} | ||
} else if (st instanceof J.VariableDeclarations) { | ||
J.VariableDeclarations vd = (J.VariableDeclarations) st; | ||
if (vd.getVariables().get(0).getInitializer() instanceof J.MethodInvocation) { | ||
J.MethodInvocation m = (J.MethodInvocation) vd.getVariables().get(0).getInitializer(); | ||
if (m != null && TransformerFactoryFixVisitor.TRANSFORMER_FACTORY_INSTANCE.matches(m)) { | ||
beforeStatement = stBefore; | ||
} | ||
} | ||
} | ||
} | ||
|
||
if (getCursor().getParent() != null && getCursor().getParent().getValue() instanceof J.ClassDeclaration) { | ||
attributeTemplate.insert(0, "{").append("}"); | ||
} | ||
JavaCoordinates insertCoordinates = beforeStatement != null ? | ||
beforeStatement.getCoordinates().before() : | ||
b.getCoordinates().lastStatement(); | ||
b = JavaTemplate | ||
.builder(attributeTemplate.toString()) | ||
.imports("javax.xml.XMLConstants") | ||
.contextSensitive() | ||
.build() | ||
.apply(new Cursor(getCursor().getParent(), b), insertCoordinates); | ||
maybeAddImport("javax.xml.XMLConstants"); | ||
} | ||
return b; | ||
} | ||
} |
Oops, something went wrong.