From a77c87ac1a671c679c78a25282143c8114e8e639 Mon Sep 17 00:00:00 2001
From: Muhammad Daffa <36522826+daffainfo@users.noreply.github.com>
Date: Sun, 9 Oct 2022 13:11:17 +0700
Subject: [PATCH 1/5] fix: false negative pbootcms-detect template

---
 technologies/pbootcms-detect.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/technologies/pbootcms-detect.yaml b/technologies/pbootcms-detect.yaml
index e6d02001f7..7b6ff5e1a2 100644
--- a/technologies/pbootcms-detect.yaml
+++ b/technologies/pbootcms-detect.yaml
@@ -2,8 +2,12 @@ id: pbootcms-detect
 
 info:
   name: PbootCMS Detect
-  author: princechaddha
+  author: princechaddha,daffainfo
   severity: info
+  reference: https://www.pbootcms.com/
+  metadata:
+    verified: true
+    shodan-dork: http.html:"PbootCMS"
   tags: tech,pbootcms
 
 requests:
@@ -13,9 +17,10 @@ requests:
 
     matchers-condition: and
     matchers:
-      - type: regex
-        regex:
-          - '<title>PbootCMS(.*)</title>'
+      - type: words
+        part: body
+        word:
+          - '<meta name="description" content="PbootCMS'
 
       - type: status
         status:

From 935c537e74ee4d13ba33132307c9efde03b2bcdf Mon Sep 17 00:00:00 2001
From: Sandeep Singh <sandeep@projectdiscovery.io>
Date: Sun, 9 Oct 2022 12:45:11 +0530
Subject: [PATCH 2/5] misc fix

---
 technologies/pbootcms-detect.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/technologies/pbootcms-detect.yaml b/technologies/pbootcms-detect.yaml
index 7b6ff5e1a2..2309ad6373 100644
--- a/technologies/pbootcms-detect.yaml
+++ b/technologies/pbootcms-detect.yaml
@@ -17,9 +17,9 @@ requests:
 
     matchers-condition: and
     matchers:
-      - type: words
+      - type: word
         part: body
-        word:
+        words:
           - '<meta name="description" content="PbootCMS'
 
       - type: status

From 02b39aa8716c9042dc2ff8d1d38fa1c6da667ccf Mon Sep 17 00:00:00 2001
From: Ritik Chaddha <44563978+ritikchaddha@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:21:02 +0530
Subject: [PATCH 3/5] Update pbootcms-detect.yaml

---
 technologies/pbootcms-detect.yaml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/technologies/pbootcms-detect.yaml b/technologies/pbootcms-detect.yaml
index 2309ad6373..6964451214 100644
--- a/technologies/pbootcms-detect.yaml
+++ b/technologies/pbootcms-detect.yaml
@@ -4,7 +4,8 @@ info:
   name: PbootCMS Detect
   author: princechaddha,daffainfo
   severity: info
-  reference: https://www.pbootcms.com/
+  reference: 
+    - https://www.pbootcms.com/
   metadata:
     verified: true
     shodan-dork: http.html:"PbootCMS"
@@ -20,8 +21,15 @@ requests:
       - type: word
         part: body
         words:
-          - '<meta name="description" content="PbootCMS'
+          - 'content="PbootCMS'
 
       - type: status
         status:
           - 200
+
+    extractors:
+      - type: regex
+        part: body
+        group: 1
+        regex:
+          - 'title="(.*)正式发布">'

From b3c25a77e9bf063e96ac03e778bad031ca10397d Mon Sep 17 00:00:00 2001
From: Ritik Chaddha <44563978+ritikchaddha@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:22:52 +0530
Subject: [PATCH 4/5] Update pbootcms-detect.yaml

---
 technologies/pbootcms-detect.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/technologies/pbootcms-detect.yaml b/technologies/pbootcms-detect.yaml
index 6964451214..6f5bdb5eb6 100644
--- a/technologies/pbootcms-detect.yaml
+++ b/technologies/pbootcms-detect.yaml
@@ -4,7 +4,7 @@ info:
   name: PbootCMS Detect
   author: princechaddha,daffainfo
   severity: info
-  reference: 
+  reference:
     - https://www.pbootcms.com/
   metadata:
     verified: true

From 8f4425d8e245016ec2182e19f35a7466bd1510f2 Mon Sep 17 00:00:00 2001
From: Prince Chaddha <prince@projectdiscovery.io>
Date: Tue, 11 Oct 2022 12:32:23 +0530
Subject: [PATCH 5/5] Update pbootcms-detect.yaml

---
 technologies/pbootcms-detect.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/technologies/pbootcms-detect.yaml b/technologies/pbootcms-detect.yaml
index 6f5bdb5eb6..2eeb16dc9b 100644
--- a/technologies/pbootcms-detect.yaml
+++ b/technologies/pbootcms-detect.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.pbootcms.com/
   metadata:
     verified: true
-    shodan-dork: http.html:"PbootCMS"
+    shodan-query: http.html:"PbootCMS"
   tags: tech,pbootcms
 
 requests:
@@ -16,16 +16,16 @@ requests:
     path:
       - "{{BaseURL}}"
 
-    matchers-condition: and
+    matchers-condition: or
     matchers:
       - type: word
         part: body
         words:
           - 'content="PbootCMS'
 
-      - type: status
-        status:
-          - 200
+      - type: regex
+        regex:
+          - '<title>PbootCMS(.*)</title>'
 
     extractors:
       - type: regex