From 6a75ff9242dbe9d179dd0e46ce39f9ae944853ed Mon Sep 17 00:00:00 2001
From: Philippe Delteil <pdelteil@gmail.com>
Date: Thu, 9 Sep 2021 01:28:04 -0300
Subject: [PATCH 1/2] Create confluence-detector.yaml

---
 technologies/confluence-detector.yaml | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 technologies/confluence-detector.yaml

diff --git a/technologies/confluence-detector.yaml b/technologies/confluence-detector.yaml
new file mode 100644
index 0000000000..a418291693
--- /dev/null
+++ b/technologies/confluence-detector.yaml
@@ -0,0 +1,39 @@
+id: confluence-detector
+
+info:
+  name: confluence detector
+  author: philippedelteil            
+  severity: info
+  description: Allows you to detect Atlassian Confluence instances
+  tags: confluence
+
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}"
+      - "{{BaseURL}}/pages"
+      - "{{BaseURL}}/confluence"
+      - "{{BaseURL}}/wiki"
+
+    redirects: true
+    stop-at-first-match: true
+    matchers-condition: or
+
+    matchers:
+      - type: word
+        words:
+          - '-Confluence-'
+          - '-confluence-'
+        part: header
+        condition: or
+
+      - type: word
+        words:
+          - 'confluence-base-url'
+        part: body
+    extractors:
+      - type: regex
+        part: body
+        group: 1
+        regex:
+          - 'Atlassian Confluence ([a-z0-9-._]+)'

From 9169fe37055a9c222c8115abecaa2cb7e0502b6a Mon Sep 17 00:00:00 2001
From: Prince Chaddha <prince@projectdiscovery.io>
Date: Thu, 9 Sep 2021 11:31:44 +0530
Subject: [PATCH 2/2] Update and rename confluence-detector.yaml to
 confluence-detect.yaml

---
 ...nfluence-detector.yaml => confluence-detect.yaml} | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename technologies/{confluence-detector.yaml => confluence-detect.yaml} (82%)

diff --git a/technologies/confluence-detector.yaml b/technologies/confluence-detect.yaml
similarity index 82%
rename from technologies/confluence-detector.yaml
rename to technologies/confluence-detect.yaml
index a418291693..168a3b1f53 100644
--- a/technologies/confluence-detector.yaml
+++ b/technologies/confluence-detect.yaml
@@ -1,11 +1,11 @@
-id: confluence-detector
+id: confluence-detect
 
 info:
-  name: confluence detector
-  author: philippedelteil            
+  name: Confluence Detect
+  author: philippedelteil
   severity: info
   description: Allows you to detect Atlassian Confluence instances
-  tags: confluence
+  tags: tech,confluence
 
 requests:
   - method: GET
@@ -17,8 +17,7 @@ requests:
 
     redirects: true
     stop-at-first-match: true
-    matchers-condition: or
-
+    matchers-condition: and
     matchers:
       - type: word
         words:
@@ -31,6 +30,7 @@ requests:
         words:
           - 'confluence-base-url'
         part: body
+
     extractors:
       - type: regex
         part: body