Refactor Log4jJndiInjection.ql

This commit is contained in:
Ed Minnix
2023-04-12 10:01:11 -04:00
parent d049b112a9
commit 5bd9aae072

View File

@@ -16,9 +16,10 @@
*/
import java
import semmle.code.java.dataflow.TaintTracking
import semmle.code.java.dataflow.FlowSources
import semmle.code.java.dataflow.ExternalFlow
import DataFlow::PathGraph
import Log4jInjectionFlow::PathGraph
private class ActivateModels extends ActiveExperimentalModels {
ActivateModels() { this = "log4j-injection" }
@@ -41,17 +42,20 @@ class Log4jInjectionSanitizer extends DataFlow::Node {
/**
* A taint-tracking configuration for tracking untrusted user input used in log entries.
*/
class Log4jInjectionConfiguration extends TaintTracking::Configuration {
Log4jInjectionConfiguration() { this = "Log4jInjectionConfiguration" }
module Log4jInjectionConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
predicate isSink(DataFlow::Node sink) { sink instanceof Log4jInjectionSink }
override predicate isSink(DataFlow::Node sink) { sink instanceof Log4jInjectionSink }
override predicate isSanitizer(DataFlow::Node node) { node instanceof Log4jInjectionSanitizer }
predicate isBarrier(DataFlow::Node node) { node instanceof Log4jInjectionSanitizer }
}
from Log4jInjectionConfiguration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
where cfg.hasFlowPath(source, sink)
/**
* Taint-tracking flow for tracking untrusted user input used in log entries.
*/
module Log4jInjectionFlow = TaintTracking::Global<Log4jInjectionConfig>;
from Log4jInjectionFlow::PathNode source, Log4jInjectionFlow::PathNode sink
where Log4jInjectionFlow::flowPath(source, sink)
select sink.getNode(), source, sink, "Log4j log entry depends on a $@.", source.getNode(),
"user-provided value"