modification in node-sequelize-hardcoded-secret-argument-javascript

Author: Sakshis

rules/javascript/security/node-sequelize-hardcoded-secret-argument-javascript.yml

@@ -39,37 +39,59 @@ utils:
                        has:
                             stopBy: end
                             kind: string_fragment
-                - any:
-                    - follows:
-                       stopBy: end
-                       kind: lexical_declaration
-                       has: 
-                        stopBy: end
-                        kind: variable_declarator
-                        has:
-                            stopBy: end
-                            kind: identifier
-                            pattern: $E
-                    - follows:
-                       stopBy: end
-                       kind: import_statement
-                       has: 
-                        stopBy: end
-                        kind: import_clause
-                        has:
-                            stopBy: end
-                            kind: identifier
-                            pattern: $E
-                    - follows:
+                - follows:
+                      stopBy: end
+                      any:
+                        - pattern: const $E = require('sequelize')
+                        - pattern: import $E from 'sequelize'
+                        - pattern: import * as $E from 'sequelize'
+                        - pattern: import {$E} from 'sequelize'
+    MATCH_BLANK_PASSWORD_with_instance:
+        kind: identifier
+        pattern: $W
+        inside:
+               stopBy: end
+               kind: lexical_declaration
+               all:
+                - has:
+                   stopBy: end
+                   kind: new_expression
+                   all:
+                   - has:
+                      stopBy: end
+                      kind: identifier
+                      pattern: $E
+                   - has:
+                      stopBy: end
+                      kind: arguments
+                      nthChild: 2
+                      has:
                        stopBy: end
-                       kind: import_statement
-                       has: 
-                        stopBy: end
-                        kind: import_clause
-                        has:
-                            stopBy: end
-                            kind: identifier
-                            pattern: $E
+                       kind: identifier
+                       nthChild: 3
+                       pattern: $W
+                - follows:
+                      stopBy: end
+                      any:
+                        - pattern: const $E = require('sequelize')
+                        - pattern: import $E from 'sequelize'
+                        - pattern: import * as $E from 'sequelize'
+                        - pattern: import {$E} from 'sequelize'  
+                - follows:
+                   stopBy: end
+                   any:
+                      - pattern: $W = $R
+                      - pattern: let $W = $R
 rule:
+  any:
+     - kind: string
+       matches: MATCH_BLANK_PASSWORD
+     - kind: identifier
+       matches: MATCH_BLANK_PASSWORD_with_instance
+constraints:
+   R:
     kind: string
-    matches: MATCH_BLANK_PASSWORD
+    has:
+       stopBy: neighbor
+       kind: string_fragment
+    

tests/__snapshots__/node-sequelize-hardcoded-secret-argument-javascript-snapshot.yml

@@ -42,14 +42,6 @@ snapshots:
       style: secondary
       start: 58
       end: 165
-    - source: Sequelize
-      style: secondary
-      start: 6
-      end: 15
-    - source: Sequelize = require('sequelize')
-      style: secondary
-      start: 6
-      end: 38
     - source: const Sequelize = require('sequelize');
       style: secondary
       start: 0
@@ -91,14 +83,6 @@ snapshots:
       style: secondary
       start: 59
       end: 117
-    - source: Sequelize
-      style: secondary
-      start: 6
-      end: 15
-    - source: Sequelize = require('sequelize')
-      style: secondary
-      start: 6
-      end: 38
     - source: const Sequelize = require('sequelize');
       style: secondary
       start: 0