From 8fab55e1ee98e3cf047189099fd33a3583e8975f Mon Sep 17 00:00:00 2001
From: Prince Chaddha <prince@projectdiscovery.io>
Date: Fri, 21 Oct 2022 15:13:50 +0530
Subject: [PATCH] Update joomla-detect.yaml

---
 technologies/joomla-detect.yaml | 39 +++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/technologies/joomla-detect.yaml b/technologies/joomla-detect.yaml
index 9757bd1706..b68b9e973c 100644
--- a/technologies/joomla-detect.yaml
+++ b/technologies/joomla-detect.yaml
@@ -1,41 +1,48 @@
 id: joomla-detect
-
 info:
   name: Joomla! Detect
-  description: Joomla, also spelled Joomla! (with an exclamation mark) and sometimes abbreviated as J!, is a free and open-source content management system (CMS) for publishing web content on websites.
   author: ricardomaia
   severity: info
-
-  metadata:
-    verified: true
-    google-dork-administration: '"Joomla! Administration Login" inurl:"/index.php"'
-    google-dork-installer: 'intitle:"Joomla – Web Installer"'
-
+  description: |
+    Joomla, also spelled Joomla! (with an exclamation mark) and sometimes abbreviated as J!, is a free and open-source content management system (CMS) for publishing web content on websites.
   reference:
+    - https://www.joomla.org/
+    - https://github.com/joomla/joomla-cms
     - https://www.itoctopus.com/how-to-quickly-know-the-version-of-any-joomla-website
     - https://hackertarget.com/attacking-enumerating-joomla/
-  tags: tech,joomla,cms
+  metadata:
+    verified: true
+    google-dork: Joomla! Administration Login inurl:"/index.php" || intitle:"Joomla Web Installer"
+  tags: tech,joomla,cms,oss
 
 requests:
-  - method: GET # Sorted by confidence level
+  - method:
     path:
+      - "{{BaseURL}}" # >= 1.5.0 and <= 1.5.26
       - "{{BaseURL}}/language/en-GB/en-GB.xml" # >= 1.5.0 and <= 1.5.26
       - "{{BaseURL}}/administrator/manifests/files/joomla.xml" # >= 1.6.0
       - "{{BaseURL}}/README.txt"
       - "{{BaseURL}}/modules/custom.xml" # < 1.5.0
-      - "{{BaseURL}}" # >= 1.5.0 and <= 1.5.26
-    redirects: true
+
+    host-redirects: true
+    max-redirects: 2
     stop-at-first-match: true
     matchers-condition: or
     matchers:
       - type: regex
         regex:
           - '(?i)<meta.name="generator".content="(Joomla!).*/>'
-          - "(?i)<version>(.*)</version>"
           - '(?i)Joomla_([\d.|\d]+)_version_history'
-      - type: status
-        status:
-          - 200
+        condition: or
+
+      - type: word
+        part: body
+        words:
+          - "<version>"
+          - "<creationDate>"
+          - "</metafile>"
+        condition: and
+
     extractors:
       - type: regex
         name: version