Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 60dab3d

Browse files
Jami CogswellJami Cogswell
Jami Cogswell
authored and
Jami Cogswell
committed
Java: add models from client version 4; resolve conflicts
1 parent 68391ac commit 60dab3d

4 files changed

Lines changed: 57 additions & 2 deletions

‎java/ql/lib/ext/org.apache.http.client.fluent.model.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/java-all
4+
extensible: sinkModel
5+
data:
6+
- ["org.apache.http.client.fluent", "Request", True, "Delete", "(String)", "", "Argument[0]", "%-url", "manual"]
7+
- ["org.apache.http.client.fluent", "Request", True, "Delete", "(URI)", "", "Argument[0]", "%-url", "manual"]
8+
- ["org.apache.http.client.fluent", "Request", True, "Get", "(String)", "", "Argument[0]", "%-url", "manual"]
9+
- ["org.apache.http.client.fluent", "Request", True, "Get", "(URI)", "", "Argument[0]", "%-url", "manual"]
10+
- ["org.apache.http.client.fluent", "Request", True, "Head", "(String)", "", "Argument[0]", "%-url", "manual"]
11+
- ["org.apache.http.client.fluent", "Request", True, "Head", "(URI)", "", "Argument[0]", "%-url", "manual"]
12+
- ["org.apache.http.client.fluent", "Request", True, "Options", "(String)", "", "Argument[0]", "%-url", "manual"]
13+
- ["org.apache.http.client.fluent", "Request", True, "Options", "(URI)", "", "Argument[0]", "%-url", "manual"]
14+
- ["org.apache.http.client.fluent", "Request", True, "Patch", "(String)", "", "Argument[0]", "%-url", "manual"]
15+
- ["org.apache.http.client.fluent", "Request", True, "Patch", "(URI)", "", "Argument[0]", "%-url", "manual"]
16+
- ["org.apache.http.client.fluent", "Request", True, "Post", "(String)", "", "Argument[0]", "%-url", "manual"]
17+
- ["org.apache.http.client.fluent", "Request", True, "Post", "(URI)", "", "Argument[0]", "%-url", "manual"]
18+
- ["org.apache.http.client.fluent", "Request", True, "Put", "(String)", "", "Argument[0]", "%-url", "manual"]
19+
- ["org.apache.http.client.fluent", "Request", True, "Put", "(URI)", "", "Argument[0]", "%-url", "manual"]
20+
- ["org.apache.http.client.fluent", "Request", True, "Trace", "(String)", "", "Argument[0]", "%-url", "manual"]
21+
- ["org.apache.http.client.fluent", "Request", True, "Trace", "(URI)", "", "Argument[0]", "%-url", "manual"]

‎java/ql/lib/ext/org.apache.http.client.methods.model.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ extensions:
1111
- ["org.apache.http.client.methods", "HttpPost", False, "HttpPost", "", "", "Argument[0]", "open-url", "manual"]
1212
- ["org.apache.http.client.methods", "HttpPut", False, "HttpPut", "", "", "Argument[0]", "open-url", "manual"]
1313
- ["org.apache.http.client.methods", "HttpRequestBase", True, "setURI", "", "", "Argument[0]", "open-url", "manual"]
14+
- ["org.apache.http.client.methods", "HttpRequestWrapper", True, "setURI", "", "", "Argument[0]", "%-url", "manual"]
1415
- ["org.apache.http.client.methods", "HttpTrace", False, "HttpTrace", "", "", "Argument[0]", "open-url", "manual"]
1516
- ["org.apache.http.client.methods", "RequestBuilder", False, "delete", "", "", "Argument[0]", "open-url", "manual"]
1617
- ["org.apache.http.client.methods", "RequestBuilder", False, "get", "", "", "Argument[0]", "open-url", "manual"]

‎java/ql/lib/ext/org.apache.http.client.utils.model.yml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,23 @@ extensions:
33
pack: codeql/java-all
44
extensible: summaryModel
55
data:
6+
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
7+
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
8+
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(URI,Charset)", "", "Argument[0]", "Argument[-1]", "taint", "manual"] # ! step for consistency
69
- ["org.apache.http.client.utils", "URIBuilder", True, "setHost", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
710
- ["org.apache.http.client.utils", "URIBuilder", True, "setHost", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
811
- ["org.apache.http.client.utils", "URIBuilder", True, "setPath", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[org.apache.http.client.utils.URIBuilder.path]", "taint", "ai-manual"]
912
- ["org.apache.http.client.utils", "URIBuilder", True, "setPathSegments", "(List)", "", "Argument[0]", "Argument[this].SyntheticField[org.apache.http.client.utils.URIBuilder.path]", "taint", "ai-manual"]
10-
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
11-
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
1213
- ["org.apache.http.client.utils", "URLEncodedUtils", True, "parse", "(URI,String)", "", "Argument[0]", "ReturnValue.Element", "taint", "ai-manual"]
14+
- ["org.apache.http.client.utils", "URIUtils", True, "extractHost", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
15+
- ["org.apache.http.client.utils", "URIUtils", True, "normalizeSyntax", "", "", "Argument[0]", "ReturnValue", "taint", "manual"] # ! check if sanitizes too much
16+
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,HttpHost,List)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
17+
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
18+
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
19+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
20+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
21+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost,EnumSet)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
22+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost,boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
23+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
24+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo,boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
25+
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo,boolean)", "", "Argument[2]", "ReturnValue", "taint", "manual"]

‎java/ql/lib/ext/org.apache.http.impl.client.model.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/java-all
4+
extensible: sinkModel
5+
data:
6+
- ["org.apache.http.impl.client", "RequestWrapper", True, "setURI", "", "", "Argument[0]", "%-url", "manual"]
7+
- addsTo:
8+
pack: codeql/java-all
9+
extensible: summaryModel
10+
data:
11+
- ["org.apache.http.impl.client", "RedirectLocations", True, "add", "(URI)", "", "Argument[0]", "Argument[-1].Element", "value", "manual"] # ! double-check the output for this step
12+
- addsTo:
13+
pack: codeql/java-all
14+
extensible: neutralModel
15+
data:
16+
- ["org.apache.http.impl.client", "RedirectLocations", "contains", "(URI)", "manual"]
17+
18+
# The below APIs are currently being stored as neutral models since `WithoutElement` has not yet been implemented for Java.
19+
# When `WithoutElement` is implemented, these should be changed to summary models of the form `Argument[-1].WithoutElement -> Argument[-1]`.
20+
- ["org.apache.http.impl.client", "RedirectLocations", "remove", "(URI)", "manual"]

0 commit comments

Comments
 (0)