Skip to content

Commit bed2f96

Browse files
kopecskopecs
committed
Rename based on discussion
1 parent ee4098b commit bed2f96

File tree

1 file changed

+23
-45
lines changed

1 file changed

+23
-45
lines changed

‎rule_schema_v1.yaml

+23-45
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ $defs:
132132
- required: [ any ]
133133
- required: [ not ]
134134
- required: [ inside ]
135+
- required: [ anywhere ]
135136
- required: [ taint ]
136137
properties:
137138
pattern:
@@ -152,6 +153,8 @@ $defs:
152153
$ref: "#/$defs/new-pattern"
153154
inside:
154155
$ref: "#/$defs/new-pattern"
156+
anywhere:
157+
$ref: "#/$defs/new-pattern"
155158
where:
156159
type: array
157160
items:
@@ -209,10 +212,10 @@ $defs:
209212
- required: [ pattern ]
210213
- required: [ pattern-regex ]
211214
- required: [ patterns ]
212-
- required: [ semgrep-internal-patterns-allow-disjoint ]
213215
- required: [ pattern-either ]
214216
- required: [ pattern-not ]
215217
- required: [ pattern-inside ]
218+
- required: [ anywhere ]
216219
- required: [ pattern-not-inside ]
217220
properties:
218221
pattern:
@@ -221,14 +224,14 @@ $defs:
221224
type: string
222225
patterns:
223226
$ref: "#/$defs/patterns-content"
224-
semgrep-internal-patterns-allow-disjoint:
225-
$ref: "#/$defs/patterns-content"
226227
pattern-either:
227228
$ref: "#/$defs/pattern-either-content"
228229
pattern-not:
229230
$ref: "#/$defs/general-pattern-content"
230231
pattern-inside:
231232
$ref: "#/$defs/general-pattern-content"
233+
anywhere:
234+
$ref: "#/$defs/patterns-content"
232235
pattern-not-inside:
233236
$ref: "#/$defs/general-pattern-content"
234237
else:
@@ -239,10 +242,10 @@ $defs:
239242
items:
240243
anyOf:
241244
- $ref: "#/$defs/patterns"
242-
- $ref: "#/$defs/semgrep-internal-patterns-allow-disjoint"
243245
- $ref: "#/$defs/pattern-either"
244246
- $ref: "#/$defs/focus-metavariable"
245247
- $ref: "#/$defs/pattern-inside"
248+
- $ref: "#/$defs/anywhere"
246249
- $ref: "#/$defs/pattern-not-inside"
247250
- $ref: "#/$defs/pattern-not"
248251
- $ref: "#/$defs/pattern"
@@ -260,9 +263,9 @@ $defs:
260263
items:
261264
anyOf:
262265
- $ref: "#/$defs/patterns"
263-
- $ref: "#/$defs/semgrep-internal-patterns-allow-disjoint"
264266
- $ref: "#/$defs/pattern-either"
265267
- $ref: "#/$defs/pattern-inside"
268+
- $ref: "#/$defs/anywhere"
266269
- $ref: "#/$defs/pattern"
267270
- $ref: "#/$defs/pattern-regex"
268271
taint-content:
@@ -500,8 +503,6 @@ $defs:
500503
type: string
501504
patterns:
502505
$ref: "#/$defs/patterns-content"
503-
semgrep-internal-patterns-allow-disjoint:
504-
$ref: "#/$defs/patterns-content"
505506
pattern-either:
506507
$ref: "#/$defs/pattern-either-content"
507508
required:
@@ -513,8 +514,6 @@ $defs:
513514
anyOf:
514515
- required:
515516
- patterns
516-
- required:
517-
- semgrep-internal-patterns-allow-disjoint
518517
- required:
519518
- pattern-either
520519
- required:
@@ -525,20 +524,6 @@ $defs:
525524
anyOf:
526525
- required:
527526
- pattern
528-
- required:
529-
- semgrep-internal-patterns-allow-disjoint
530-
- required:
531-
- pattern-either
532-
- required:
533-
- pattern-regex
534-
- required:
535-
- semgrep-internal-patterns-allow-disjoint
536-
not:
537-
anyOf:
538-
- required:
539-
- pattern
540-
- required:
541-
- patterns
542527
- required:
543528
- pattern-either
544529
- required:
@@ -551,8 +536,6 @@ $defs:
551536
- pattern
552537
- required:
553538
- patterns
554-
- required:
555-
- semgrep-internal-patterns-allow-disjoint
556539
- required:
557540
- pattern-regex
558541
- required:
@@ -563,8 +546,6 @@ $defs:
563546
- pattern
564547
- required:
565548
- patterns
566-
- required:
567-
- semgrep-internal-patterns-allow-disjoint
568549
- required:
569550
- pattern-either
570551
additionalProperties: false
@@ -651,18 +632,6 @@ $defs:
651632
required:
652633
- patterns
653634
additionalProperties: false
654-
# EXPERIMENTAL
655-
semgrep-internal-patterns-allow-disjoint:
656-
type: object
657-
properties:
658-
semgrep-internal-patterns-allow-disjoint:
659-
title: >-
660-
Return finding where all of the nested conditions are true, without
661-
respect to position of subpatterns.
662-
$ref: "#/$defs/patterns-content"
663-
required:
664-
- semgrep-internal-patterns-allow-disjoint
665-
additionalProperties: false
666635
pattern-either:
667636
type: object
668637
properties:
@@ -693,6 +662,21 @@ $defs:
693662
required:
694663
- pattern-inside
695664
additionalProperties: false
665+
# EXPERIMENTAL
666+
anywhere:
667+
type: object
668+
properties:
669+
anywhere:
670+
title: >-
671+
Marks this subpattern such that at a containing `patterns` or other
672+
form of conjunction the range is not considered; subpattern matches
673+
are instead combined solely on the basis of metavariables, without
674+
respect to range, and the range of the matching subpattern is
675+
discarded wholly.
676+
$ref: "#/$defs/general-pattern-content"
677+
required:
678+
- anywhere
679+
additionalProperties: false
696680
pattern-not-inside:
697681
type: object
698682
properties:
@@ -894,8 +878,6 @@ properties:
894878
type: string
895879
patterns:
896880
$ref: "#/$defs/patterns-content"
897-
semgrep-internal-patterns-allow-disjoint:
898-
$ref: "#/$defs/patterns-content"
899881
pattern-either:
900882
$ref: "#/$defs/pattern-either-content"
901883
# EXPERIMENTAL
@@ -1066,8 +1048,6 @@ properties:
10661048
- pattern
10671049
- required:
10681050
- patterns
1069-
- required:
1070-
- semgrep-internal-patterns-allow-disjoint
10711051
- required:
10721052
- pattern-either
10731053
- required:
@@ -1078,8 +1058,6 @@ properties:
10781058
- pattern
10791059
- required:
10801060
- patterns
1081-
- required:
1082-
- semgrep-internal-patterns-allow-disjoint
10831061
- required:
10841062
- pattern-either
10851063
- required:

0 commit comments

Comments
 (0)