From 8bcf8b50813f45f627938552055882e042f9138b Mon Sep 17 00:00:00 2001
From: Dominique RIGHETTO <righettod@users.noreply.github.com>
Date: Sat, 11 May 2024 16:50:35 +0200
Subject: [PATCH 1/2] Add files via upload

---
 http/technologies/craftercms-detect.yaml | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 http/technologies/craftercms-detect.yaml

diff --git a/http/technologies/craftercms-detect.yaml b/http/technologies/craftercms-detect.yaml
new file mode 100644
index 00000000000..e8ca729dfe0
--- /dev/null
+++ b/http/technologies/craftercms-detect.yaml
@@ -0,0 +1,34 @@
+id: craftercms-detect
+
+info:
+  name: CrafterCMS - Detect
+  author: righettod
+  severity: info
+  description: |
+    CrafterCMS was detected.
+  reference:
+    - https://craftercms.org/
+  metadata:
+    max-request: 1
+    verified: true
+    shodan-query: http.title:"craftercms"
+  tags: tech,craftercms,detect
+
+http:
+  - method: GET
+    path:
+      - "{{BaseURL}}/studio"
+
+    matchers:
+      - type: dsl
+        dsl:
+          - 'status_code == 404'
+          - 'contains_any(to_lower(body), "craftercms", "crafter software corporation")'
+        condition: and
+
+    extractors:
+      - type: regex
+        part: body
+        group: 1
+        regex:
+          - 'Copyright\s+\(C\)\s+([0-9-]+)\s+Crafter'
\ No newline at end of file

From fce870a1dc1b6fdacc3325eb1f8a30c2f034f511 Mon Sep 17 00:00:00 2001
From: Ritik Chaddha <44563978+ritikchaddha@users.noreply.github.com>
Date: Sun, 12 May 2024 13:09:05 +0530
Subject: [PATCH 2/2] updated matchers & request

---
 http/technologies/craftercms-detect.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/http/technologies/craftercms-detect.yaml b/http/technologies/craftercms-detect.yaml
index e8ca729dfe0..a9de7254205 100644
--- a/http/technologies/craftercms-detect.yaml
+++ b/http/technologies/craftercms-detect.yaml
@@ -17,18 +17,19 @@ info:
 http:
   - method: GET
     path:
-      - "{{BaseURL}}/studio"
+      - "{{BaseURL}}"
 
+    host-redirects: true
+    max-redirects: 2
     matchers:
-      - type: dsl
-        dsl:
-          - 'status_code == 404'
-          - 'contains_any(to_lower(body), "craftercms", "crafter software corporation")'
-        condition: and
+      - type: word
+        part: header
+        words:
+          - 'CrafterCMS'
 
     extractors:
       - type: regex
         part: body
         group: 1
         regex:
-          - 'Copyright\s+\(C\)\s+([0-9-]+)\s+Crafter'
\ No newline at end of file
+          - 'Copyright\s+\(C\)\s+([0-9-]+)\s+Crafter'