Merge branch 'release' into THREAT-397-Reformat-deep_get(event-to-eve…

…nt.deep_get(

.github/workflows/check-deprecated.yml

@@ -0,0 +1,42 @@
+on:
+  pull_request:
+
+permissions:
+    contents: read
+
+jobs:
+  check_removed_rules:
+    name: Check Removed Rules
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          disable-sudo: true
+          egress-policy: block
+          allowed-endpoints: >
+            files.pythonhosted.org:443
+            github.com:443
+            pypi.org:443
+      - name: Checkout panther-analysis
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+
+      - name: Fetch Release
+        run: |
+          git fetch --depth=1 origin release
+
+      - name: Set python version
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
+        with:
+          python-version: "3.11"
+
+      - name: Install pipenv
+        run: pip install pipenv
+
+      - name: Setup venv
+        run: make venv
+
+      - name: Check for Removed Rules
+        run: |
+          pipenv run make check-deprecated
+  

.github/workflows/docker.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf #v3.2.0
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db #v3.6.1
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 #v3.7.1
       - name: Build Image
         run: docker buildx build --load -f Dockerfile -t panther-analysis:latest .
       - name: Test Image

.scripts/deleted_rules.py

@@ -0,0 +1,105 @@
+""" Checks to see if an Analysis item was removed from the repo, and whether it was added to the
+deprecated.txt file. """
+
+import argparse
+import logging
+import os
+import re
+import subprocess
+
+import panther_analysis_tool.command.bulk_delete as pat_delete
+import panther_analysis_tool.util as pat_util
+
+diff_pattern = re.compile(r'^-(?:RuleID|PolicyID|QueryName):\s*"?([\w.]+)"?')
+
+
+def get_deleted_ids() -> set[str]:
+    # Run git diff, get output
+    result = subprocess.run(['git', 'diff', 'origin/release', 'HEAD'], capture_output=True)
+    if result.stderr:
+        raise Exception(result.stderr.decode("utf-8"))
+
+    ids = set()
+    for line in result.stdout.decode("utf-8").split("\n"):
+        if m := diff_pattern.match(line):
+            # Add the ID to the list
+            ids.add(m.group(1))
+
+    return ids
+
+
+def get_deprecated_ids() -> set[str]:
+    """ Returns all the IDs listed in `deprecated.txt`. """
+    with open("deprecated.txt", "r") as f:
+        return set(f.read().split("\n"))
+
+
+def check(_):
+    if ids := get_deleted_ids() - get_deprecated_ids():
+        print("❌ The following rule IDs may have been deleted:")
+        for id_ in ids:
+            print(f"\t{id_}")
+        exit(1)
+    else:
+        print("✅ No unaccounted deletions found! You're in the clear! 👍")
+
+def remove(args):
+    api_token = args.api_token or os.environ.get("PANTHER_API_TOKEN")
+    api_host = args.api_host or os.environ.get("PANTHER_API_HOST")
+
+    if not (api_token and api_host):
+        opts = []
+        if not api_token:
+            print("No API token was found or provided!")
+            opts.append("--api-token")
+        if not api_host:
+            print("No API host was found or provided!")
+            opts.append("--api-host")
+        print(f"You can pass API credentials using {' and '.join(opts)} in your command.")
+        exit(1)
+
+    ids = list(get_deprecated_ids())
+
+    pat_args = argparse.Namespace(
+        analysis_id = ids,
+        query_id = [],
+        confirm_bypass = True,
+        api_token = api_token,
+        api_host = api_host
+    )
+
+    logging.basicConfig(
+        format="[%(levelname)s][%(name)s]: %(message)s",
+        level=logging.INFO,
+    )
+
+    return_code, out = pat_util.func_with_api_backend(pat_delete.run)(pat_args)
+
+    if return_code == 1:
+        if out:
+            logging.error(out)
+    elif return_code == 0:
+        if out:
+            logging.info(out)
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    subparsers = parser.add_subparsers(title="subcommands")
+
+    check_help = "Check if any items have been removed and not added to deprecated.txt"
+    parser_check = subparsers.add_parser("check", help=check_help)
+    parser_check.set_defaults(func=check)
+
+    remove_help = "Delete the entires listed in deprecated.txt"
+    parser_remove = subparsers.add_parser("remove", help=remove_help)
+    parser_remove.add_argument("--api-token", type=str, required=False)
+    parser_remove.add_argument("--api-host", type=str, required=False)
+    parser_remove.set_defaults(func=remove)
+
+    args = parser.parse_args()
+    args.func(args)
+
+
+if __name__ == "__main__":
+    main()

Makefile

@@ -62,6 +62,12 @@ install:
 test: global-helpers-unit-test
 	pipenv run panther_analysis_tool test $(TEST_ARGS)
 
+check-deprecated:
+	pipenv run python3 ./.scripts/deleted_rules.py check
+
+remove-deprecated:
+	pipenv run python3 ./.scripts/deleted_rules.py remove
+
 docker-build:
 	docker build -t panther-analysis:latest .
 

deprecated.txt

@@ -0,0 +1,34 @@
+Abnormally.High.Event.Volume
+AWS.SecurityGroup.UnusedSecurityGroup
+AWS.DynamoDB.TableEncryption
+AWS.Potentially.Stolen.Service.Role
+Standard.UnusualLogin
+OneLogin.HighRiskLogin
+OneLogin.UnusualLogin
+OneLogin.AdminRoleAssigned
+OneLogin.BruteForceByIP
+OneLogin.BruteForceByUsername
+Box.Brute.Force.Login
+Zoom.UserGrantedAdmin
+GCP.IAM.AdminRoleAssigned
+Notion.PageViews.ImpossibleTravel
+Notion.AccountChangedAfterLogin
+IOC.Log4JIPs
+IOC.SunburstIPIOCs
+IOC.Log4jExploit
+IOC.SunburstFQDNIOCs
+IOC.SunburstSHA256IOCs
+Confluence.0DayIPs
+Cloudflare.Firewall.HighVolumeEventsBlockedGreyNoise
+Cloudflare.Firewall.HighVolumeEventsBlocked
+Cloudflare.Firewall.SuspiciousEventGreyNoise
+Cloudflare.HttpRequest.BotHighVolumeGreyNoise
+GSuite.PermisssionsDelegated
+GSuite.BruteForceLogin
+AWS.Console.LoginFailed
+AWS.Snapshot.Backup.Exfiltration
+AWS.CloudTrail.RootFailedConsoleLogin
+AWS.S3.GreyNoiseActivity
+AWS.CloudTrail.RootConsoleLogin
+Okta.GeographicallyImprobableAccess
+Okta.BruteForceLogins

packs/aws.yml

@@ -164,7 +164,6 @@ PackDefinition:
     - VPC.DNS.Tunneling
     - VPCFlow.Port.Scanning
     # Correlation Rules
-    - AWS.Potentially.Stolen.Service.Role
     - AWS.Privilege.Escalation.Via.User.Compromise
     - AWS.SSO.Access.Token.Retrieved.by.Unauthenticated.IP
     - AWS.User.Takeover.Via.Password.Reset