Rename based on discussion

semgrep · Nov 8, 2023 · d036762 · d036762
1 parent a12009e
commit d036762
Showing 1 changed file with 23 additions and 45 deletions.
diff --git a/rule_schema_v1.yaml b/rule_schema_v1.yaml
@@ -132,6 +132,7 @@ $defs:
         - required: [ any ]
         - required: [ not ]
         - required: [ inside ]
+        - required: [ anywhere ]
         - required: [ taint ]
       properties:
         pattern:
@@ -152,6 +153,8 @@ $defs:
           $ref: "#/$defs/new-pattern"
         inside:
           $ref: "#/$defs/new-pattern"
+        anywhere:
+          $ref: "#/$defs/new-pattern"
         where:
           type: array
           items:
@@ -217,10 +220,10 @@ $defs:
           - required: [ pattern ]
           - required: [ pattern-regex ]
           - required: [ patterns ]
-          - required: [ semgrep-internal-patterns-allow-disjoint ]
           - required: [ pattern-either ]
           - required: [ pattern-not ]
           - required: [ pattern-inside ]
+          - required: [ semgrep-internal-pattern-anywhere ]
           - required: [ pattern-not-inside ]
         properties:
           pattern:
@@ -229,14 +232,14 @@ $defs:
             type: string
           patterns:
             $ref: "#/$defs/patterns-content"
-          semgrep-internal-patterns-allow-disjoint:
-            $ref: "#/$defs/patterns-content"
           pattern-either:
             $ref: "#/$defs/pattern-either-content"
           pattern-not:
             $ref: "#/$defs/general-pattern-content"
           pattern-inside:
             $ref: "#/$defs/general-pattern-content"
+          semgrep-internal-pattern-anywhere:
+            $ref: "#/$defs/general-pattern-content"
           pattern-not-inside:
             $ref: "#/$defs/general-pattern-content"
       else:
@@ -247,10 +250,10 @@ $defs:
     items:
       anyOf:
         - $ref: "#/$defs/patterns"
-        - $ref: "#/$defs/semgrep-internal-patterns-allow-disjoint"
         - $ref: "#/$defs/pattern-either"
         - $ref: "#/$defs/focus-metavariable"
         - $ref: "#/$defs/pattern-inside"
+        - $ref: "#/$defs/semgrep-internal-pattern-anywhere"
         - $ref: "#/$defs/pattern-not-inside"
         - $ref: "#/$defs/pattern-not"
         - $ref: "#/$defs/pattern"
@@ -268,9 +271,9 @@ $defs:
     items:
       anyOf:
         - $ref: "#/$defs/patterns"
-        - $ref: "#/$defs/semgrep-internal-patterns-allow-disjoint"
         - $ref: "#/$defs/pattern-either"
         - $ref: "#/$defs/pattern-inside"
+        - $ref: "#/$defs/semgrep-internal-pattern-anywhere"
         - $ref: "#/$defs/pattern"
         - $ref: "#/$defs/pattern-regex"
   taint-content:
@@ -508,8 +511,6 @@ $defs:
             type: string
           patterns:
             $ref: "#/$defs/patterns-content"
-          semgrep-internal-patterns-allow-disjoint:
-            $ref: "#/$defs/patterns-content"
           pattern-either:
             $ref: "#/$defs/pattern-either-content"
         required:
@@ -521,8 +522,6 @@ $defs:
               anyOf:
                 - required:
                     - patterns
-                - required:
-                    - semgrep-internal-patterns-allow-disjoint
                 - required:
                     - pattern-either
                 - required:
@@ -533,20 +532,6 @@ $defs:
               anyOf:
                 - required:
                     - pattern
-                - required:
-                    - semgrep-internal-patterns-allow-disjoint
-                - required:
-                    - pattern-either
-                - required:
-                    - pattern-regex
-          - required:
-              - semgrep-internal-patterns-allow-disjoint
-            not:
-              anyOf:
-                - required:
-                    - pattern
-                - required:
-                    - patterns
                 - required:
                     - pattern-either
                 - required:
@@ -559,8 +544,6 @@ $defs:
                     - pattern
                 - required:
                     - patterns
-                - required:
-                    - semgrep-internal-patterns-allow-disjoint
                 - required:
                     - pattern-regex
           - required:
@@ -571,8 +554,6 @@ $defs:
                     - pattern
                 - required:
                     - patterns
-                - required:
-                    - semgrep-internal-patterns-allow-disjoint
                 - required:
                     - pattern-either
         additionalProperties: false
@@ -667,18 +648,6 @@ $defs:
     required:
       - patterns
     additionalProperties: false
-  # EXPERIMENTAL
-  semgrep-internal-patterns-allow-disjoint:
-    type: object
-    properties:
-      semgrep-internal-patterns-allow-disjoint:
-        title: >-
-          Return finding where all of the nested conditions are true, without
-          respect to position of subpatterns. 
-        $ref: "#/$defs/patterns-content"
-    required:
-      - semgrep-internal-patterns-allow-disjoint
-    additionalProperties: false
   pattern-either:
     type: object
     properties:
@@ -709,6 +678,21 @@ $defs:
     required:
       - pattern-inside
     additionalProperties: false
+  # EXPERIMENTAL
+  semgrep-internal-pattern-anywhere:
+    type: object
+    properties:
+      semgrep-internal-pattern-anywhere:
+        title: >-
+          Marks this subpattern such that at a containing `patterns` or other
+          form of conjunction the range is not considered; subpattern matches
+          are instead combined solely on the basis of metavariables, without
+          respect to range, and the range of the matching subpattern is
+          discarded wholly.
+        $ref: "#/$defs/general-pattern-content"
+    required:
+      - semgrep-internal-pattern-anywhere
+    additionalProperties: false
   pattern-not-inside:
     type: object
     properties:
@@ -910,8 +894,6 @@ properties:
           type: string
         patterns:
           $ref: "#/$defs/patterns-content"
-        semgrep-internal-patterns-allow-disjoint:
-          $ref: "#/$defs/patterns-content"
         pattern-either:
           $ref: "#/$defs/pattern-either-content"
         # EXPERIMENTAL
@@ -1082,8 +1064,6 @@ properties:
                     - pattern
                 - required:
                     - patterns
-                - required:
-                    - semgrep-internal-patterns-allow-disjoint
                 - required:
                     - pattern-either
                 - required:
@@ -1094,8 +1074,6 @@ properties:
                     - pattern
                 - required:
                     - patterns
-                - required:
-                    - semgrep-internal-patterns-allow-disjoint
                 - required:
                     - pattern-either
                 - required: