Skip to content

Commit dccb394

Browse files
egregius313egregius313
committed
Change credential-other to more appropriate sink kinds
1 parent 36da0cd commit dccb394

14 files changed

+83
-56
lines changed

‎java/ql/lib/ext/com.amazonaws.auth.model.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "", "", "Argument[0]", "credential-other", "manual"]
7-
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "", "", "Argument[1]", "credential-other", "manual"]
6+
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "", "", "Argument[0]", "crypto-parameter", "manual"]
7+
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "", "", "Argument[1]", "crypto-parameter", "manual"]

‎java/ql/lib/ext/com.auth0.jwt.algorithms.model.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(byte[])", "", "Argument[0]", "credential-other", "manual"]
8-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(String)", "", "Argument[0]", "credential-other", "manual"]
9-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(byte[])", "", "Argument[0]", "credential-other", "manual"]
10-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(String)", "", "Argument[0]", "credential-other", "manual"]
11-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(byte[])", "", "Argument[0]", "credential-other", "manual"]
6+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
7+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
8+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
9+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
10+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
11+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]

‎java/ql/lib/ext/com.azure.identity.model.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.azure.identity", "ClientSecretCredentialBuilder", False, "clientSecret", "(String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["com.azure.identity", "UsernamePasswordCredentialBuilder", False, "password", "(String)", "", "Argument[0]", "credential-other", "manual"]
8-
- ["com.azure.identity", "UsernamePasswordCredentialBuilder", False, "username", "(String)", "", "Argument[0]", "credential-other", "manual"]
6+
- ["com.azure.identity", "ClientSecretCredentialBuilder", False, "clientSecret", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
7+
- ["com.azure.identity", "UsernamePasswordCredentialBuilder", False, "password", "(String)", "", "Argument[0]", "credential-password", "manual"]
8+
- ["com.azure.identity", "UsernamePasswordCredentialBuilder", False, "username", "(String)", "", "Argument[0]", "credential-username", "manual"]

‎java/ql/lib/ext/com.jcraft.jsch.model.yml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,24 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(Identity,byte[])", "", "Argument[1]", "credential-password", "manual"]
7+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
8+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
9+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[])", "", "Argument[1]", "credential-password", "manual"]
10+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[0]", "credential-username", "manual"]
11+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[1]", "crypto-parameter", "manual"]
12+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
13+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[3]", "credential-password", "manual"]
14+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String)", "", "Argument[0]", "crypto-parameter", "manual"]
15+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String)", "", "Argument[1]", "credential-password", "manual"]
16+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
17+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[1]", "crypto-parameter", "manual"]
18+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[2]", "credential-password", "manual"]
619
- ["com.jcraft.jsch", "JSch", True, "getSession", "(String,String,int)", "", "Argument[1]", "request-forgery", "ai-manual"]
7-
- ["com.jcraft.jsch", "JSch", False, "getSession", "(String,String)", "", "Argument[0]", "credential-other", "manual"]
8-
- ["com.jcraft.jsch", "JSch", False, "getSession", "(String,String,int)", "", "Argument[0]", "credential-other", "manual"]
9-
- ["com.jcraft.jsch", "Session", False, "setPassword", "(String)", "", "Argument[0]", "credential-other", "manual"]
10-
- ["com.jcraft.jsch", "Session", False, "setPassword", "(byte[])", "", "Argument[0]", "credential-other", "manual"]
20+
- ["com.jcraft.jsch", "JSch", True, "getSession", "(String,String)", "", "Argument[0]", "credential-username", "manual"]
21+
- ["com.jcraft.jsch", "JSch", True, "getSession", "(String,String,int)", "", "Argument[0]", "credential-username", "manual"]
22+
- ["com.jcraft.jsch", "Session", False, "setPassword", "(String)", "", "Argument[0]", "credential-password", "manual"]
23+
- ["com.jcraft.jsch", "Session", False, "setPassword", "(byte[])", "", "Argument[0]", "credential-password", "manual"]
1124
- addsTo:
1225
pack: codeql/java-all
1326
extensible: summaryModel

‎java/ql/lib/ext/com.microsoft.sqlserver.jdbc.model.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "getConnection", "(String,String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "getConnection", "(String,String)", "", "Argument[1]", "credential-other", "manual"]
8-
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "setPassword", "(String)", "", "Argument[0]", "credential-other", "manual"]
9-
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "setUser", "(String)", "", "Argument[0]", "credential-other", "manual"]
6+
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "getConnection", "(String,String)", "", "Argument[0]", "credential-username", "manual"]
7+
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "getConnection", "(String,String)", "", "Argument[1]", "credential-password", "manual"]
8+
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "setPassword", "(String)", "", "Argument[0]", "credential-password", "manual"]
9+
- ["com.microsoft.sqlserver.jdbc", "SQLServerDataSource", False, "setUser", "(String)", "", "Argument[0]", "credential-username", "manual"]

‎java/ql/lib/ext/com.sshtools.j2ssh.authentication.model.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.sshtools.j2ssh.authentication", "PasswordAuthenticationClient", False, "setPassword", "(String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["com.sshtools.j2ssh.authentication", "PasswordAuthenticationClient", False, "setUsername", "(String)", "", "Argument[0]", "credential-other", "manual"]
8-
- ["com.sshtools.j2ssh.authentication", "SshAuthenticationClient", False, "setUsername", "(String)", "", "Argument[0]", "credential-other", "manual"]
6+
- ["com.sshtools.j2ssh.authentication", "PasswordAuthenticationClient", False, "setPassword", "(String)", "", "Argument[0]", "credential-password", "manual"]
7+
- ["com.sshtools.j2ssh.authentication", "PasswordAuthenticationClient", True, "setUsername", "(String)", "", "Argument[0]", "credential-username", "manual"]
8+
- ["com.sshtools.j2ssh.authentication", "SshAuthenticationClient", True, "setUsername", "(String)", "", "Argument[0]", "credential-username", "manual"]

‎java/ql/lib/ext/com.trilead.ssh2.model.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[1]", "credential-other", "manual"]
8-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[2]", "credential-other", "manual"]
9-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithNone", "(String)", "", "Argument[0]", "credential-other", "manual"]
10-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPassword", "(String,String)", "", "Argument[0]", "credential-other", "manual"]
11-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPassword", "(String,String)", "", "Argument[1]", "credential-other", "manual"]
12-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[0]", "credential-other", "manual"]
13-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[2]", "credential-other", "manual"]
14-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[0]", "credential-other", "manual"]
15-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[1]", "credential-other", "manual"]
16-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[2]", "credential-other", "manual"]
17-
- ["com.trilead.ssh2", "Connection", False, "getRemainingAuthMethods", "(String)", "", "Argument[0]", "credential-other", "manual"]
18-
- ["com.trilead.ssh2", "Connection", False, "isAuthMethodAvailable", "(String,String)", "", "Argument[0]", "credential-other", "manual"]
6+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithAgent", "", "", "Argument[0]", "credential-username", "manual"]
7+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[0]", "credential-username", "manual"]
8+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[1]", "crypto-parameter", "manual"]
9+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[2]", "credential-password", "manual"]
10+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithKeyboardInteractive", "", "", "Argument[0]", "credential-username", "manual"]
11+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithNone", "(String)", "", "Argument[0]", "credential-username", "manual"]
12+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPassword", "(String,String)", "", "Argument[0]", "credential-username", "manual"]
13+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPassword", "(String,String)", "", "Argument[1]", "credential-password", "manual"]
14+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "", "", "Argument[0]", "credential-username", "manual"]
15+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,String)", "", "Argument[1]", "credential-password", "manual"]
16+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[1]", "crypto-parameter", "manual"]
17+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[1]", "crypto-parameter", "manual"]
18+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[2]", "credential-password", "manual"]
19+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[2]", "credential-password", "manual"]
20+
- ["com.trilead.ssh2", "Connection", False, "getRemainingAuthMethods", "(String)", "", "Argument[0]", "credential-username", "manual"]
21+
- ["com.trilead.ssh2", "Connection", False, "isAuthMethodAvailable", "(String,String)", "", "Argument[0]", "credential-username", "manual"]

‎java/ql/lib/ext/javax.crypto.spec.model.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ extensions:
1515
- ["javax.crypto.spec", "DESedeKeySpec", False, "isParityAdjusted", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
1616
- ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
1717
- ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[],int,int,String)", "", "Argument[0]", "crypto-parameter", "manual"]
18-
- ["javax.crypto.spec", "IvParameterSpec", False, "IvParameterSpec", "(byte[])", "", "Argument[0]", "credential-other", "manual"]
19-
- ["javax.crypto.spec", "IvParameterSpec", False, "IvParameterSpec", "(byte[],int,int)", "", "Argument[0]", "credential-other", "manual"]
18+
- ["javax.crypto.spec", "IvParameterSpec", False, "IvParameterSpec", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
19+
- ["javax.crypto.spec", "IvParameterSpec", False, "IvParameterSpec", "(byte[],int,int)", "", "Argument[0]", "crypto-parameter", "manual"]

‎java/ql/lib/ext/net.schmizz.sshj.model.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "(String,String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "(String,String)", "", "Argument[1]", "credential-other", "manual"]
8-
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "(String,char[])", "", "Argument[0]", "credential-other", "manual"]
9-
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "(String,char[])", "", "Argument[1]", "credential-other", "manual"]
6+
- ["net.schmizz.sshj", "SSHClient", False, "auth", "", "", "Argument[0]", "credential-usernmame", "manual"]
7+
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "", "", "Argument[0]", "credential-username", "manual"]
8+
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "(String,String)", "", "Argument[1]", "credential-password", "manual"]
9+
- ["net.schmizz.sshj", "SSHClient", False, "authPassword", "(String,char[])", "", "Argument[1]", "credential-password", "manual"]
10+
- ["net.schmizz.sshj", "SSHClient", False, "authPublicKey", "", "", "Argument[0]", "credential-username", "manual"]
11+
- ["net.schmizz.sshj", "SSHClient", False, "loadKeys", "", "(String,char[])", "Argument[1]", "credential-password", "manual"]
12+
- ["net.schmizz.sshj", "SSHClient", False, "loadKeys", "", "(String,String)", "Argument[1]", "credential-password", "manual"]

‎java/ql/lib/ext/org.apache.commons.net.ftp.model.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String)", "", "Argument[0]", "credential-other", "manual"]
7-
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String)", "", "Argument[1]", "credential-other", "manual"]
8-
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String,String)", "", "Argument[0]", "credential-other", "manual"]
9-
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String,String)", "", "Argument[1]", "credential-other", "manual"]
6+
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String)", "", "Argument[0]", "credential-username", "manual"]
7+
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String)", "", "Argument[1]", "credential-password", "manual"]
8+
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String,String)", "", "Argument[0]", "credential-username", "manual"]
9+
- ["org.apache.commons.net.ftp", "FTPClient", False, "login", "(String,String,String)", "", "Argument[1]", "credential-password", "manual"]

0 commit comments

Comments
 (0)