From 4afb8a05870e58d891c42476b26aad8ea792b883 Mon Sep 17 00:00:00 2001
From: sullo <sullo@cirt.net>
Date: Wed, 27 Sep 2023 13:08:55 -0400
Subject: [PATCH] This updates the order of files so that versions are
 extracted before generic Joomla! detection, fixes the regex for version
 matching, and adds a required AND matcher for the joomla.xml file.

---
 http/technologies/joomla-detect.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/http/technologies/joomla-detect.yaml b/http/technologies/joomla-detect.yaml
index e8310e013f..1f46f10728 100644
--- a/http/technologies/joomla-detect.yaml
+++ b/http/technologies/joomla-detect.yaml
@@ -5,7 +5,7 @@ info:
   author: ricardomaia
   severity: info
   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.
+    Joomla! is a free and open-source content management system (CMS) for publishing content on websites.
   reference:
     - https://www.joomla.org/
     - https://github.com/joomla/joomla-cms
@@ -20,11 +20,11 @@ info:
 http:
   - method: GET
     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}}/language/en-GB/en-GB.xml" # >= 1.5.0 and <= 1.5.26
       - "{{BaseURL}}/README.txt"
       - "{{BaseURL}}/modules/custom.xml" # < 1.5.0
+      - "{{BaseURL}}" # >= 1.5.0 and <= 1.5.26
 
     stop-at-first-match: true
     host-redirects: true
@@ -44,6 +44,7 @@ http:
         regex:
           - '(?i)<meta.name="generator".content="(Joomla!).*/>'
           - '(?i)Joomla_([\d.|\d]+)_version_history'
+          - 'FILES_JOOMLA_XML_DESCRIPTION'
         condition: or
 
     extractors:
@@ -51,6 +52,6 @@ http:
         name: version
         group: 1
         regex:
-          - "(?i)<version>(.*)</version>"
+          - '<version>(.*?)</version>'
           - '(?i)Joomla_([\d.|\d]+)_version_history'
         part: body