Skip to content

Commit 38cf886

Browse files
author
Alvaro Muñoz
committed
Fix Java ext QLPack to not use extentionTargets (broken?)
1 parent 637f297 commit 38cf886

File tree

86 files changed

+143
-123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+143
-123
lines changed

java/ext/codeql-pack.lock.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
---
22
lockVersion: 1.0.0
3-
dependencies: {}
3+
dependencies:
4+
codeql/dataflow:
5+
version: 0.0.3
6+
codeql/java-all:
7+
version: 0.7.4
8+
codeql/java-all:
9+
version: 0.7.4
10+
codeql/mad:
11+
version: 0.1.4
12+
codeql/regex:
13+
version: 0.1.4
14+
codeql/ssa:
15+
version: 0.1.4
16+
codeql/suite-helpers:
17+
version: 0.6.4
18+
codeql/tutorial:
19+
version: 0.1.4
20+
codeql/typetracking:
21+
version: 0.1.4
22+
codeql/util:
23+
version: 0.1.4
424
compiled: false

java/ext/generated/Activiti/Activiti.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.activiti.bpmn.converter.util", "InputStreamProvider", true, "getInputStream", "()", "", "Argument[-1]", "open-url", "generated"]

java/ext/generated/ESAPI/esapi-java-legacy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.owasp.esapi.codecs", "Base64", true, "decodeFileToFile", "(String,String)", "", "Argument[1]", "create-file", "generated"]
@@ -38,7 +38,7 @@ extensions:
3838
- ["org.owasp.esapi", "SecurityConfiguration", true, "getResourceStream", "(String)", "", "Argument[0]", "read-file", "generated"]
3939

4040
- addsTo:
41-
pack: codeql/java-queries
41+
pack: codeql/java-all
4242
extensible: sourceModel
4343
data:
4444
- ["org.owasp.esapi.filters", "SecurityWrapperRequest", true, "getParameter", "(String,boolean)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/FasterXML/jackson-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.fasterxml.jackson.core", "JsonFactory", true, "createJsonParser", "(File)", "", "Argument[0]", "read-file", "generated"]

java/ext/generated/FasterXML/jackson-databind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.fasterxml.jackson.databind", "ObjectReader", true, "readValue", "(File)", "", "Argument[0]", "read-file", "generated"]

java/ext/generated/JetBrains/kotlin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.jetbrains.kotlin.cli.jvm.compiler", "CompileEnvironmentUtil", true, "writeToJar", "(File,boolean,boolean,boolean,FqName,OutputFileCollection,MessageCollector)", "", "Argument[0]", "create-file", "generated"]

java/ext/generated/JodaOrg/joda-time.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.joda.time.base", "BaseDateTime", true, "BaseDateTime", "(Object,Chronology)", "", "Argument[0]", "read-file", "generated"]

java/ext/generated/OpenAPITools/openapi-generator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.openapitools.codegen.api", "TemplateProcessor", true, "write", "(Map,String,File)", "", "Argument[1]", "read-file", "generated"]

java/ext/generated/OpenFeign/feign.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["feign", "Client$Default", true, "getConnection", "(URL)", "", "Argument[0]", "open-url", "generated"]
77

88
- addsTo:
9-
pack: codeql/java-queries
9+
pack: codeql/java-all
1010
extensible: sourceModel
1111
data:
1212
- ["feign.codec", "Decoder", true, "decode", "(Response,Type)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/Wechat-Group/WxJava.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.github.binarywang.wxpay.service", "WxPayService", true, "deleteV3", "(String)", "", "Argument[0]", "open-url", "generated"]
@@ -17,7 +17,7 @@ extensions:
1717
- ["me.chanjar.weixin.common.util.fs", "FileUtils", true, "createTmpFile", "(InputStream,String,String,File)", "", "Argument[3]", "create-file", "generated"]
1818

1919
- addsTo:
20-
pack: codeql/java-queries
20+
pack: codeql/java-all
2121
extensible: sourceModel
2222
data:
2323
- ["com.github.binarywang.wxpay.service", "WxPayService", true, "downloadV3", "(String)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/abel533/Mapper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["tk.mybatis.mapper.generator.formatter", "FreemarkerTemplateFormatter", true, "process", "(String,String,Map)", "", "Argument[1]", "ssti", "generated"]

java/ext/generated/alibaba/Sentinel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.alibaba.csp.sentinel.dashboard.client", "SentinelApiClient", true, "fetchApis", "(String,String,int)", "", "Argument[2]", "open-url", "generated"]
@@ -62,7 +62,7 @@ extensions:
6262
- ["com.alibaba.csp.sentinel.node.metric", "MetricWriter", true, "write", "(long,List)", "", "Argument[-1]", "create-file", "generated"]
6363

6464
- addsTo:
65-
pack: codeql/java-queries
65+
pack: codeql/java-all
6666
extensible: sourceModel
6767
data:
6868
- ["com.alibaba.csp.sentinel.adapter.gateway.common.param", "GatewayParamParser", true, "parseParameterFor", "(String,Object,Predicate)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/alibaba/canal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.alibaba.otter.canal.adapter.launcher.rest", "CommonRest", true, "etl", "(String,String,String)", "", "Argument[2]", "sql", "generated"]
@@ -35,7 +35,7 @@ extensions:
3535
- ["com.taobao.tddl.dbsync.binlog", "FileLogFetcher", false, "open", "(String,long)", "", "Argument[0]", "read-file", "generated"]
3636

3737
- addsTo:
38-
pack: codeql/java-queries
38+
pack: codeql/java-all
3939
extensible: sourceModel
4040
data:
4141
- ["com.alibaba.otter.canal.admin.connector", "SimpleAdminConnectors", true, "execute", "(String,int,Function)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/alibaba/easyexcel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.alibaba.excel.util", "FileUtils", true, "openInputStream", "(File)", "", "Argument[0]", "read-file", "generated"]

java/ext/generated/alibaba/nacos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.alibaba.nacos.api.config", "ConfigService", true, "addListener", "(String,String,Listener)", "", "Argument[0]", "create-file", "generated"]
@@ -355,7 +355,7 @@ extensions:
355355
- ["com.alibaba.nacos.sys.utils", "DiskUtils", false, "writeFile", "(File,byte[],boolean)", "", "Argument[0]", "create-file", "generated"]
356356

357357
- addsTo:
358-
pack: codeql/java-queries
358+
pack: codeql/java-all
359359
extensible: sourceModel
360360
data:
361361
- ["com.alibaba.nacos.api.naming", "NamingMaintainService", true, "deleteService", "(String)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/alibaba/spring-cloud-alibaba.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.alibaba.cloud.commons.io", "FileUtils", false, "openInputStream", "(File)", "", "Argument[0]", "read-file", "generated"]

java/ext/generated/antlr/antlr4.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.antlr.v4.codegen", "CodeGenerator", true, "write", "(ST,String)", "", "Argument[1]", "create-file", "generated"]

java/ext/generated/apache/activemq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["java.lang", "AutoCloseable", true, "close", "()", "", "Argument[-1]", "create-file", "generated"]
@@ -3085,7 +3085,7 @@ extensions:
30853085
- ["org.springframework.beans.factory", "InitializingBean", true, "afterPropertiesSet", "()", "", "Argument[-1]", "ldap", "generated"]
30863086

30873087
- addsTo:
3088-
pack: codeql/java-queries
3088+
pack: codeql/java-all
30893089
extensible: sourceModel
30903090
data:
30913091
- ["org.apache.activemq.broker.jmx", "DestinationViewMBean", true, "browseMessages", "()", "", "ReturnValue", "remote", "generated"]

java/ext/generated/apache/beam.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.beam.examples.complete.kafkatopubsub.kafka.consumer", "Utils", true, "getKafkaCredentialsFromVault", "(String,String)", "", "Argument[0]", "open-url", "generated"]

java/ext/generated/apache/cloudstack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["com.cloud.agent.api.storage", "OVFHelper", true, "rewriteOVFFileForSingleDisk", "(String,String,String)", "", "Argument[1]", "create-file", "generated"]
@@ -313,7 +313,7 @@ extensions:
313313
- ["org.apache.cloudstack.utils.cryptsetup", "KeyFile", true, "KeyFile", "(byte[])", "", "Argument[-1]", "create-file", "generated"]
314314

315315
- addsTo:
316-
pack: codeql/java-queries
316+
pack: codeql/java-all
317317
extensible: sourceModel
318318
data:
319319
- ["com.cloud.utils", "HttpUtils", true, "findCookie", "(Cookie[],String)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/apache/commons-io.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.commons.io.file", "FilesUncheck", true, "copy", "(InputStream,Path,CopyOption[])", "", "Argument[0]", "read-file", "generated"]

java/ext/generated/apache/directory-ldap-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.directory.api.ldap.schema.loader", "SingleLdifSchemaLoader", true, "SingleLdifSchemaLoader", "(URL)", "", "Argument[0]", "open-url", "generated"]

java/ext/generated/apache/dubbo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.dubbo.common.cache", "FileCacheStore", true, "refreshCache", "(Map,String,long)", "", "Argument[-1]", "create-file", "generated"]

java/ext/generated/apache/flink.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.flink.api.java.utils", "ParameterTool", true, "createPropertiesFile", "(String)", "", "Argument[0]", "create-file", "generated"]
@@ -80,7 +80,7 @@ extensions:
8080
- ["org.apache.flink.yarn.entrypoint", "YarnEntrypointUtils", true, "loadConfiguration", "(String,Configuration,Map)", "", "Argument[0]", "read-file", "generated"]
8181

8282
- addsTo:
83-
pack: codeql/java-queries
83+
pack: codeql/java-all
8484
extensible: sourceModel
8585
data:
8686
- ["org.apache.flink.api.common.cache", "DistributedCache", true, "readFileInfoFromConfig", "(Configuration)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/apache/hadoop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["java.nio.channels", "ReadableByteChannel", true, "read", "(ByteBuffer)", "", "Argument[-1]", "create-file", "generated"]
@@ -12105,7 +12105,7 @@ extensions:
1210512105
- ["org.apache.hadoop.yarn.webapp", "WebApps$Builder", true, "build", "(WebApp)", "", "Argument[-1]", "open-url", "generated"]
1210612106

1210712107
- addsTo:
12108-
pack: codeql/java-queries
12108+
pack: codeql/java-all
1210912109
extensible: sourceModel
1211012110
data:
1211112111
- ["java.nio.channels", "ReadableByteChannel", true, "read", "(ByteBuffer)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/apache/hbase.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.hadoop.hbase.coprocessor", "CoprocessorHost", true, "load", "(Path,String,int,Configuration,String[])", "", "Argument[-1]", "create-file", "generated"]
@@ -48,7 +48,7 @@ extensions:
4848
- ["org.apache.hadoop.hbase.util", "CoprocessorClassLoader", true, "getClassLoader", "(Path,ClassLoader,String,Configuration)", "", "Argument[2]", "create-file", "generated"]
4949

5050
- addsTo:
51-
pack: codeql/java-queries
51+
pack: codeql/java-all
5252
extensible: sourceModel
5353
data:
5454
- ["org.apache.hadoop.hbase.http", "ProxyUserAuthenticationFilter", true, "getDoasFromHeader", "(HttpServletRequest)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/apache/httpcomponents-client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.hc.client5.http.cache", "ResourceFactory", true, "copy", "(String,Resource)", "", "Argument[0]", "create-file", "generated"]

java/ext/generated/apache/iceberg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.iceberg.catalog", "Catalog", true, "initialize", "(String,Map)", "", "Argument[1]", "jdbc-url", "generated"]

java/ext/generated/apache/iotdb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.iotdb.commons.auth.authorizer", "IAuthorizer", true, "checkUserPrivileges", "(String,String,int)", "", "Argument[0]", "create-file", "generated"]

java/ext/generated/apache/kafka.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.kafka.common.record", "FileRecords", true, "open", "(File)", "", "Argument[0]", "create-file", "generated"]
@@ -52,7 +52,7 @@ extensions:
5252
- ["org.apache.kafka.trogdor.task", "TaskWorker", true, "stop", "(Platform)", "", "Argument[-1]", "create-file", "generated"]
5353

5454
- addsTo:
55-
pack: codeql/java-queries
55+
pack: codeql/java-all
5656
extensible: sourceModel
5757
data:
5858
- ["org.apache.kafka.common.security.oauthbearer.internals.secured", "HttpAccessTokenRetriever", true, "post", "(HttpURLConnection,Map,String,Integer,Integer)", "", "ReturnValue", "remote", "generated"]

java/ext/generated/apache/logging-log4j2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.log4j.builders", "BuilderManager", true, "parseAppender", "(String,String,String,String,String,Properties,PropertiesConfiguration)", "", "Argument[5]", "jndi-injection", "generated"]

java/ext/generated/apache/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.maven.building", "Source", true, "getInputStream", "()", "", "Argument[-1]", "open-url", "generated"]

java/ext/generated/apache/ozone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-queries
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["csi.v1", "NodeGrpc$NodeImplBase", true, "nodePublishVolume", "(NodePublishVolumeRequest,StreamObserver)", "", "Argument[0]", "create-file", "generated"]
@@ -110,7 +110,7 @@ extensions:
110110
- ["org.hadoop.ozone.recon.codegen", "SqlDbUtils", false, "createNewDerbyDatabase", "(String,String)", "", "Argument[1]", "jdbc-url", "generated"]
111111

112112
- addsTo:
113-
pack: codeql/java-queries
113+
pack: codeql/java-all
114114
extensible: sourceModel
115115
data:
116116
- ["org.apache.hadoop.ozone.admin.nssummary", "NSSummaryCLIUtils", false, "makeHttpCall", "(StringBuffer,String,boolean,ConfigurationSource)", "", "ReturnValue", "remote", "generated"]

0 commit comments

Comments
 (0)