From 25ab7d9c5b74e91fa4f6219407a984e8847ce9a3 Mon Sep 17 00:00:00 2001
From: adeptex <adeptex@users.noreply.github.com>
Date: Sat, 5 Oct 2024 01:18:32 +0200
Subject: [PATCH] Update AWS Account ID rule

---
 tests/fixtures/arn.xml  | 6 +++---
 tests/fixtures/arn.yml  | 8 ++++----
 tests/fixtures/aws.json | 4 ++--
 tests/fixtures/aws.xml  | 4 ++--
 tests/fixtures/aws.yml  | 4 ++--
 whispers/rules/keys.yml | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/fixtures/arn.xml b/tests/fixtures/arn.xml
index b9ba3ec..e7fb223 100644
--- a/tests/fixtures/arn.xml
+++ b/tests/fixtures/arn.xml
@@ -5,8 +5,8 @@
       <ok02>arn:aws:kms:{REGION}:{ACCOUNT}:key/{KEY_ID}</ok02>
   </compliant>
   <noncompliant>
-    <arn01>arn:aws:kms:eu-central-1:123456123456:key/hardcoded</arn01>
-    <arn02>arn:aws:kms:ap-southeast-1:123456123456:key/hardcoded</arn02>
-    <arn03>arn:aws:iam::123456123456:oidc-provider/auth-dev.mozilla.auth0.com</arn03>
+    <arn01>arn:aws:kms:eu-central-1:111122223333:key/hardcoded</arn01>
+    <arn02>arn:aws:kms:ap-southeast-1:111122223333:key/hardcoded</arn02>
+    <arn03>arn:aws:iam::111122223333:oidc-provider/auth-dev.mozilla.auth0.com</arn03>
   </noncompliant>
 </tests>
diff --git a/tests/fixtures/arn.yml b/tests/fixtures/arn.yml
index 71ec09e..dcb6bec 100644
--- a/tests/fixtures/arn.yml
+++ b/tests/fixtures/arn.yml
@@ -4,8 +4,8 @@ compliant:
 
 
 noncompliant:
-  arn01: arn:aws:kms:eu-central-1:123456123456:key/hardcoded
-  arn02: arn:aws:kms:ap-southeast-1:123456123456:key/hardcoded
-  arn03: arn:aws:iam::123456123456:oidc-provider/auth-dev.mozilla.auth0.com
+  arn01: arn:aws:kms:eu-central-1:111122223333:key/hardcoded
+  arn02: arn:aws:kms:ap-southeast-1:111122223333:key/hardcoded
+  arn03: arn:aws:iam::111122223333:oidc-provider/auth-dev.mozilla.auth0.com
   arn_list:
-    - arn:aws:kms:eu-central-1:123456123456:key/hardcoded
+    - arn:aws:kms:eu-central-1:111122223333:key/hardcoded
diff --git a/tests/fixtures/aws.json b/tests/fixtures/aws.json
index a80c575..3cf0fda 100644
--- a/tests/fixtures/aws.json
+++ b/tests/fixtures/aws.json
@@ -4,7 +4,7 @@
       "aws_id": "{{ AWS ID }}",
       "aws_key": "${AWS_KEY}",
       "commit_id": "912ec803b2ce49e4a541068d495ab57000000000",
-      "role": "arn:aws:iam::123456789000:role/role-name"
+      "role": "arn:aws:iam::111122223333:role/role-name"
     },
     {
       "aws_account01": "000000000000",
@@ -18,7 +18,7 @@
       "aws_token": "FakeYXdzELv//////////wEldj3948yOJRO84jgpoip239232hEOHhfkjhefkwue97jorhfiuh+XjFC9Je/YG7JCqKjrspab2lB+7/Fb1NJFjgwur47Dbhs/L7nh+/VGnwLoAo8CIqoPBLRmXItaoiuuofZnr+ktihZk1Yi55sYZ12hfRMPVbDmhf9Ke683+e9bJirhUEghw9424JOhgwrgqq99MvzCEFe4eXPOSgAcQcD2xqnnKO738tjhoh23HFqjflhefibWegfqefgqUF12hvgfwegqf"
     },
     {
-      "aws_account01": "123456789123"
+      "aws_account01": "111122223333"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/fixtures/aws.xml b/tests/fixtures/aws.xml
index 6a17fbf..68562ff 100644
--- a/tests/fixtures/aws.xml
+++ b/tests/fixtures/aws.xml
@@ -4,7 +4,7 @@
     <aws_id>{{ AWS ID }}</aws_id>
     <aws_key>${AWS_KEY}</aws_key>
     <commit_id>912ec803b2ce49e4a541068d495ab57000000000</commit_id>
-    <role>arn:aws:iam::123456789000:role/role-name</role>
+    <role>arn:aws:iam::111122223333:role/role-name</role>
     <aws_account>000000000000</aws_account>
     <aws_account>111111111111</aws_account>
   </compliant>
@@ -12,6 +12,6 @@
     <aws_id>AKIAHI38FAKE1IWUQEEN</aws_id>
     <aws_key>PA3XsxZ8d8cPQLmnZzFAKEdzC6ND2a8vhbyXU/Dw</aws_key>
     <aws_token>FakeYXdzELv//////////wEldj3948yOJRO84jgpoip239232hEOHhfkjhefkwue97jorhfiuh+XjFC9Je/YG7JCqKjrspab2lB+7/Fb1NJFjgwur47Dbhs/L7nh+/VGnwLoAo8CIqoPBLRmXItaoiuuofZnr+ktihZk1Yi55sYZ12hfRMPVbDmhf9Ke683+e9bJirhUEghw9424JOhgwrgqq99MvzCEFe4eXPOSgAcQcD2xqnnKO738tjhoh23HFqjflhefibWegfqefgqUF12hvgfwegqf</aws_token>
-    <aws_account>123456789123</aws_account>
+    <aws_account>111122223333</aws_account>
   </noncompliant>
 </tests>
\ No newline at end of file
diff --git a/tests/fixtures/aws.yml b/tests/fixtures/aws.yml
index 0a32e8c..c609139 100644
--- a/tests/fixtures/aws.yml
+++ b/tests/fixtures/aws.yml
@@ -2,7 +2,7 @@ compliant:
   aws_id: "{{ AWS ID }}"
   aws_key: "${AWS_KEY}"
   commit_id: 912ec803b2ce49e4a541068d495ab57000000000
-  role: arn:aws:iam::123456789000:role/role-name
+  role: arn:aws:iam::111122223333:role/role-name
   aws_account01: '000000000000'
   aws_account02: '111111111111'
 
@@ -10,4 +10,4 @@ noncompliant:
   aws_id: AKIAHI38FAKE1IWUQEEN
   aws_key: PA3XsxZ8d8cPQLmnZzFAKEdzC6ND2a8vhbyXU/Dw
   aws_token: FakeYXdzELv//////////wEldj3948yOJRO84jgpoip239232hEOHhfkjhefkwue97jorhfiuh+XjFC9Je/YG7JCqKjrspab2lB+7/Fb1NJFjgwur47Dbhs/L7nh+/VGnwLoAo8CIqoPBLRmXItaoiuuofZnr+ktihZk1Yi55sYZ12hfRMPVbDmhf9Ke683+e9bJirhUEghw9424JOhgwrgqq99MvzCEFe4eXPOSgAcQcD2xqnnKO738tjhoh23HFqjflhefibWegfqefgqUF12hvgfwegqf
-  aws_account: '123456789123'
\ No newline at end of file
+  aws_account: '111122223333'
\ No newline at end of file
diff --git a/whispers/rules/keys.yml b/whispers/rules/keys.yml
index fb670e8..98453fa 100644
--- a/whispers/rules/keys.yml
+++ b/whispers/rules/keys.yml
@@ -56,7 +56,7 @@
     regex: .*aws.*
     ignorecase: False
   value:
-    regex: "^(?!.*\\s)(?!(.)\\1{11})[0-9]{12}$"
+    regex: "^(?!.*\\s)(?!(.)\\1{11})(?!.*1234.*)[0-9]{12}$"
     ignorecase: False