Skip to content

Commit d5a9f3d

Browse files
committed
Deduplicate shared body of regular and experimental versions of java/command-line-injection query.
1 parent cda5c22 commit d5a9f3d

File tree

5 files changed

+12
-35
lines changed

5 files changed

+12
-35
lines changed

java/ql/src/Security/CWE/CWE-078/ExecTainted.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java
1616
import semmle.code.java.dataflow.FlowSources
1717
import semmle.code.java.security.ExternalProcess
18-
import ExecCommon
18+
import semmle.code.java.security.CommandLineQuery
1919
import DataFlow::PathGraph
2020

2121
from DataFlow::PathNode source, DataFlow::PathNode sink, ArgumentToExec execArg

java/ql/src/Security/CWE/CWE-078/ExecUnescaped.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import java
1616
import semmle.code.java.security.ExternalProcess
17-
import ExecCommon
17+
import semmle.code.java.security.CommandLineQuery
1818

1919
/**
2020
* Strings that are known to be sane by some simple local analysis. Such strings

java/ql/src/experimental/Security/CWE/CWE-078/ExecCommon.qll

Lines changed: 0 additions & 32 deletions
This file was deleted.

java/ql/src/experimental/Security/CWE/CWE-078/ExecTainted.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java
1515
import semmle.code.java.dataflow.FlowSources
1616
import semmle.code.java.security.ExternalProcess
17-
import ExecCommon
17+
import semmle.code.java.security.CommandLineQuery
1818
import JSchOSInjection
1919
import DataFlow::PathGraph
2020

java/ql/src/Security/CWE/CWE-078/ExecCommon.qll renamed to java/ql/src/semmle/code/java/security/CommandLineQuery.qll

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* Provides classes and methods common to queries `java/command-line-injection`, `java/command-line-concatenation`
3+
* and their experimental derivatives.
4+
*
5+
* Do not import this from a library file, in order to reduce the risk of
6+
* unintentionally bringing a TaintTracking::Configuration into scope in an unrelated
7+
* query.
8+
*/
9+
110
import semmle.code.java.dataflow.FlowSources
211
import semmle.code.java.security.ExternalProcess
312
import semmle.code.java.security.CommandArguments

0 commit comments

Comments
 (0)