refactor: simplify

Bearer · Jan 26, 2024 · 53c61eb · 53c61eb
1 parent b1c3a8a
commit 53c61eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/rules/java/lang/blowfish_key_size.yml b/rules/java/lang/blowfish_key_size.yml
@@ -1,12 +1,19 @@
-imports:
-  - java_shared_lang_blowfish_key_generator_init
 patterns:
   - pattern: $<BLOWFISH_KEY_GEN>.init($<SIZE>);
     filters:
       - variable: BLOWFISH_KEY_GEN
-        detection: java_shared_lang_blowfish_key_generator_init
+        detection: java_lang_blowfish_key_generator_init
       - variable: SIZE
         less_than: 128
+auxiliary:
+  - id: java_lang_blowfish_key_generator_init
+    patterns:
+      - pattern: $<KEY_GENERATOR>.getInstance($<BLOWFISH_ALGORITHM>$<...>);
+        filters:
+          - variable: KEY_GENERATOR
+            regex: \A(java\.crypto\.)?KeyGenerator\z
+          - variable: BLOWFISH_ALGORITHM
+            string_regex: (?i)\ABlowfish\z
 languages:
   - java
 severity: warning

diff --git a/rules/java/shared/lang/blowfish_key_generator_init.yml b/rules/java/shared/lang/blowfish_key_generator_init.yml