Java: update some models, undo temp edits; resolve conflicts

This commit is contained in:
Jami Cogswell
2023-04-13 09:14:52 -04:00
parent 540b8391dc
commit d85bcacf84
24 changed files with 280 additions and 378 deletions

View File

@@ -1,31 +1,24 @@
extensions:
- addsTo:
pack: codeql/java-all
extensible: sinkModel
data:
- ["org.apache.http.client.utils", "URIBuilder", True, "setHost", "", "", "Argument[0]", "%-url", "manual"] # ! ModelType: sinkOrStep, Notes:
- ["org.apache.http.client.utils", "URIUtils", True, "createURI", "", "", "Argument[1]", "%-url", "manual"] # ! ModelType: sinkOrStep, Notes: deprecated
- addsTo:
pack: codeql/java-all
extensible: summaryModel
data:
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(URI)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(URI,Charset)", "", "Argument[0]", "Argument[-1]", "taint", "manual"] # ! step for consistency
- ["org.apache.http.client.utils", "URIBuilder", True, "URIBuilder", "(URI,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIBuilder", True, "setHost", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URIBuilder", True, "setHost", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URIBuilder", True, "setPath", "(String)", "", "Argument[0]", "Argument[this].SyntheticField[org.apache.http.client.utils.URIBuilder.path]", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URIBuilder", True, "setPathSegments", "(List)", "", "Argument[0]", "Argument[this].SyntheticField[org.apache.http.client.utils.URIBuilder.path]", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URLEncodedUtils", True, "parse", "(URI,String)", "", "Argument[0]", "ReturnValue.Element", "taint", "ai-manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "extractHost", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "normalizeSyntax", "", "", "Argument[0]", "ReturnValue", "taint", "manual"] # ! check if sanitizes too much
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,HttpHost,List)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost,EnumSet)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost,boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo,boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
- ["org.apache.http.client.utils", "URIUtils", True, "createURI", "(String,String,int,String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "extractHost", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,HttpHost,List)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "resolve", "(URI,URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost,EnumSet)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURI", "(URI,HttpHost,boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual
- ["org.apache.http.client.utils", "URIUtils", True, "rewriteURIForRoute", "(URI,RouteInfo,boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"] # hq-manual