From 68391acc98246efe10b34cc3b688e80189cb85f7 Mon Sep 17 00:00:00 2001 From: Jami Cogswell Date: Mon, 3 Apr 2023 22:46:47 -0400 Subject: [PATCH] Java: add models from core version 4; resolve conflict --- java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml | 2 +- java/ql/lib/ext/org.apache.http.benchmark.model.yml | 6 ++++++ java/ql/lib/ext/org.apache.http.impl.model.yml | 6 ++++++ java/ql/lib/ext/org.apache.http.model.yml | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 java/ql/lib/ext/org.apache.http.benchmark.model.yml create mode 100644 java/ql/lib/ext/org.apache.http.impl.model.yml diff --git a/java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml b/java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml index b0785e9946a..9f8d068a71a 100644 --- a/java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml +++ b/java/ql/lib/ext/org.apache.hc.core5.benchmark.model.yml @@ -3,4 +3,4 @@ extensions: pack: codeql/java-all extensible: sinkModel data: - - ["org.apache.hc.core5.benchmark", "Builder", True, "setUri", "", "", "Argument[0]", "%-url", "manual"] # ! maybe step instead + - ["org.apache.hc.core5.benchmark", "Builder", True, "setUri", "", "", "Argument[0]", "%-url", "manual"] # ! maybe step instead; also check docs again, name should be BenchmarkConfig$Builder instead I believe diff --git a/java/ql/lib/ext/org.apache.http.benchmark.model.yml b/java/ql/lib/ext/org.apache.http.benchmark.model.yml new file mode 100644 index 00000000000..c2f37d724a8 --- /dev/null +++ b/java/ql/lib/ext/org.apache.http.benchmark.model.yml @@ -0,0 +1,6 @@ +extensions: + - addsTo: + pack: codeql/java-all + extensible: sinkModel + data: + - ["org.apache.http.benchmark", "Config", True, "setUrl", "", "", "Argument[0]", "%-url", "manual"] # ! maybe step instead; also check docs again, name should be $Config instead I think diff --git a/java/ql/lib/ext/org.apache.http.impl.model.yml b/java/ql/lib/ext/org.apache.http.impl.model.yml new file mode 100644 index 00000000000..29a95cae1e0 --- /dev/null +++ b/java/ql/lib/ext/org.apache.http.impl.model.yml @@ -0,0 +1,6 @@ +extensions: + - addsTo: + pack: codeql/java-all + extensible: sinkModel + data: + - ["org.apache.http.impl", "DefaultHttpRequestFactory", True, "newHttpRequest", "(String,String)", "", "Argument[1]", "%-url", "manual"] diff --git a/java/ql/lib/ext/org.apache.http.model.yml b/java/ql/lib/ext/org.apache.http.model.yml index 90cd71a7795..57300c3a657 100644 --- a/java/ql/lib/ext/org.apache.http.model.yml +++ b/java/ql/lib/ext/org.apache.http.model.yml @@ -9,6 +9,7 @@ extensions: pack: codeql/java-all extensible: sinkModel data: + - ["org.apache.http", "HttpRequestFactory", True, "newHttpRequest", "(String,String)", "", "Argument[1]", "%-url", "manual"] - ["org.apache.http", "HttpResponse", True, "setEntity", "(HttpEntity)", "", "Argument[0]", "xss", "manual"] - addsTo: pack: codeql/java-all