Rename class to CredentialsSinkNode to better align with naming convention

egregius313 · jcogs33 · egregius313 · commit 72a1289ebaac · 2023-10-25T14:31:54.000-04:00
Co-authored-by: Jami &lt;57204504+jcogs33@users.noreply.github.com&gt;
diff --git a/java/ql/lib/change-notes/2023-08-23-deprecated-sensitiveapi-predicates.md b/java/ql/lib/change-notes/2023-08-23-deprecated-sensitiveapi-predicates.md
@@ -1,4 +1,4 @@
 ---
 category: deprecated
 ---
-* In `SensitiveApi.qll`, `javaApiCallablePasswordParam`, `javaApiCallableUsernameParam`, `javaApiCallableCryptoKeyParam`, and `otherApiCallableCredentialParam` predicates have been deprecated. They have been replaced with a new class `CredentialSinkNode` and its child classes `PasswordSink`, `UsernameSink`, and `CryptoKeySink`. 
+* In `SensitiveApi.qll`, `javaApiCallablePasswordParam`, `javaApiCallableUsernameParam`, `javaApiCallableCryptoKeyParam`, and `otherApiCallableCredentialParam` predicates have been deprecated. They have been replaced with a new class `CredentialsSinkNode` and its child classes `PasswordSink`, `UsernameSink`, and `CryptoKeySink`. 
diff --git a/java/ql/lib/semmle/code/java/security/HardcodedCredentials.qll b/java/ql/lib/semmle/code/java/security/HardcodedCredentials.qll
@@ -58,7 +58,7 @@ abstract class CredentialsSink extends Expr {
  * credentials.
  */
 class CredentialsApiSink extends CredentialsSink {
-  CredentialsApiSink() { this = any(CredentialSinkNode csn).asExpr() }
+  CredentialsApiSink() { this = any(CredentialsSinkNode csn).asExpr() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/SensitiveApi.qll b/java/ql/lib/semmle/code/java/security/SensitiveApi.qll
@@ -9,26 +9,26 @@ private import semmle.code.java.dataflow.ExternalFlow
 /**
  * A node that represents the use of a credential.
  */
-abstract class CredentialSinkNode extends DataFlow::Node { }
+abstract class CredentialsSinkNode extends DataFlow::Node { }
 
 /**
  * A node representing a password being passed to a method.
  */
-class PasswordSink extends CredentialSinkNode {
+class PasswordSink extends CredentialsSinkNode {
   PasswordSink() { sinkNode(this, "credentials-password") }
 }
 
 /**
  * A node representing a username being passed to a method.
  */
-class UsernameSink extends CredentialSinkNode {
+class UsernameSink extends CredentialsSinkNode {
   UsernameSink() { sinkNode(this, "credentials-username") }
 }
 
 /**
  * A node representing a cryptographic key being passed to a method.
  */
-class CryptoKeySink extends CredentialSinkNode {
+class CryptoKeySink extends CredentialsSinkNode {
   CryptoKeySink() { sinkNode(this, "crypto-parameter") }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ abstract class CredentialsSink extends Expr {`
`58`	`58`	`* credentials.`
`59`	`59`	`*/`
`60`	`60`	`class CredentialsApiSink extends CredentialsSink {`
`61`		`- CredentialsApiSink() { this = any(CredentialSinkNode csn).asExpr() }`
	`61`	`+ CredentialsApiSink() { this = any(CredentialsSinkNode csn).asExpr() }`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`