updates

tokens/amazon-mws-auth-token-value.yaml

@@ -6,18 +6,12 @@ info:
   severity: medium
 
 requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}"
+
   - extractors:
       - part: body
         regex:
           - "amzn\\.mws\\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
-        type: regex
-
-    matchers-condition: and
-    matchers:
-      - part: body
-        regex:
-          - "amzn\\.mws\\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
-        type: regex
-    method: GET
-    path:
-      - "{{BaseURL}}"
+        type: regex

tokens/aws-access-key-value.yaml

@@ -3,19 +3,13 @@ id: aws-access-key-value
 info:
   name: AWS Access Key ID Value
   author: Swissky
-  severity: medium
+  severity: info
 
 requests:
   - method: GET
     path:
       - "{{BaseURL}}"
 
-    matchers-condition: and
-    matchers:
-      - type: regex
-        part: body
-        regex:
-          - "(A3T[A-Z0-9]|AKIA|AGPA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}"
     extractors:
       - type: regex
         part: body

tokens/google-api-key.yaml

@@ -10,12 +10,6 @@ requests:
     path:
       - "{{BaseURL}}"
 
-    matchers-condition: and
-    matchers:
-      - type: regex
-        part: body
-        regex:
-          - "AIza[0-9A-Za-z\\-_]{35}"
     extractors:
       - type: regex
         part: body

tokens/http-username-password.yaml

@@ -13,12 +13,6 @@ requests:
     path:
       - "{{BaseURL}}"
 
-    matchers-condition: and
-    matchers:
-      - type: regex
-        part: body
-        regex:
-          - "(ftp|ftps|http|https)://[0-9A-Za-z\\-_%]+(:|@)"
     extractors:
       - type: regex
         part: body

tokens/mailchimp-api-key.yaml

@@ -10,12 +10,6 @@ requests:
     path:
       - "{{BaseURL}}"
 
-    matchers-condition: and
-    matchers:
-      - type: regex
-        part: body
-        regex:
-          - "[0-9a-f]{32}-us[0-9]{1,2}"
     extractors:
       - type: regex
         part: body

tokens/slack-access-token.yaml

@@ -13,16 +13,9 @@ requests:
     path:
       - "{{BaseURL}}"
 
-    matchers-condition: and
-    matchers:
+    extractors:
       - type: regex
         part: body
         regex:
           - "xoxp-[0-9A-Za-z\\-]{72}"  # Person
           - "xoxb-[0-9A-Za-z\\-]{51}"  # Bot
-    extractors:
-      - type: regex
-        part: body
-        regex:
-          - "xoxp-[0-9A-Za-z\\-]{72}"
-          - "xoxb-[0-9A-Za-z\\-]{51}"