From c21eccd8e67bf1000907241e94fce3349020d878 Mon Sep 17 00:00:00 2001
From: un-fmunozs <fmunozs@unal.edu.co>
Date: Fri, 7 Aug 2020 16:14:24 -0500
Subject: [PATCH] Improve drupal detection on tech-detect and drop cms-detect

tech-detect does a better job with more cms than cms-detect, strings from cms-detect added for drupal. wordpress detection on tech-detect is ok. Fix #289
---
 technologies/cms-detect.yaml  | 28 ----------------------------
 technologies/tech-detect.yaml |  5 ++++-
 2 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 technologies/cms-detect.yaml

diff --git a/technologies/cms-detect.yaml b/technologies/cms-detect.yaml
deleted file mode 100644
index cdf72d9016..0000000000
--- a/technologies/cms-detect.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-id: cms-detect
-
-info:
-  name: CMS Detect
-  author: NkxxkN https://twitter.com/NkkxN
-  severity: info
-
-requests:
-  - method: GET
-    path:
-      - "{{BaseURL}}/"
-    matchers-condition: or
-    matchers:
-      - type: word
-        name: drupal
-        words:
-          - "X-Drupal"
-          - "x-drupal"
-          - "X-Generator: Drupal"
-        condition: or
-        part: header
-      - type: word
-        name: wordpress
-        words:
-          - "/wp-content/"
-          - "/wp-includes/"
-        condition: or
-        part: body
diff --git a/technologies/tech-detect.yaml b/technologies/tech-detect.yaml
index 69ab7a325f..3337d7dc03 100644
--- a/technologies/tech-detect.yaml
+++ b/technologies/tech-detect.yaml
@@ -1827,8 +1827,11 @@ requests:
         name: drupal
         regex:
           - <(?:link|style)[^>]+"/sites/(?:default|all)/(?:themes|modules)/
+          - "X-Drupal"
+          - "x-drupal"
+          - "X-Generator: Drupal"
         condition: or
-        part: body
+        part: all   
       - type: regex
         name: webxpay
         regex: