8000 Java: Promote experimental XXE sinks by atorralba · Pull Request #12932 · github/codeql · GitHub
[go: up one dir, main page]
Skip to content

Java: Promote experimental XXE sinks #12932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 17, 2023
Merged

Java: Promote experimental XXE sinks #12932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b65937
Move ConstantStringExpr to RangeUtils.qll
atorralba Apr 26, 2023
1e66a54
Promote exxperimental XXE sinks
atorralba Apr 26, 2023
db73e16
Add tests
atorralba Apr 26, 2023
e54eaed
Refactor tests to use InlineFlowTest
atorralba Apr 26, 2023
fba61d5
Remove experimental files
atorralba Apr 26, 2023
4606df5
Add change note
atorralba Apr 26, 2023
770099f
Merge branch 'main' into atorralba/java/promote-xxe-experimental-sinks
atorralba May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move ConstantStringExpr to RangeUtils.qll
  • Loading branch information
@atorralba
atorralba committed Apr 26, 2023
commit 8b6593715937de30d66b9d144286661fceea5fa0
19 changes: 19 additions & 0 deletions java/ql/lib/semmle/code/java/dataflow/RangeUtils.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,17 @@ private predicate constantBooleanExpr(Expr e, boolean val) {
CalcConstants::calculateBooleanValue(e) = val
}

pragma[nomagic]
private predicate constantStringExpr(Expr e, string val) {
e.(CompileTimeConstantExpr).getStringValue() = val
or
exists(SsaExplicitUpdate v, Expr src |
e = v.getAUse() and
src = v.getDefiningExpr().(VariableAssign).getSource() and
constantStringExpr(src, val)
)
}

private boolean getBoolValue(Expr e) { constantBooleanExpr(e, result) }

private int getIntValue(Expr e) { constantIntegerExpr(e, result) }
Expand All @@ -126,6 +137,14 @@ class ConstantBooleanExpr extends Expr {
boolean getBooleanValue() { constantBooleanExpr(this, result) }
}

/** An expression that always has the same string value. */
class ConstantStringExpr extends Expr {
ConstantStringExpr() { constantStringExpr(this, _) }

/** Get the string value of this expression. */
string getStringValue() { constantStringExpr(this, result) }
}

/**
* Gets an expression that equals `v - d`.
*/
Expand Down
24 changes: 1 addition & 23 deletions java/ql/lib/semmle/code/java/security/XmlParsers.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import java
import semmle.code.java.dataflow.DataFlow
import semmle.code.java.dataflow.DataFlow2
import semmle.code.java.dataflow.DataFlow3
import semmle.code.java.dataflow.DataFlow4
import semmle.code.java.dataflow.DataFlow5
private import semmle.code.java.dataflow.SSA
private import semmle.code.java.dataflow.RangeUtils

/*
* Various XML parsers in Java.
Expand Down Expand Up @@ -130,26 +128,6 @@ class DocumentBuilderFactoryConfig extends ParserConfig {
}
}

private predicate constantStringExpr(Expr e, string val) {
e.(CompileTimeConstantExpr).getStringValue() = val
or
exists(SsaExplicitUpdate v, Expr src |
e = v.getAUse() and
src = v.getDefiningExpr().(VariableAssign).getSource() and
constantStringExpr(src, val)
)
}

/** An expression that always has the same string value. */
private class ConstantStringExpr extends Expr {
string value;

ConstantStringExpr() { constantStringExpr(this, value) }

/** Get the string value of this expression. */
string getStringValue() { result = value }
}

/**
* A general configuration that is safe when enabled.
*/
Expand Down
0