From 74081d762307054ea0799474d55e0a62cda59483 Mon Sep 17 00:00:00 2001 From: theconcierge2020 <65483817+theconcierge2020@users.noreply.github.com> Date: Wed, 28 Oct 2020 10:54:57 +0100 Subject: [PATCH 1/4] Improve Confluence vs Jira detection Hey guys, using wappalyzer recently I discovered, that a lot of times websites get marked as Atlassian Confluence AND Jira. However, only the Jira technology is capable of finding a version and the Confluence was not. This is happening, because both applications have the "ajs-version-number" (which is stated within the Atlassian Jira app rule). As well, the provided html-regex ("Powered by...") is not working - at least on pages I encountered. Tested it as well manually. So my suggestion for lower false-positives would be: * Remove "ajs-version-number" from JIRA - because both apps have it. * Jira pages have one attribute within a meta-tag and the body-tag: "data-version", which we can take advantage of -> therefore changed the html-regex * Confluence pages have in addition to "Powered by ..." the "Printed by Atlassian Confluence " within the footer section. However, depending on the language the only useable part is "Atlassian Confluence " ("Powered by" gets translated). I guess the "Powered by..." regex could be revised as well, but in my opinion it does make the regex simpler for the same result - this is why I suggest using it. It is a proposal and I wanted feedback from the community about this. If you have any input, let me know and I will work on it. Greetings --- src/technologies.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/technologies.json b/src/technologies.json index 1abc31983..63bf9266e 100644 --- a/src/technologies.json +++ b/src/technologies.json @@ -1640,7 +1640,7 @@ "headers": { "X-Confluence-Request-Time": "" }, - "html": "Powered by ]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence ([\\d.]+))?\\;version:\\1", + "html": "Atlassian Confluence ([\\d.]+)\\;version:\\1", "icon": "Atlassian Confluence.svg", "implies": "Java", "meta": { @@ -1665,14 +1665,13 @@ 13 ], "cpe": "cpe:/a:atlassian:jira", - "html": "Powered by\\s+]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1", + "html": "data-version=\"([\\d.]+)\\;version:\\1", "icon": "Atlassian Jira.svg", "implies": "Java", "js": { "jira": "" }, "meta": { - "ajs-version-number": "^(.+)$\\;version:\\1", "application-name": "JIRA" }, "website": "http://www.atlassian.com/software/jira/overview/" From 317535bff246a6f5dbc8e3d515795ed5678d4938 Mon Sep 17 00:00:00 2001 From: theconcierge2020 <65483817+theconcierge2020@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:54:41 +0100 Subject: [PATCH 2/4] Updated change added one meta value regex to Atlassian Jira + updated html regex for Atlassian Confluence & Jira --- src/technologies.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/technologies.json b/src/technologies.json index 63bf9266e..8ed4c2d0c 100644 --- a/src/technologies.json +++ b/src/technologies.json @@ -1640,7 +1640,7 @@ "headers": { "X-Confluence-Request-Time": "" }, - "html": "Atlassian Confluence ([\\d.]+)\\;version:\\1", + "html": "
  • .+ Atlassian Confluence ([\\d.]+)
    • \\;version:\\1", "icon": "Atlassian Confluence.svg", "implies": "Java", "meta": { @@ -1665,14 +1665,15 @@ 13 ], "cpe": "cpe:/a:atlassian:jira", - "html": "data-version=\"([\\d.]+)\\;version:\\1", + "html": "\\;version:\\1", "icon": "Atlassian Jira.svg", "implies": "Java", "js": { "jira": "" }, "meta": { - "application-name": "JIRA" + "application-name": "JIRA", + "data-version": ([\\d.]+)\\;version:\\1 }, "website": "http://www.atlassian.com/software/jira/overview/" }, From abd65e0bd19737289bc841b4df32ea6bcda644e4 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Tue, 24 Nov 2020 09:00:45 +1100 Subject: [PATCH 3/4] Update technologies.json --- src/technologies.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/technologies.json b/src/technologies.json index 8ed4c2d0c..637b9ed75 100644 --- a/src/technologies.json +++ b/src/technologies.json @@ -1665,15 +1665,19 @@ 13 ], "cpe": "cpe:/a:atlassian:jira", - "html": "\\;version:\\1", "icon": "Atlassian Jira.svg", "implies": "Java", "js": { - "jira": "" + "jira.id": "" + }, + "dom": { + "#jira": { + "text": "" + } }, "meta": { "application-name": "JIRA", - "data-version": ([\\d.]+)\\;version:\\1 + "data-version": ([\\d.]+)\\;version:\\1\\;confidence:0 }, "website": "http://www.atlassian.com/software/jira/overview/" }, From 2686ebb548110ee62e478494eebec97ae07e5a18 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Tue, 24 Nov 2020 09:01:55 +1100 Subject: [PATCH 4/4] Update technologies.json --- src/technologies.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/technologies.json b/src/technologies.json index 637b9ed75..cf522082b 100644 --- a/src/technologies.json +++ b/src/technologies.json @@ -1640,7 +1640,11 @@ "headers": { "X-Confluence-Request-Time": "" }, - "html": "
  • .+ Atlassian Confluence ([\\d.]+)
    • \\;version:\\1", + "dom": { + "li.print-only": { + "text": "Atlassian Confluence ([\\d.]+)\\;version:\\1" + } + }, "icon": "Atlassian Confluence.svg", "implies": "Java", "meta": {