From 9dcc0a0d815da0ae02088eec3c90a110713bc6cc Mon Sep 17 00:00:00 2001 From: Geoffrey White <40627776+geoffw0@users.noreply.github.com> Date: Wed, 15 Oct 2025 15:13:52 +0100 Subject: [PATCH 1/4] Rust: Move rust/weak-sensitive-data-hashing to CWE-327. --- .../{CWE-328 => CWE-327}/WeakSensitiveDataHashing.qhelp | 0 .../security/{CWE-328 => CWE-327}/WeakSensitiveDataHashing.ql | 0 .../{CWE-328 => CWE-327}/WeakSensitiveDataHashingBad.rs | 0 .../{CWE-328 => CWE-327}/WeakSensitiveDataHashingGood.rs | 0 .../query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename rust/ql/src/queries/security/{CWE-328 => CWE-327}/WeakSensitiveDataHashing.qhelp (100%) rename rust/ql/src/queries/security/{CWE-328 => CWE-327}/WeakSensitiveDataHashing.ql (100%) rename rust/ql/src/queries/security/{CWE-328 => CWE-327}/WeakSensitiveDataHashingBad.rs (100%) rename rust/ql/src/queries/security/{CWE-328 => CWE-327}/WeakSensitiveDataHashingGood.rs (100%) diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.qhelp similarity index 100% rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.qhelp diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql similarity index 100% rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingBad.rs b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingBad.rs similarity index 100% rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingBad.rs rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingBad.rs diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingGood.rs b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingGood.rs similarity index 100% rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingGood.rs rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingGood.rs diff --git a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref b/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref index fad3080280be..bdfc62800df8 100644 --- a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref +++ b/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref @@ -1,4 +1,4 @@ -query: queries/security/CWE-328/WeakSensitiveDataHashing.ql +query: queries/security/CWE-327/WeakSensitiveDataHashing.ql postprocess: - utils/test/PrettyPrintModels.ql - utils/test/InlineExpectationsTestQuery.ql From c7f0e41660b1257ae044425a80fafadae36cc986 Mon Sep 17 00:00:00 2001 From: Geoffrey White <40627776+geoffw0@users.noreply.github.com> Date: Wed, 15 Oct 2025 15:21:01 +0100 Subject: [PATCH 2/4] Rust: Move the existing CWE-327 test. --- .../{ => BrokenCryptoAlgorithm}/BrokenCryptoAlgorithm.expected | 0 .../{ => BrokenCryptoAlgorithm}/BrokenCryptoAlgorithm.qlref | 0 .../CONSISTENCY/PathResolutionConsistency.expected | 0 .../security/CWE-327/{ => BrokenCryptoAlgorithm}/Cargo.lock | 0 .../security/CWE-327/{ => BrokenCryptoAlgorithm}/options.yml | 0 .../security/CWE-327/{ => BrokenCryptoAlgorithm}/test_cipher.rs | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename rust/ql/test/query-tests/security/CWE-327/{ => BrokenCryptoAlgorithm}/BrokenCryptoAlgorithm.expected (100%) rename rust/ql/test/query-tests/security/CWE-327/{ => BrokenCryptoAlgorithm}/BrokenCryptoAlgorithm.qlref (100%) rename rust/ql/test/query-tests/security/CWE-327/{ => BrokenCryptoAlgorithm}/CONSISTENCY/PathResolutionConsistency.expected (100%) rename rust/ql/test/query-tests/security/CWE-327/{ => BrokenCryptoAlgorithm}/Cargo.lock (100%) rename rust/ql/test/query-tests/security/CWE-327/{ => BrokenCryptoAlgorithm}/options.yml (100%) rename rust/ql/test/query-tests/security/CWE-327/{ => BrokenCryptoAlgorithm}/test_cipher.rs (100%) diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected similarity index 100% rename from rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.qlref b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.qlref similarity index 100% rename from rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.qlref rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.qlref diff --git a/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected similarity index 100% rename from rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected diff --git a/rust/ql/test/query-tests/security/CWE-327/Cargo.lock b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/Cargo.lock similarity index 100% rename from rust/ql/test/query-tests/security/CWE-327/Cargo.lock rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/Cargo.lock diff --git a/rust/ql/test/query-tests/security/CWE-327/options.yml b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/options.yml similarity index 100% rename from rust/ql/test/query-tests/security/CWE-327/options.yml rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/options.yml diff --git a/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs similarity index 100% rename from rust/ql/test/query-tests/security/CWE-327/test_cipher.rs rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs From c68112fb603f01508aeea2cd4eaa0964eb65a38e Mon Sep 17 00:00:00 2001 From: Geoffrey White <40627776+geoffw0@users.noreply.github.com> Date: Wed, 15 Oct 2025 15:24:06 +0100 Subject: [PATCH 3/4] Rust: Move the CWE-328 test. --- .../{CWE-328 => CWE-327/WeakSensitiveDataHashing}/Cargo.lock | 0 .../WeakSensitiveDataHashing}/WeakSensitiveDataHashing.expected | 0 .../WeakSensitiveDataHashing}/WeakSensitiveDataHashing.qlref | 0 .../{CWE-328 => CWE-327/WeakSensitiveDataHashing}/options.yml | 0 .../{CWE-328 => CWE-327/WeakSensitiveDataHashing}/test.rs | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename rust/ql/test/query-tests/security/{CWE-328 => CWE-327/WeakSensitiveDataHashing}/Cargo.lock (100%) rename rust/ql/test/query-tests/security/{CWE-328 => CWE-327/WeakSensitiveDataHashing}/WeakSensitiveDataHashing.expected (100%) rename rust/ql/test/query-tests/security/{CWE-328 => CWE-327/WeakSensitiveDataHashing}/WeakSensitiveDataHashing.qlref (100%) rename rust/ql/test/query-tests/security/{CWE-328 => CWE-327/WeakSensitiveDataHashing}/options.yml (100%) rename rust/ql/test/query-tests/security/{CWE-328 => CWE-327/WeakSensitiveDataHashing}/test.rs (100%) diff --git a/rust/ql/test/query-tests/security/CWE-328/Cargo.lock b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/Cargo.lock similarity index 100% rename from rust/ql/test/query-tests/security/CWE-328/Cargo.lock rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/Cargo.lock diff --git a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.expected b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected similarity index 100% rename from rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.expected rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected diff --git a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.qlref similarity index 100% rename from rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.qlref diff --git a/rust/ql/test/query-tests/security/CWE-328/options.yml b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/options.yml similarity index 100% rename from rust/ql/test/query-tests/security/CWE-328/options.yml rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/options.yml diff --git a/rust/ql/test/query-tests/security/CWE-328/test.rs b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs similarity index 100% rename from rust/ql/test/query-tests/security/CWE-328/test.rs rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs From eb1555c45eddf93b75a88f85dd98d6ec2fda7bb8 Mon Sep 17 00:00:00 2001 From: Geoffrey White <40627776+geoffw0@users.noreply.github.com> Date: Wed, 15 Oct 2025 16:08:08 +0100 Subject: [PATCH 4/4] Rust: Update the suite list .expected files. --- .../query-suite/rust-code-scanning.qls.expected | 2 +- .../query-suite/rust-security-and-quality.qls.expected | 2 +- .../query-suite/rust-security-extended.qls.expected | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected b/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected index 429ba1922244..70e1bcb10647 100644 --- a/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected +++ b/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected @@ -16,7 +16,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql -ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql +ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql diff --git a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected index 483cb52881dd..596fdef3b20e 100644 --- a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected +++ b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected @@ -17,7 +17,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql -ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql +ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql ql/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql diff --git a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected index f09d9280ac97..102c63e7942b 100644 --- a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected +++ b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected @@ -17,7 +17,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql -ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql +ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql