Merge branch 'main' into patch-211

bee-san · Dec 3, 2021 · 6cc0765 · 6cc0765
2 parents 93d31d5 + d5ea9ce
commit 6cc0765
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 30 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -8,6 +8,9 @@ jobs:
  matrix:
  python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
  os: [ubuntu-latest, windows-latest, macos-latest]
+ exclude:
+ - os: macos-latest
+ python-version: "3.6"
  runs-on: ${{ matrix.os }}
  name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
  steps:

diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ orjson = {version = "^3.6.1", optional = true}
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.5"
-black = {version = "^21.9b0", python = "^3.6.2"} 
+black = {version = "^21.9b0", python = "^3.6.2"}
 isort = {version = "^5.9.3", python = "^3.6.1"}
 flake8 = "<4.0"
 requests = "^2.26.0"

diff --git a/pywhat/Data/regex.json b/pywhat/Data/regex.json
@@ -819,35 +819,6 @@
  "Invalid": []
  }
  },
- {
- "Name": "Datadog API Key",
- "Regex": "^([a-f0-9]{32})$",
- "plural_name": false,
- "Description": null,
- "Exploit": "Use the command below to verify that the API key is valid:\n $ curl -X GET https://api.datadoghq.com/api/v1/validate -H \"Content-Type: application/json\" -H \"DD-API-KEY: API_KEY_HERE\"\n",
- "Rarity": 1,
- "URL": null,
- "Tags": [
- "API Keys",
- "Bug Bounty",
- "Credentials",
- "Datadog"
- ]
- },
- {
- "Name": "Datadog Client Token",
- "Regex": "^(pub[a-f0-9]{32})$",
- "plural_name": false,
- "Description": null,
- "Exploit": null,
- "Rarity": 1,
- "URL": null,
- "Tags": [
- "API Keys",
- "Bug Bounty",
- "Datadog"
- ]
- },
  {
  "Name": "New Relic Admin API Key",
  "Regex": "(?i)^(NRAA-[a-f0-9]{27})$",
@@ -2374,6 +2345,26 @@
  "Invalid": []
  }
  },
+ {
+ "Name": "Datadog Client Token",
+ "Regex": "^(pub[a-f0-9]{32})$",
+ "plural_name": false,
+ "Description": null,
+ "Exploit": null,
+ "Rarity": 0.3,
+ "URL": null,
+ "Tags": [
+ "API Keys",
+ "Bug Bounty",
+ "Datadog"
+ ],
+ "Examples": {
+ "Valid": [
+ "pub8261e4a07b29d0a148e00a93106ae711"
+ ],
+ "Invalid": []
+ }
+ },
  {
  "Name": "JSON Web Token (JWT)",
  "Regex": "(?i)^((?=eyJ)(?:[a-z0-9_=\\-]{17,})\\.(?=e)(?:[a-z0-9_=\\-]{2,})\\.(?:[a-z0-9_=\\-]{43,}))$",
@@ -2628,6 +2619,58 @@
  "Invalid": []
  }
  },
+ {
+ "Name": "Datadog API Key",
+ "Regex": "^([a-f0-9]{32})$",
+ "plural_name": false,
+ "Description": null,
+ "Exploit": "Use the command below to verify that the API key is valid:\n $ curl -X GET https://api.datadoghq.com/api/v1/validate -H \"Content-Type: application/json\" -H \"DD-API-KEY: API_KEY_HERE\"\n",
+ "Rarity": 0,
+ "URL": null,
+ "Tags": [
+ "API Keys",
+ "Bug Bounty",
+ "Credentials",
+ "Datadog"
+ ],
+ "Examples": {
+ "Valid": [
+ "68ec0cbd7d0da6770545614dfa573eec",
+ "683bba7d7f759e0907d35f39a7c36eb5",
+ "c8561e9b786a07855cbc2983d47eaf93"
+ ],
+ "Invalid": [
+ "ba36266055c7495ce26bb12e86c7536b4a5e00cd",
+ "pub8261e4a07b29d0a148e00a93106ae711"
+ ]
+ }
+ },
+ {
+ "Name": "Datadog Application Key",
+ "Regex": "^([a-f0-9]{40})$",
+ "plural_name": false,
+ "Description": null,
+ "Exploit": null,
+ "Rarity": 0,
+ "URL": null,
+ "Tags": [
+ "API Keys",
+ "Bug Bounty",
+ "Credentials",
+ "Datadog"
+ ],
+ "Examples": {
+ "Valid": [
+ "ba36266055c7495ce26bb12e86c7536b4a5e00cd"
+ ],
+ "Invalid": [
+ "68ec0cbd7d0da6770545614dfa573eec",
+ "683bba7d7f759e0907d35f39a7c36eb5",
+ "c8561e9b786a07855cbc2983d47eaf93",
+ "pub8261e4a07b29d0a148e00a93106ae711"
+ ]
+ }
+ },
  {
  "Name": "YouTube Video ID",
  "Regex": "^((?=.*[A-Z])(?=.*[a-z])[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]{1})$",