From 5a6bddd7c918719da6794e667f435084b263687f Mon Sep 17 00:00:00 2001
From: bauthard <8293321+bauthard@users.noreply.github.com>
Date: Sat, 11 Jul 2020 11:20:35 +0530
Subject: [PATCH] adding condition

---
 basic-detections/general-tokens.yaml    | 2 ++
 tokens/amazon-mws-auth-token-value.yaml | 2 ++
 tokens/aws-access-key-value.yaml        | 2 ++
 tokens/google-api-key.yaml              | 2 ++
 tokens/http-username-password.yaml      | 2 ++
 tokens/mailchimp-api-key.yaml           | 2 ++
 tokens/slack-access-token.yaml          | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/basic-detections/general-tokens.yaml b/basic-detections/general-tokens.yaml
index d963519d69..3923983575 100644
--- a/basic-detections/general-tokens.yaml
+++ b/basic-detections/general-tokens.yaml
@@ -9,6 +9,8 @@ requests:
   - method: GET
     path:
       - '{{BaseURL}}'
+
+    matchers-condition: and
     matchers:
       - type: dsl
         dsl:
diff --git a/tokens/amazon-mws-auth-token-value.yaml b/tokens/amazon-mws-auth-token-value.yaml
index e24af2a923..312c985cc2 100755
--- a/tokens/amazon-mws-auth-token-value.yaml
+++ b/tokens/amazon-mws-auth-token-value.yaml
@@ -11,6 +11,8 @@ requests:
         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:
diff --git a/tokens/aws-access-key-value.yaml b/tokens/aws-access-key-value.yaml
index 75f477f5a1..24ae8a24f7 100755
--- a/tokens/aws-access-key-value.yaml
+++ b/tokens/aws-access-key-value.yaml
@@ -9,6 +9,8 @@ requests:
   - method: GET
     path:
       - "{{BaseURL}}"
+
+    matchers-condition: and
     matchers:
       - type: regex
         part: body
diff --git a/tokens/google-api-key.yaml b/tokens/google-api-key.yaml
index cb90c7dede..09bfffbc12 100755
--- a/tokens/google-api-key.yaml
+++ b/tokens/google-api-key.yaml
@@ -9,6 +9,8 @@ requests:
   - method: GET
     path:
       - "{{BaseURL}}"
+
+    matchers-condition: and
     matchers:
       - type: regex
         part: body
diff --git a/tokens/http-username-password.yaml b/tokens/http-username-password.yaml
index 9768670a6a..fe8e799f33 100644
--- a/tokens/http-username-password.yaml
+++ b/tokens/http-username-password.yaml
@@ -12,6 +12,8 @@ requests:
   - method: GET
     path:
       - "{{BaseURL}}"
+
+    matchers-condition: and
     matchers:
       - type: regex
         part: body
diff --git a/tokens/mailchimp-api-key.yaml b/tokens/mailchimp-api-key.yaml
index a854e126a0..41e16640c8 100755
--- a/tokens/mailchimp-api-key.yaml
+++ b/tokens/mailchimp-api-key.yaml
@@ -9,6 +9,8 @@ requests:
   - method: GET
     path:
       - "{{BaseURL}}"
+
+    matchers-condition: and
     matchers:
       - type: regex
         part: body
diff --git a/tokens/slack-access-token.yaml b/tokens/slack-access-token.yaml
index 0593674436..72c3ef8d36 100644
--- a/tokens/slack-access-token.yaml
+++ b/tokens/slack-access-token.yaml
@@ -12,6 +12,8 @@ requests:
   - method: GET
     path:
       - "{{BaseURL}}"
+      
+    matchers-condition: and
     matchers:
       - type: regex
         part: body