From 8494fcf45fcb7c21abbd5640cc28106b85afc653 Mon Sep 17 00:00:00 2001 From: Rasmus Wriedt Larsen Date: Tue, 16 Feb 2021 13:15:01 +0100 Subject: [PATCH] Python: Move query tests to reflect new file layout --- .../ExternalAPIs}/ExternalAPIsUsedWithUntrustedData.expected | 0 .../ExternalAPIs}/ExternalAPIsUsedWithUntrustedData.qlref | 0 .../ExternalAPIs}/UntrustedDataToExternalAPI.expected | 0 .../ExternalAPIs}/UntrustedDataToExternalAPI.qlref | 0 .../{Security/CWE-020-ExternalAPIs => POI/ExternalAPIs}/test.py | 0 .../BindToAllInterfaces}/BindToAllInterfaces.expected | 0 .../BindToAllInterfaces}/BindToAllInterfaces.qlref | 0 .../BindToAllInterfaces}/BindToAllInterfaces_test.py | 0 .../{CVE-2018-1281 => BadPractice/BindToAllInterfaces}/options | 0 .../FlaskRunWithDebug}/FlaskDebug.expected | 0 .../{CWE-215 => BadPractice/FlaskRunWithDebug}/FlaskDebug.qlref | 0 .../query-tests/Security/BadPractice/FlaskRunWithDebug/options | 1 + .../Security/{CWE-215 => BadPractice/FlaskRunWithDebug}/test.py | 0 .../RequestWithoutValidation.expected | 0 .../RequestWithoutValidation.qlref | 0 .../HTTPSRequestWithoutCertValidation}/make_request.py | 0 .../BadPractice/HTTPSRequestWithoutCertValidation/options | 1 + .../HardcodedCredentials}/HardcodedCredentials.expected | 0 .../HardcodedCredentials}/HardcodedCredentials.qlref | 0 .../{CWE-798 => BadPractice/HardcodedCredentials}/test.py | 0 .../IncompleteUrlSanitizer}/IncompleteHostnameRegExp.expected | 0 .../IncompleteUrlSanitizer}/IncompleteHostnameRegExp.qlref | 0 .../IncompleteUrlSubstringSanitization.expected | 0 .../IncompleteUrlSubstringSanitization.qlref | 0 .../{CWE-020 => BadPractice/IncompleteUrlSanitizer}/hosttest.py | 0 .../{CWE-020 => BadPractice/IncompleteUrlSanitizer}/urltest.py | 0 .../InsecureTemporaryFile}/InsecureTemporaryFile.expected | 0 .../InsecureTemporaryFile}/InsecureTemporaryFile.py | 0 .../InsecureTemporaryFile}/InsecureTemporaryFile.qlref | 0 .../InsecureTemporaryFile}/SecureTemporaryFile.py | 0 .../Security/BadPractice/InsecureTemporaryFile/options | 1 + .../Jinja2RenderWithoutEscape}/Jinja2WithoutEscaping.expected | 0 .../Jinja2RenderWithoutEscape}/Jinja2WithoutEscaping.qlref | 0 .../Jinja2RenderWithoutEscape}/jinja2_escaping.py | 0 .../Jinja2RenderWithoutEscape}/options | 0 .../MissingHostKeyValidation.expected | 0 .../SSHMissingHostKeyValidation}/MissingHostKeyValidation.qlref | 0 .../Security/BadPractice/SSHMissingHostKeyValidation/options | 1 + .../SSHMissingHostKeyValidation}/paramiko_host_key.py | 0 .../WeakFilePermissions}/WeakFilePermissions.expected | 0 .../WeakFilePermissions}/WeakFilePermissions.qlref | 0 .../query-tests/Security/BadPractice/WeakFilePermissions/options | 1 + .../{CWE-732 => BadPractice/WeakFilePermissions}/test.py | 0 python/ql/test/query-tests/Security/CWE-079/options | 1 - python/ql/test/query-tests/Security/CWE-209/options | 1 - python/ql/test/query-tests/Security/CWE-215/options | 1 - python/ql/test/query-tests/Security/CWE-295/options | 1 - python/ql/test/query-tests/Security/CWE-312/options | 1 - python/ql/test/query-tests/Security/CWE-326/options | 1 - python/ql/test/query-tests/Security/CWE-327/options | 1 - python/ql/test/query-tests/Security/CWE-377/options | 1 - python/ql/test/query-tests/Security/CWE-601/options | 1 - python/ql/test/query-tests/Security/CWE-732/options | 1 - .../{CWE-327 => Crypto/TLS}/InsecureDefaultProtocol.expected | 0 .../{CWE-327 => Crypto/TLS}/InsecureDefaultProtocol.qlref | 0 .../Security/{CWE-327 => Crypto/TLS}/InsecureProtocol.expected | 0 .../Security/{CWE-327 => Crypto/TLS}/InsecureProtocol.py | 0 .../Security/{CWE-327 => Crypto/TLS}/InsecureProtocol.qlref | 0 python/ql/test/query-tests/Security/Crypto/TLS/options | 1 + .../WeakCryptoAlgorithm}/BrokenCryptoAlgorithm.expected | 0 .../WeakCryptoAlgorithm}/BrokenCryptoAlgorithm.qlref | 0 .../{CWE-327 => Crypto/WeakCryptoAlgorithm}/TestNode.expected | 0 .../Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/TestNode.ql | 0 .../test/query-tests/Security/Crypto/WeakCryptoAlgorithm/options | 1 + .../{CWE-327 => Crypto/WeakCryptoAlgorithm}/test_cryptography.py | 0 .../{CWE-327 => Crypto/WeakCryptoAlgorithm}/test_pycrypto.py | 0 .../{CWE-326 => Crypto/WeakCryptoKey}/WeakCrypto.expected | 0 .../Security/{CWE-326 => Crypto/WeakCryptoKey}/WeakCrypto.qlref | 0 python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/options | 1 + .../Security/{CWE-326 => Crypto/WeakCryptoKey}/weak_crypto.py | 0 .../SensitiveDataExposure}/CleartextLogging.expected | 0 .../SensitiveDataExposure}/CleartextLogging.qlref | 0 .../SensitiveDataExposure}/CleartextStorage.expected | 0 .../SensitiveDataExposure}/CleartextStorage.qlref | 0 .../query-tests/Security/Exposure/SensitiveDataExposure/options | 1 + .../SensitiveDataExposure}/password_in_cookie.py | 0 .../Security/{CWE-312 => Exposure/SensitiveDataExposure}/test.py | 0 .../StackTraceExposure}/StackTraceExposure.expected | 0 .../StackTraceExposure}/StackTraceExposure.qlref | 0 .../query-tests/Security/Exposure/StackTraceExposure/options | 1 + .../Security/{CWE-209 => Exposure/StackTraceExposure}/test.py | 0 .../{CWE-094 => Injection/CodeInjection}/CodeInjection.expected | 0 .../{CWE-094 => Injection/CodeInjection}/CodeInjection.qlref | 0 .../{CWE-094 => Injection/CodeInjection}/code_injection.py | 0 .../CommandInjection-py2}/CommandInjection.expected | 0 .../CommandInjection-py2}/CommandInjection.qlref | 0 .../CommandInjection-py2}/command_injection.py | 0 .../{CWE-078-py2 => Injection/CommandInjection-py2}/options | 0 .../CommandInjection}/CommandInjection.expected | 0 .../CommandInjection}/CommandInjection.qlref | 0 .../{CWE-078 => Injection/CommandInjection}/command_injection.py | 0 .../Security/{CWE-078 => Injection/CommandInjection}/options | 0 .../{CWE-601 => Injection/OpenRedirect}/UrlRedirect.expected | 0 .../{CWE-601 => Injection/OpenRedirect}/UrlRedirect.qlref | 0 .../ql/test/query-tests/Security/Injection/OpenRedirect/options | 1 + .../Security/{CWE-601 => Injection/OpenRedirect}/test.py | 0 .../{CWE-079 => Injection/ReflectedXss}/ReflectedXss.expected | 0 .../{CWE-079 => Injection/ReflectedXss}/ReflectedXss.qlref | 0 .../{CWE-079 => Injection/ReflectedXss}/reflected_xss.py | 0 .../{CWE-089 => Injection/SqlInjection}/SqlInjection.expected | 0 .../{CWE-089 => Injection/SqlInjection}/SqlInjection.qlref | 0 .../{CWE-089 => Injection/SqlInjection}/sql_injection.py | 0 .../TarSlip/PathInjection}/PathInjection.expected | 0 .../TarSlip/PathInjection}/PathInjection.qlref | 0 .../TarSlip/PathInjection}/path_injection.py | 0 .../TarSlip/PathInjection}/test.py | 0 .../TarSlip/PathInjection}/test_chaining.py | 0 .../{CWE-022-TarSlip => Injection/TarSlip}/TarSlip.expected | 0 .../{CWE-022-TarSlip => Injection/TarSlip}/TarSlip.qlref | 0 python/ql/test/query-tests/Security/Injection/TarSlip/options | 1 + .../Security/{CWE-022-TarSlip => Injection/TarSlip}/tarslip.py | 0 .../UnsafeDeserialization}/UnsafeDeserialization.expected | 0 .../UnsafeDeserialization}/UnsafeDeserialization.qlref | 0 .../UnsafeDeserialization}/unsafe_deserialization.py | 0 114 files changed, 12 insertions(+), 10 deletions(-) rename python/ql/test/query-tests/{Security/CWE-020-ExternalAPIs => POI/ExternalAPIs}/ExternalAPIsUsedWithUntrustedData.expected (100%) rename python/ql/test/query-tests/{Security/CWE-020-ExternalAPIs => POI/ExternalAPIs}/ExternalAPIsUsedWithUntrustedData.qlref (100%) rename python/ql/test/query-tests/{Security/CWE-020-ExternalAPIs => POI/ExternalAPIs}/UntrustedDataToExternalAPI.expected (100%) rename python/ql/test/query-tests/{Security/CWE-020-ExternalAPIs => POI/ExternalAPIs}/UntrustedDataToExternalAPI.qlref (100%) rename python/ql/test/query-tests/{Security/CWE-020-ExternalAPIs => POI/ExternalAPIs}/test.py (100%) rename python/ql/test/query-tests/Security/{CVE-2018-1281 => BadPractice/BindToAllInterfaces}/BindToAllInterfaces.expected (100%) rename python/ql/test/query-tests/Security/{CVE-2018-1281 => BadPractice/BindToAllInterfaces}/BindToAllInterfaces.qlref (100%) rename python/ql/test/query-tests/Security/{CVE-2018-1281 => BadPractice/BindToAllInterfaces}/BindToAllInterfaces_test.py (100%) rename python/ql/test/query-tests/Security/{CVE-2018-1281 => BadPractice/BindToAllInterfaces}/options (100%) rename python/ql/test/query-tests/Security/{CWE-215 => BadPractice/FlaskRunWithDebug}/FlaskDebug.expected (100%) rename python/ql/test/query-tests/Security/{CWE-215 => BadPractice/FlaskRunWithDebug}/FlaskDebug.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/options rename python/ql/test/query-tests/Security/{CWE-215 => BadPractice/FlaskRunWithDebug}/test.py (100%) rename python/ql/test/query-tests/Security/{CWE-295 => BadPractice/HTTPSRequestWithoutCertValidation}/RequestWithoutValidation.expected (100%) rename python/ql/test/query-tests/Security/{CWE-295 => BadPractice/HTTPSRequestWithoutCertValidation}/RequestWithoutValidation.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-295 => BadPractice/HTTPSRequestWithoutCertValidation}/make_request.py (100%) create mode 100644 python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/options rename python/ql/test/query-tests/Security/{CWE-798 => BadPractice/HardcodedCredentials}/HardcodedCredentials.expected (100%) rename python/ql/test/query-tests/Security/{CWE-798 => BadPractice/HardcodedCredentials}/HardcodedCredentials.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-798 => BadPractice/HardcodedCredentials}/test.py (100%) rename python/ql/test/query-tests/Security/{CWE-020 => BadPractice/IncompleteUrlSanitizer}/IncompleteHostnameRegExp.expected (100%) rename python/ql/test/query-tests/Security/{CWE-020 => BadPractice/IncompleteUrlSanitizer}/IncompleteHostnameRegExp.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-020 => BadPractice/IncompleteUrlSanitizer}/IncompleteUrlSubstringSanitization.expected (100%) rename python/ql/test/query-tests/Security/{CWE-020 => BadPractice/IncompleteUrlSanitizer}/IncompleteUrlSubstringSanitization.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-020 => BadPractice/IncompleteUrlSanitizer}/hosttest.py (100%) rename python/ql/test/query-tests/Security/{CWE-020 => BadPractice/IncompleteUrlSanitizer}/urltest.py (100%) rename python/ql/test/query-tests/Security/{CWE-377 => BadPractice/InsecureTemporaryFile}/InsecureTemporaryFile.expected (100%) rename python/ql/test/query-tests/Security/{CWE-377 => BadPractice/InsecureTemporaryFile}/InsecureTemporaryFile.py (100%) rename python/ql/test/query-tests/Security/{CWE-377 => BadPractice/InsecureTemporaryFile}/InsecureTemporaryFile.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-377 => BadPractice/InsecureTemporaryFile}/SecureTemporaryFile.py (100%) create mode 100644 python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/options rename python/ql/test/query-tests/Security/{CWE-079 => BadPractice/Jinja2RenderWithoutEscape}/Jinja2WithoutEscaping.expected (100%) rename python/ql/test/query-tests/Security/{CWE-079 => BadPractice/Jinja2RenderWithoutEscape}/Jinja2WithoutEscaping.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-079 => BadPractice/Jinja2RenderWithoutEscape}/jinja2_escaping.py (100%) rename python/ql/test/query-tests/Security/{CWE-022-TarSlip => BadPractice/Jinja2RenderWithoutEscape}/options (100%) rename python/ql/test/query-tests/Security/{CWE-295 => BadPractice/SSHMissingHostKeyValidation}/MissingHostKeyValidation.expected (100%) rename python/ql/test/query-tests/Security/{CWE-295 => BadPractice/SSHMissingHostKeyValidation}/MissingHostKeyValidation.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/options rename python/ql/test/query-tests/Security/{CWE-295 => BadPractice/SSHMissingHostKeyValidation}/paramiko_host_key.py (100%) rename python/ql/test/query-tests/Security/{CWE-732 => BadPractice/WeakFilePermissions}/WeakFilePermissions.expected (100%) rename python/ql/test/query-tests/Security/{CWE-732 => BadPractice/WeakFilePermissions}/WeakFilePermissions.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/options rename python/ql/test/query-tests/Security/{CWE-732 => BadPractice/WeakFilePermissions}/test.py (100%) delete mode 100644 python/ql/test/query-tests/Security/CWE-079/options delete mode 100644 python/ql/test/query-tests/Security/CWE-209/options delete mode 100644 python/ql/test/query-tests/Security/CWE-215/options delete mode 100644 python/ql/test/query-tests/Security/CWE-295/options delete mode 100644 python/ql/test/query-tests/Security/CWE-312/options delete mode 100644 python/ql/test/query-tests/Security/CWE-326/options delete mode 100644 python/ql/test/query-tests/Security/CWE-327/options delete mode 100644 python/ql/test/query-tests/Security/CWE-377/options delete mode 100644 python/ql/test/query-tests/Security/CWE-601/options delete mode 100644 python/ql/test/query-tests/Security/CWE-732/options rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/TLS}/InsecureDefaultProtocol.expected (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/TLS}/InsecureDefaultProtocol.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/TLS}/InsecureProtocol.expected (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/TLS}/InsecureProtocol.py (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/TLS}/InsecureProtocol.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/Crypto/TLS/options rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/BrokenCryptoAlgorithm.expected (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/BrokenCryptoAlgorithm.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/TestNode.expected (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/TestNode.ql (100%) create mode 100644 python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/options rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/test_cryptography.py (100%) rename python/ql/test/query-tests/Security/{CWE-327 => Crypto/WeakCryptoAlgorithm}/test_pycrypto.py (100%) rename python/ql/test/query-tests/Security/{CWE-326 => Crypto/WeakCryptoKey}/WeakCrypto.expected (100%) rename python/ql/test/query-tests/Security/{CWE-326 => Crypto/WeakCryptoKey}/WeakCrypto.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/options rename python/ql/test/query-tests/Security/{CWE-326 => Crypto/WeakCryptoKey}/weak_crypto.py (100%) rename python/ql/test/query-tests/Security/{CWE-312 => Exposure/SensitiveDataExposure}/CleartextLogging.expected (100%) rename python/ql/test/query-tests/Security/{CWE-312 => Exposure/SensitiveDataExposure}/CleartextLogging.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-312 => Exposure/SensitiveDataExposure}/CleartextStorage.expected (100%) rename python/ql/test/query-tests/Security/{CWE-312 => Exposure/SensitiveDataExposure}/CleartextStorage.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/options rename python/ql/test/query-tests/Security/{CWE-312 => Exposure/SensitiveDataExposure}/password_in_cookie.py (100%) rename python/ql/test/query-tests/Security/{CWE-312 => Exposure/SensitiveDataExposure}/test.py (100%) rename python/ql/test/query-tests/Security/{CWE-209 => Exposure/StackTraceExposure}/StackTraceExposure.expected (100%) rename python/ql/test/query-tests/Security/{CWE-209 => Exposure/StackTraceExposure}/StackTraceExposure.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/Exposure/StackTraceExposure/options rename python/ql/test/query-tests/Security/{CWE-209 => Exposure/StackTraceExposure}/test.py (100%) rename python/ql/test/query-tests/Security/{CWE-094 => Injection/CodeInjection}/CodeInjection.expected (100%) rename python/ql/test/query-tests/Security/{CWE-094 => Injection/CodeInjection}/CodeInjection.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-094 => Injection/CodeInjection}/code_injection.py (100%) rename python/ql/test/query-tests/Security/{CWE-078-py2 => Injection/CommandInjection-py2}/CommandInjection.expected (100%) rename python/ql/test/query-tests/Security/{CWE-078-py2 => Injection/CommandInjection-py2}/CommandInjection.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-078-py2 => Injection/CommandInjection-py2}/command_injection.py (100%) rename python/ql/test/query-tests/Security/{CWE-078-py2 => Injection/CommandInjection-py2}/options (100%) rename python/ql/test/query-tests/Security/{CWE-078 => Injection/CommandInjection}/CommandInjection.expected (100%) rename python/ql/test/query-tests/Security/{CWE-078 => Injection/CommandInjection}/CommandInjection.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-078 => Injection/CommandInjection}/command_injection.py (100%) rename python/ql/test/query-tests/Security/{CWE-078 => Injection/CommandInjection}/options (100%) rename python/ql/test/query-tests/Security/{CWE-601 => Injection/OpenRedirect}/UrlRedirect.expected (100%) rename python/ql/test/query-tests/Security/{CWE-601 => Injection/OpenRedirect}/UrlRedirect.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/Injection/OpenRedirect/options rename python/ql/test/query-tests/Security/{CWE-601 => Injection/OpenRedirect}/test.py (100%) rename python/ql/test/query-tests/Security/{CWE-079 => Injection/ReflectedXss}/ReflectedXss.expected (100%) rename python/ql/test/query-tests/Security/{CWE-079 => Injection/ReflectedXss}/ReflectedXss.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-079 => Injection/ReflectedXss}/reflected_xss.py (100%) rename python/ql/test/query-tests/Security/{CWE-089 => Injection/SqlInjection}/SqlInjection.expected (100%) rename python/ql/test/query-tests/Security/{CWE-089 => Injection/SqlInjection}/SqlInjection.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-089 => Injection/SqlInjection}/sql_injection.py (100%) rename python/ql/test/query-tests/Security/{CWE-022-PathInjection => Injection/TarSlip/PathInjection}/PathInjection.expected (100%) rename python/ql/test/query-tests/Security/{CWE-022-PathInjection => Injection/TarSlip/PathInjection}/PathInjection.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-022-PathInjection => Injection/TarSlip/PathInjection}/path_injection.py (100%) rename python/ql/test/query-tests/Security/{CWE-022-PathInjection => Injection/TarSlip/PathInjection}/test.py (100%) rename python/ql/test/query-tests/Security/{CWE-022-PathInjection => Injection/TarSlip/PathInjection}/test_chaining.py (100%) rename python/ql/test/query-tests/Security/{CWE-022-TarSlip => Injection/TarSlip}/TarSlip.expected (100%) rename python/ql/test/query-tests/Security/{CWE-022-TarSlip => Injection/TarSlip}/TarSlip.qlref (100%) create mode 100644 python/ql/test/query-tests/Security/Injection/TarSlip/options rename python/ql/test/query-tests/Security/{CWE-022-TarSlip => Injection/TarSlip}/tarslip.py (100%) rename python/ql/test/query-tests/Security/{CWE-502 => Injection/UnsafeDeserialization}/UnsafeDeserialization.expected (100%) rename python/ql/test/query-tests/Security/{CWE-502 => Injection/UnsafeDeserialization}/UnsafeDeserialization.qlref (100%) rename python/ql/test/query-tests/Security/{CWE-502 => Injection/UnsafeDeserialization}/unsafe_deserialization.py (100%) diff --git a/python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.expected b/python/ql/test/query-tests/POI/ExternalAPIs/ExternalAPIsUsedWithUntrustedData.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.expected rename to python/ql/test/query-tests/POI/ExternalAPIs/ExternalAPIsUsedWithUntrustedData.expected diff --git a/python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.qlref b/python/ql/test/query-tests/POI/ExternalAPIs/ExternalAPIsUsedWithUntrustedData.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.qlref rename to python/ql/test/query-tests/POI/ExternalAPIs/ExternalAPIsUsedWithUntrustedData.qlref diff --git a/python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.expected b/python/ql/test/query-tests/POI/ExternalAPIs/UntrustedDataToExternalAPI.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.expected rename to python/ql/test/query-tests/POI/ExternalAPIs/UntrustedDataToExternalAPI.expected diff --git a/python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.qlref b/python/ql/test/query-tests/POI/ExternalAPIs/UntrustedDataToExternalAPI.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.qlref rename to python/ql/test/query-tests/POI/ExternalAPIs/UntrustedDataToExternalAPI.qlref diff --git a/python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/test.py b/python/ql/test/query-tests/POI/ExternalAPIs/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020-ExternalAPIs/test.py rename to python/ql/test/query-tests/POI/ExternalAPIs/test.py diff --git a/python/ql/test/query-tests/Security/CVE-2018-1281/BindToAllInterfaces.expected b/python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/BindToAllInterfaces.expected similarity index 100% rename from python/ql/test/query-tests/Security/CVE-2018-1281/BindToAllInterfaces.expected rename to python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/BindToAllInterfaces.expected diff --git a/python/ql/test/query-tests/Security/CVE-2018-1281/BindToAllInterfaces.qlref b/python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/BindToAllInterfaces.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CVE-2018-1281/BindToAllInterfaces.qlref rename to python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/BindToAllInterfaces.qlref diff --git a/python/ql/test/query-tests/Security/CVE-2018-1281/BindToAllInterfaces_test.py b/python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/BindToAllInterfaces_test.py similarity index 100% rename from python/ql/test/query-tests/Security/CVE-2018-1281/BindToAllInterfaces_test.py rename to python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/BindToAllInterfaces_test.py diff --git a/python/ql/test/query-tests/Security/CVE-2018-1281/options b/python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/options similarity index 100% rename from python/ql/test/query-tests/Security/CVE-2018-1281/options rename to python/ql/test/query-tests/Security/BadPractice/BindToAllInterfaces/options diff --git a/python/ql/test/query-tests/Security/CWE-215/FlaskDebug.expected b/python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/FlaskDebug.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-215/FlaskDebug.expected rename to python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/FlaskDebug.expected diff --git a/python/ql/test/query-tests/Security/CWE-215/FlaskDebug.qlref b/python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/FlaskDebug.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-215/FlaskDebug.qlref rename to python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/FlaskDebug.qlref diff --git a/python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/options b/python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/options new file mode 100644 index 00000000000..e552c11e561 --- /dev/null +++ b/python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/options @@ -0,0 +1 @@ +semmle-extractor-options: --max-import-depth=2 -p ../../lib diff --git a/python/ql/test/query-tests/Security/CWE-215/test.py b/python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-215/test.py rename to python/ql/test/query-tests/Security/BadPractice/FlaskRunWithDebug/test.py diff --git a/python/ql/test/query-tests/Security/CWE-295/RequestWithoutValidation.expected b/python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/RequestWithoutValidation.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-295/RequestWithoutValidation.expected rename to python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/RequestWithoutValidation.expected diff --git a/python/ql/test/query-tests/Security/CWE-295/RequestWithoutValidation.qlref b/python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/RequestWithoutValidation.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-295/RequestWithoutValidation.qlref rename to python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/RequestWithoutValidation.qlref diff --git a/python/ql/test/query-tests/Security/CWE-295/make_request.py b/python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/make_request.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-295/make_request.py rename to python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/make_request.py diff --git a/python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/options b/python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/BadPractice/HTTPSRequestWithoutCertValidation/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected b/python/ql/test/query-tests/Security/BadPractice/HardcodedCredentials/HardcodedCredentials.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected rename to python/ql/test/query-tests/Security/BadPractice/HardcodedCredentials/HardcodedCredentials.expected diff --git a/python/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.qlref b/python/ql/test/query-tests/Security/BadPractice/HardcodedCredentials/HardcodedCredentials.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.qlref rename to python/ql/test/query-tests/Security/BadPractice/HardcodedCredentials/HardcodedCredentials.qlref diff --git a/python/ql/test/query-tests/Security/CWE-798/test.py b/python/ql/test/query-tests/Security/BadPractice/HardcodedCredentials/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-798/test.py rename to python/ql/test/query-tests/Security/BadPractice/HardcodedCredentials/test.py diff --git a/python/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp.expected b/python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteHostnameRegExp.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp.expected rename to python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteHostnameRegExp.expected diff --git a/python/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp.qlref b/python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteHostnameRegExp.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020/IncompleteHostnameRegExp.qlref rename to python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteHostnameRegExp.qlref diff --git a/python/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization.expected b/python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteUrlSubstringSanitization.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization.expected rename to python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteUrlSubstringSanitization.expected diff --git a/python/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization.qlref b/python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteUrlSubstringSanitization.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020/IncompleteUrlSubstringSanitization.qlref rename to python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/IncompleteUrlSubstringSanitization.qlref diff --git a/python/ql/test/query-tests/Security/CWE-020/hosttest.py b/python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/hosttest.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020/hosttest.py rename to python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/hosttest.py diff --git a/python/ql/test/query-tests/Security/CWE-020/urltest.py b/python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/urltest.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-020/urltest.py rename to python/ql/test/query-tests/Security/BadPractice/IncompleteUrlSanitizer/urltest.py diff --git a/python/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected b/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/InsecureTemporaryFile.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected rename to python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/InsecureTemporaryFile.expected diff --git a/python/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.py b/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/InsecureTemporaryFile.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.py rename to python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/InsecureTemporaryFile.py diff --git a/python/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.qlref b/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/InsecureTemporaryFile.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.qlref rename to python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/InsecureTemporaryFile.qlref diff --git a/python/ql/test/query-tests/Security/CWE-377/SecureTemporaryFile.py b/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/SecureTemporaryFile.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-377/SecureTemporaryFile.py rename to python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/SecureTemporaryFile.py diff --git a/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/options b/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/BadPractice/InsecureTemporaryFile/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-079/Jinja2WithoutEscaping.expected b/python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/Jinja2WithoutEscaping.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-079/Jinja2WithoutEscaping.expected rename to python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/Jinja2WithoutEscaping.expected diff --git a/python/ql/test/query-tests/Security/CWE-079/Jinja2WithoutEscaping.qlref b/python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/Jinja2WithoutEscaping.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-079/Jinja2WithoutEscaping.qlref rename to python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/Jinja2WithoutEscaping.qlref diff --git a/python/ql/test/query-tests/Security/CWE-079/jinja2_escaping.py b/python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/jinja2_escaping.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-079/jinja2_escaping.py rename to python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/jinja2_escaping.py diff --git a/python/ql/test/query-tests/Security/CWE-022-TarSlip/options b/python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/options similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-TarSlip/options rename to python/ql/test/query-tests/Security/BadPractice/Jinja2RenderWithoutEscape/options diff --git a/python/ql/test/query-tests/Security/CWE-295/MissingHostKeyValidation.expected b/python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/MissingHostKeyValidation.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-295/MissingHostKeyValidation.expected rename to python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/MissingHostKeyValidation.expected diff --git a/python/ql/test/query-tests/Security/CWE-295/MissingHostKeyValidation.qlref b/python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/MissingHostKeyValidation.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-295/MissingHostKeyValidation.qlref rename to python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/MissingHostKeyValidation.qlref diff --git a/python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/options b/python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-295/paramiko_host_key.py b/python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/paramiko_host_key.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-295/paramiko_host_key.py rename to python/ql/test/query-tests/Security/BadPractice/SSHMissingHostKeyValidation/paramiko_host_key.py diff --git a/python/ql/test/query-tests/Security/CWE-732/WeakFilePermissions.expected b/python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/WeakFilePermissions.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-732/WeakFilePermissions.expected rename to python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/WeakFilePermissions.expected diff --git a/python/ql/test/query-tests/Security/CWE-732/WeakFilePermissions.qlref b/python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/WeakFilePermissions.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-732/WeakFilePermissions.qlref rename to python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/WeakFilePermissions.qlref diff --git a/python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/options b/python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/options new file mode 100644 index 00000000000..e552c11e561 --- /dev/null +++ b/python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/options @@ -0,0 +1 @@ +semmle-extractor-options: --max-import-depth=2 -p ../../lib diff --git a/python/ql/test/query-tests/Security/CWE-732/test.py b/python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-732/test.py rename to python/ql/test/query-tests/Security/BadPractice/WeakFilePermissions/test.py diff --git a/python/ql/test/query-tests/Security/CWE-079/options b/python/ql/test/query-tests/Security/CWE-079/options deleted file mode 100644 index 492768b3481..00000000000 --- a/python/ql/test/query-tests/Security/CWE-079/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-209/options b/python/ql/test/query-tests/Security/CWE-209/options deleted file mode 100644 index 2729d5a143a..00000000000 --- a/python/ql/test/query-tests/Security/CWE-209/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=2 diff --git a/python/ql/test/query-tests/Security/CWE-215/options b/python/ql/test/query-tests/Security/CWE-215/options deleted file mode 100644 index 84717fe64cf..00000000000 --- a/python/ql/test/query-tests/Security/CWE-215/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: --max-import-depth=2 -p ../lib diff --git a/python/ql/test/query-tests/Security/CWE-295/options b/python/ql/test/query-tests/Security/CWE-295/options deleted file mode 100644 index 492768b3481..00000000000 --- a/python/ql/test/query-tests/Security/CWE-295/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-312/options b/python/ql/test/query-tests/Security/CWE-312/options deleted file mode 100644 index 492768b3481..00000000000 --- a/python/ql/test/query-tests/Security/CWE-312/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-326/options b/python/ql/test/query-tests/Security/CWE-326/options deleted file mode 100644 index 492768b3481..00000000000 --- a/python/ql/test/query-tests/Security/CWE-326/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-327/options b/python/ql/test/query-tests/Security/CWE-327/options deleted file mode 100644 index 492768b3481..00000000000 --- a/python/ql/test/query-tests/Security/CWE-327/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-377/options b/python/ql/test/query-tests/Security/CWE-377/options deleted file mode 100644 index 492768b3481..00000000000 --- a/python/ql/test/query-tests/Security/CWE-377/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: -p ../lib/ --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-601/options b/python/ql/test/query-tests/Security/CWE-601/options deleted file mode 100644 index 28b616e5f19..00000000000 --- a/python/ql/test/query-tests/Security/CWE-601/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: --lang=3 --max-import-depth=2 -p ../lib diff --git a/python/ql/test/query-tests/Security/CWE-732/options b/python/ql/test/query-tests/Security/CWE-732/options deleted file mode 100644 index 84717fe64cf..00000000000 --- a/python/ql/test/query-tests/Security/CWE-732/options +++ /dev/null @@ -1 +0,0 @@ -semmle-extractor-options: --max-import-depth=2 -p ../lib diff --git a/python/ql/test/query-tests/Security/CWE-327/InsecureDefaultProtocol.expected b/python/ql/test/query-tests/Security/Crypto/TLS/InsecureDefaultProtocol.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/InsecureDefaultProtocol.expected rename to python/ql/test/query-tests/Security/Crypto/TLS/InsecureDefaultProtocol.expected diff --git a/python/ql/test/query-tests/Security/CWE-327/InsecureDefaultProtocol.qlref b/python/ql/test/query-tests/Security/Crypto/TLS/InsecureDefaultProtocol.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/InsecureDefaultProtocol.qlref rename to python/ql/test/query-tests/Security/Crypto/TLS/InsecureDefaultProtocol.qlref diff --git a/python/ql/test/query-tests/Security/CWE-327/InsecureProtocol.expected b/python/ql/test/query-tests/Security/Crypto/TLS/InsecureProtocol.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/InsecureProtocol.expected rename to python/ql/test/query-tests/Security/Crypto/TLS/InsecureProtocol.expected diff --git a/python/ql/test/query-tests/Security/CWE-327/InsecureProtocol.py b/python/ql/test/query-tests/Security/Crypto/TLS/InsecureProtocol.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/InsecureProtocol.py rename to python/ql/test/query-tests/Security/Crypto/TLS/InsecureProtocol.py diff --git a/python/ql/test/query-tests/Security/CWE-327/InsecureProtocol.qlref b/python/ql/test/query-tests/Security/Crypto/TLS/InsecureProtocol.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/InsecureProtocol.qlref rename to python/ql/test/query-tests/Security/Crypto/TLS/InsecureProtocol.qlref diff --git a/python/ql/test/query-tests/Security/Crypto/TLS/options b/python/ql/test/query-tests/Security/Crypto/TLS/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/Crypto/TLS/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/BrokenCryptoAlgorithm.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/BrokenCryptoAlgorithm.expected diff --git a/python/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.qlref b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/BrokenCryptoAlgorithm.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.qlref rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/BrokenCryptoAlgorithm.qlref diff --git a/python/ql/test/query-tests/Security/CWE-327/TestNode.expected b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/TestNode.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/TestNode.expected rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/TestNode.expected diff --git a/python/ql/test/query-tests/Security/CWE-327/TestNode.ql b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/TestNode.ql similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/TestNode.ql rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/TestNode.ql diff --git a/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/options b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-327/test_cryptography.py b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/test_cryptography.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/test_cryptography.py rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/test_cryptography.py diff --git a/python/ql/test/query-tests/Security/CWE-327/test_pycrypto.py b/python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/test_pycrypto.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-327/test_pycrypto.py rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoAlgorithm/test_pycrypto.py diff --git a/python/ql/test/query-tests/Security/CWE-326/WeakCrypto.expected b/python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/WeakCrypto.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-326/WeakCrypto.expected rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/WeakCrypto.expected diff --git a/python/ql/test/query-tests/Security/CWE-326/WeakCrypto.qlref b/python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/WeakCrypto.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-326/WeakCrypto.qlref rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/WeakCrypto.qlref diff --git a/python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/options b/python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-326/weak_crypto.py b/python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/weak_crypto.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-326/weak_crypto.py rename to python/ql/test/query-tests/Security/Crypto/WeakCryptoKey/weak_crypto.py diff --git a/python/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextLogging.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected rename to python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextLogging.expected diff --git a/python/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextLogging.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-312/CleartextLogging.qlref rename to python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextLogging.qlref diff --git a/python/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextStorage.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected rename to python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextStorage.expected diff --git a/python/ql/test/query-tests/Security/CWE-312/CleartextStorage.qlref b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextStorage.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-312/CleartextStorage.qlref rename to python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/CleartextStorage.qlref diff --git a/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/options b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-312/password_in_cookie.py b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/password_in_cookie.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-312/password_in_cookie.py rename to python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/password_in_cookie.py diff --git a/python/ql/test/query-tests/Security/CWE-312/test.py b/python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-312/test.py rename to python/ql/test/query-tests/Security/Exposure/SensitiveDataExposure/test.py diff --git a/python/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected b/python/ql/test/query-tests/Security/Exposure/StackTraceExposure/StackTraceExposure.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected rename to python/ql/test/query-tests/Security/Exposure/StackTraceExposure/StackTraceExposure.expected diff --git a/python/ql/test/query-tests/Security/CWE-209/StackTraceExposure.qlref b/python/ql/test/query-tests/Security/Exposure/StackTraceExposure/StackTraceExposure.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-209/StackTraceExposure.qlref rename to python/ql/test/query-tests/Security/Exposure/StackTraceExposure/StackTraceExposure.qlref diff --git a/python/ql/test/query-tests/Security/Exposure/StackTraceExposure/options b/python/ql/test/query-tests/Security/Exposure/StackTraceExposure/options new file mode 100644 index 00000000000..59cbd921362 --- /dev/null +++ b/python/ql/test/query-tests/Security/Exposure/StackTraceExposure/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=2 diff --git a/python/ql/test/query-tests/Security/CWE-209/test.py b/python/ql/test/query-tests/Security/Exposure/StackTraceExposure/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-209/test.py rename to python/ql/test/query-tests/Security/Exposure/StackTraceExposure/test.py diff --git a/python/ql/test/query-tests/Security/CWE-094/CodeInjection.expected b/python/ql/test/query-tests/Security/Injection/CodeInjection/CodeInjection.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-094/CodeInjection.expected rename to python/ql/test/query-tests/Security/Injection/CodeInjection/CodeInjection.expected diff --git a/python/ql/test/query-tests/Security/CWE-094/CodeInjection.qlref b/python/ql/test/query-tests/Security/Injection/CodeInjection/CodeInjection.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-094/CodeInjection.qlref rename to python/ql/test/query-tests/Security/Injection/CodeInjection/CodeInjection.qlref diff --git a/python/ql/test/query-tests/Security/CWE-094/code_injection.py b/python/ql/test/query-tests/Security/Injection/CodeInjection/code_injection.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-094/code_injection.py rename to python/ql/test/query-tests/Security/Injection/CodeInjection/code_injection.py diff --git a/python/ql/test/query-tests/Security/CWE-078-py2/CommandInjection.expected b/python/ql/test/query-tests/Security/Injection/CommandInjection-py2/CommandInjection.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078-py2/CommandInjection.expected rename to python/ql/test/query-tests/Security/Injection/CommandInjection-py2/CommandInjection.expected diff --git a/python/ql/test/query-tests/Security/CWE-078-py2/CommandInjection.qlref b/python/ql/test/query-tests/Security/Injection/CommandInjection-py2/CommandInjection.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078-py2/CommandInjection.qlref rename to python/ql/test/query-tests/Security/Injection/CommandInjection-py2/CommandInjection.qlref diff --git a/python/ql/test/query-tests/Security/CWE-078-py2/command_injection.py b/python/ql/test/query-tests/Security/Injection/CommandInjection-py2/command_injection.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078-py2/command_injection.py rename to python/ql/test/query-tests/Security/Injection/CommandInjection-py2/command_injection.py diff --git a/python/ql/test/query-tests/Security/CWE-078-py2/options b/python/ql/test/query-tests/Security/Injection/CommandInjection-py2/options similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078-py2/options rename to python/ql/test/query-tests/Security/Injection/CommandInjection-py2/options diff --git a/python/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/python/ql/test/query-tests/Security/Injection/CommandInjection/CommandInjection.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078/CommandInjection.expected rename to python/ql/test/query-tests/Security/Injection/CommandInjection/CommandInjection.expected diff --git a/python/ql/test/query-tests/Security/CWE-078/CommandInjection.qlref b/python/ql/test/query-tests/Security/Injection/CommandInjection/CommandInjection.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078/CommandInjection.qlref rename to python/ql/test/query-tests/Security/Injection/CommandInjection/CommandInjection.qlref diff --git a/python/ql/test/query-tests/Security/CWE-078/command_injection.py b/python/ql/test/query-tests/Security/Injection/CommandInjection/command_injection.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078/command_injection.py rename to python/ql/test/query-tests/Security/Injection/CommandInjection/command_injection.py diff --git a/python/ql/test/query-tests/Security/CWE-078/options b/python/ql/test/query-tests/Security/Injection/CommandInjection/options similarity index 100% rename from python/ql/test/query-tests/Security/CWE-078/options rename to python/ql/test/query-tests/Security/Injection/CommandInjection/options diff --git a/python/ql/test/query-tests/Security/CWE-601/UrlRedirect.expected b/python/ql/test/query-tests/Security/Injection/OpenRedirect/UrlRedirect.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-601/UrlRedirect.expected rename to python/ql/test/query-tests/Security/Injection/OpenRedirect/UrlRedirect.expected diff --git a/python/ql/test/query-tests/Security/CWE-601/UrlRedirect.qlref b/python/ql/test/query-tests/Security/Injection/OpenRedirect/UrlRedirect.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-601/UrlRedirect.qlref rename to python/ql/test/query-tests/Security/Injection/OpenRedirect/UrlRedirect.qlref diff --git a/python/ql/test/query-tests/Security/Injection/OpenRedirect/options b/python/ql/test/query-tests/Security/Injection/OpenRedirect/options new file mode 100644 index 00000000000..2c9a5f0a13c --- /dev/null +++ b/python/ql/test/query-tests/Security/Injection/OpenRedirect/options @@ -0,0 +1 @@ +semmle-extractor-options: --lang=3 --max-import-depth=2 -p ../../lib diff --git a/python/ql/test/query-tests/Security/CWE-601/test.py b/python/ql/test/query-tests/Security/Injection/OpenRedirect/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-601/test.py rename to python/ql/test/query-tests/Security/Injection/OpenRedirect/test.py diff --git a/python/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected b/python/ql/test/query-tests/Security/Injection/ReflectedXss/ReflectedXss.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected rename to python/ql/test/query-tests/Security/Injection/ReflectedXss/ReflectedXss.expected diff --git a/python/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref b/python/ql/test/query-tests/Security/Injection/ReflectedXss/ReflectedXss.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-079/ReflectedXss.qlref rename to python/ql/test/query-tests/Security/Injection/ReflectedXss/ReflectedXss.qlref diff --git a/python/ql/test/query-tests/Security/CWE-079/reflected_xss.py b/python/ql/test/query-tests/Security/Injection/ReflectedXss/reflected_xss.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-079/reflected_xss.py rename to python/ql/test/query-tests/Security/Injection/ReflectedXss/reflected_xss.py diff --git a/python/ql/test/query-tests/Security/CWE-089/SqlInjection.expected b/python/ql/test/query-tests/Security/Injection/SqlInjection/SqlInjection.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-089/SqlInjection.expected rename to python/ql/test/query-tests/Security/Injection/SqlInjection/SqlInjection.expected diff --git a/python/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref b/python/ql/test/query-tests/Security/Injection/SqlInjection/SqlInjection.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-089/SqlInjection.qlref rename to python/ql/test/query-tests/Security/Injection/SqlInjection/SqlInjection.qlref diff --git a/python/ql/test/query-tests/Security/CWE-089/sql_injection.py b/python/ql/test/query-tests/Security/Injection/SqlInjection/sql_injection.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-089/sql_injection.py rename to python/ql/test/query-tests/Security/Injection/SqlInjection/sql_injection.py diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.expected b/python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/PathInjection.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.expected rename to python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/PathInjection.expected diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.qlref b/python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/PathInjection.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.qlref rename to python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/PathInjection.qlref diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py b/python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/path_injection.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py rename to python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/path_injection.py diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py b/python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/test.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py rename to python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/test.py diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test_chaining.py b/python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/test_chaining.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-PathInjection/test_chaining.py rename to python/ql/test/query-tests/Security/Injection/TarSlip/PathInjection/test_chaining.py diff --git a/python/ql/test/query-tests/Security/CWE-022-TarSlip/TarSlip.expected b/python/ql/test/query-tests/Security/Injection/TarSlip/TarSlip.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-TarSlip/TarSlip.expected rename to python/ql/test/query-tests/Security/Injection/TarSlip/TarSlip.expected diff --git a/python/ql/test/query-tests/Security/CWE-022-TarSlip/TarSlip.qlref b/python/ql/test/query-tests/Security/Injection/TarSlip/TarSlip.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-TarSlip/TarSlip.qlref rename to python/ql/test/query-tests/Security/Injection/TarSlip/TarSlip.qlref diff --git a/python/ql/test/query-tests/Security/Injection/TarSlip/options b/python/ql/test/query-tests/Security/Injection/TarSlip/options new file mode 100644 index 00000000000..b7721e6c509 --- /dev/null +++ b/python/ql/test/query-tests/Security/Injection/TarSlip/options @@ -0,0 +1 @@ +semmle-extractor-options: -p ../../lib --max-import-depth=3 diff --git a/python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py b/python/ql/test/query-tests/Security/Injection/TarSlip/tarslip.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-022-TarSlip/tarslip.py rename to python/ql/test/query-tests/Security/Injection/TarSlip/tarslip.py diff --git a/python/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.expected b/python/ql/test/query-tests/Security/Injection/UnsafeDeserialization/UnsafeDeserialization.expected similarity index 100% rename from python/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.expected rename to python/ql/test/query-tests/Security/Injection/UnsafeDeserialization/UnsafeDeserialization.expected diff --git a/python/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.qlref b/python/ql/test/query-tests/Security/Injection/UnsafeDeserialization/UnsafeDeserialization.qlref similarity index 100% rename from python/ql/test/query-tests/Security/CWE-502/UnsafeDeserialization.qlref rename to python/ql/test/query-tests/Security/Injection/UnsafeDeserialization/UnsafeDeserialization.qlref diff --git a/python/ql/test/query-tests/Security/CWE-502/unsafe_deserialization.py b/python/ql/test/query-tests/Security/Injection/UnsafeDeserialization/unsafe_deserialization.py similarity index 100% rename from python/ql/test/query-tests/Security/CWE-502/unsafe_deserialization.py rename to python/ql/test/query-tests/Security/Injection/UnsafeDeserialization/unsafe_deserialization.py