Modified rule - python-couchbase-empty-password-python

ESS-ENN · ESS-ENN · commit 882e371f26a7 · 2024-11-07T18:00:51.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@ast-grep/cli": "^0.26.0"
+    "@ast-grep/cli": "^0.28.1"
   }
-}
+}
diff --git a/rules/python/security/python-couchbase-empty-password-python.yml b/rules/python/security/python-couchbase-empty-password-python.yml
@@ -24,12 +24,16 @@ utils:
           stopBy: neighbor
           kind: argument_list
           all:
-            - has:
-                stopBy: neighbor
-                kind: string
-                has:
-                  stopBy: neighbor
-                  kind: string_content
+            - any:
+                - has:
+                    stopBy: end
+                    kind: attribute
+                    has:
+                      stopBy: neighbor
+                      kind: identifier
+                - has:
+                    stopBy: neighbor
+                    kind: string
             - has:
                 stopBy: neighbor
                 kind: string
@@ -38,35 +42,35 @@ utils:
                     stopBy: neighbor
                     kind: string_content
 
-    inside:
-      stopBy: end
-      kind: expression_statement
-      follows:
-        stopBy: end
-        kind: import_from_statement
-        all:
-          - has:
-              stopBy: end
-              kind: dotted_name
-              field: module_name
-              all:
-                - has:
-                    stopBy: end
-                    kind: identifier
-                    regex: couchbase_core
-                - has:
+      - inside:
+          stopBy: end
+          kind: module
+          has:
+            stopBy: end
+            kind: import_from_statement
+            all:
+              - has:
+                  stopBy: end
+                  kind: dotted_name
+                  field: module_name
+                  all:
+                    - has:
+                        stopBy: end
+                        kind: identifier
+                        regex: couchbase_core
+                    - has:
+                        stopBy: end
+                        kind: identifier
+                        regex: cluster
+              - has:
+                  stopBy: end
+                  kind: dotted_name
+                  field: name
+                  has:
                     stopBy: end
                     kind: identifier
-                    regex: cluster
-          - has:
-              stopBy: end
-              kind: dotted_name
-              field: name
-              has:
-                stopBy: end
-                kind: identifier
-                pattern: $R
-                regex: PasswordAuthenticator
+                    pattern: $R
+                    regex: PasswordAuthenticator
 rule:
   all:
     - matches: match_passwordauthenticator
diff --git a/tests/__snapshots__/python-couchbase-empty-password-python-snapshot.yml b/tests/__snapshots__/python-couchbase-empty-password-python-snapshot.yml
@@ -14,10 +14,6 @@ snapshots:
       style: secondary
       start: 121
       end: 142
-    - source: username
-      style: secondary
-      start: 144
-      end: 152
     - source: '''username'''
       style: secondary
       start: 143
@@ -54,10 +50,14 @@ snapshots:
       style: secondary
       start: 64
       end: 120
-    - source: PasswordAuthenticator('username', '')
-      style: secondary
-      start: 121
-      end: 158
+    - source: |
+        import os
+        from couchbase.cluster import Cluster, ClusterOptions
+        from couchbase_core.cluster import PasswordAuthenticator
+        PasswordAuthenticator('username', '')
+      style: secondary
+      start: 0
+      end: 159
   ? |
     import os
     from couchbase.cluster import Cluster, ClusterOptions
@@ -72,10 +72,6 @@ snapshots:
       style: secondary
       start: 179
       end: 200
-    - source: username
-      style: secondary
-      start: 202
-      end: 210
     - source: '''username'''
       style: secondary
       start: 201
@@ -112,7 +108,11 @@ snapshots:
       style: secondary
       start: 64
       end: 120
-    - source: cluster = Cluster('couchbase://localhost', ClusterOptions(PasswordAuthenticator('username', '')))
-      style: secondary
-      start: 121
-      end: 218
+    - source: |
+        import os
+        from couchbase.cluster import Cluster, ClusterOptions
+        from couchbase_core.cluster import PasswordAuthenticator
+        cluster = Cluster('couchbase://localhost', ClusterOptions(PasswordAuthenticator('username', '')))
+      style: secondary
+      start: 0
+      end: 219

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`"author": "",`
`13`	`13`	`"license": "ISC",`
`14`	`14`	`"devDependencies": {`
`15`		`- "@ast-grep/cli": "^0.26.0"`
	`15`	`+ "@ast-grep/cli": "^0.28.1"`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`