Merge branch 'projectdiscovery:main' into main

network/detection/ibm-d2b-database-server.yaml

@@ -27,6 +27,7 @@ tcp:
       - "{{Hostname}}"
       - "{{Host}}:50000"
 
+    matchers-condition: and
     matchers:
       - type: word
         encoding: hex
@@ -35,3 +36,8 @@ tcp:
           - "DB2"
           - "SQLJS1D"
         condition: or
+
+      - type: word
+        words:
+          - "HTTP/1.1"
+        negative: true

network/detection/pgsql-detect.yaml

@@ -31,6 +31,7 @@ tcp:
       - "{{Host}}:5432"
     read-size: 2048
 
+    matchers-condition: and
     matchers:
       - type: word
         part: body
@@ -42,3 +43,8 @@ tcp:
           - "user \"nuclei\""         # The user nuclei (sent in request) doesn't exist
           - "database \"nuclei\""     # The db nuclei (sent in request) doesn't exist"
         condition: or
+
+      - type: word
+        words:
+          - "HTTP/1.1"
+        negative: true

network/detection/samba-detect.yaml

@@ -22,7 +22,14 @@ tcp:
     host:
       - "{{Hostname}}"
       - "{{Host}}:139"
+
+    matchers-condition: and
     matchers:
       - type: word
         words:
           - "SMBr"
+
+      - type: word
+        words:
+          - "HTTP/1.1"
+        negative: true

network/misconfig/apache-rocketmq-broker-unauth.yaml

@@ -25,6 +25,7 @@ tcp:
       - "{{Host}}:10911"
     read-size: 2048
 
+    matchers-condition: and
     matchers:
       - type: word
         words:
@@ -33,3 +34,8 @@ tcp:
           - opaque
           - version
         condition: and
+
+      - type: word
+        words:
+          - "HTTP/1.1"
+        negative: true

templates-checksum.txt

@@ -6811,7 +6811,7 @@ network/detection/expn-mail-detect.yaml:ea9b02907ca016b2f52e153cbdaab31777064c78
 network/detection/finger-detect.yaml:b633bc4e54f3cf5421cf90d17d607d502db8a6e5
 network/detection/gnu-inetutils-ftpd-detect.yaml:13032bebe217b19d1069ebb90b8855ad019fda28
 network/detection/gopher-detect.yaml:63356156c5578e594b630bc0e7b341ca2e12a30c
-network/detection/ibm-d2b-database-server.yaml:9b781788e11b23308ed79ca59b95c2639662f934
+network/detection/ibm-d2b-database-server.yaml:7532b5b14424f0bfdeeac34f2883d1e958da3b3c
 network/detection/imap-detect.yaml:792e8e90cc05dd94184c7e2e584f55a2e9d0d253
 network/detection/iplanet-imap-detect.yaml:797804466967f502f94cb46f786ea756640df995
 network/detection/java-rmi-detect.yaml:d724183dc184431e03ed5c8274421665c7bda989
@@ -6822,7 +6822,7 @@ network/detection/mongodb-detect.yaml:2c765e6540b259f964bb53cb01ff81a64c80a78b
 network/detection/msmq-detect.yaml:5d977a358a7a5bbc1837ce60bdc31af7df92d59b
 network/detection/mysql-detect.yaml:4c716a0a7a60b45626cd756a2c949ca9e31439cb
 network/detection/openssh-detect.yaml:84efaa8f67216536f0e879a983157f364c0c27de
-network/detection/pgsql-detect.yaml:0c9dbce76ad296fb601a4ed0efaf19cd58e416c6
+network/detection/pgsql-detect.yaml:2d8931b96bf60405c27040a2b26fb8402ab524f9
 network/detection/pop3-detect.yaml:63f7b18a6aa15bf1ebb13c26a094c48b3607a203
 network/detection/proftpd-server-detect.yaml:0364267073c68f8c76a58c785b7295b7101aa87c
 network/detection/rabbitmq-detect.yaml:4ea11fe71f516437ee18948bef434aafc57eca62
@@ -6832,7 +6832,7 @@ network/detection/riak-detect.yaml:73cddd9093f8e8526acc0d9b9b5457306749ec34
 network/detection/rpcbind-portmapper-detect.yaml:64093f99eb18abeb9a85721e6a44b3a4d26d57e3
 network/detection/rsyncd-service-detect.yaml:5c3f80f8c0e34c9273c639b5083f044f1e16a5ea
 network/detection/rtsp-detect.yaml:6ab1273e3c9a6bc2b7655ba3cc88ece640e5cd5c
-network/detection/samba-detect.yaml:dbded4711f2e69f2f41d6abb7d84eac0b23a3446
+network/detection/samba-detect.yaml:f9f2fdf3001bac13094a48958b3a32489d46564b
 network/detection/sap-router.yaml:4d28d97202f3fdfa85d69a06b008d13ebd1e697c
 network/detection/smb-detect.yaml:5e42e55f8f85322f4db93767ab90a895db57f76c
 network/detection/smtp-detect.yaml:c059ef31c5bb6b3ecbff0fbe5e8283344b29ac27
@@ -6874,7 +6874,7 @@ network/jarm/c2/shad0w-c2-jarm.yaml:21d654db72d9fbefa32a7ec40d4a77616aa4a43a
 network/jarm/c2/silenttrinity-c2-jarm.yaml:fdec712cc69eed900b0d7ba42187a0ea0e7bb95b
 network/jarm/c2/sliver-c2-jarm.yaml:dd41a2f23026cb1ce6fab8fb12f3e4a82a2accc3
 network/misconfig/apache-dubbo-unauth.yaml:09668afcc0c2b0182f0bf739cb077295a979c353
-network/misconfig/apache-rocketmq-broker-unauth.yaml:ad263e3c1944962b99257fbd725379e6b09cc1bc
+network/misconfig/apache-rocketmq-broker-unauth.yaml:1b4b9d986d01ee2a9b8ef726753e3bb0303c6643
 network/misconfig/clamav-unauth.yaml:559dfa23076118f5ce1d84ffd9a76efb5d1d4422
 network/misconfig/clickhouse-unauth.yaml:c47517fbfc5f4a0425f884c42ef218e776b92cbc
 network/misconfig/dropbear-weakalgo.yaml:cf8685d87a0128c0a546c041633a1662d4e814f6
@@ -6913,7 +6913,7 @@ ssl/ssl-dns-names.yaml:aab93262d20a05bc780bf63d7c6d971611408d4e
 ssl/tls-version.yaml:cde833d5e6578a1c2e2a6a21e4f38da30d6cf750
 ssl/untrusted-root-certificate.yaml:207afac20c036cab562f9b10d469cf709cf977f0
 ssl/weak-cipher-suites.yaml:7ab90033845c8fd761be452af7fb2a87dc5f7eec
-templates-checksum.txt:38054cd7b90654b6d53eaa4a43a84ff0198f33d3
+templates-checksum.txt:0f4351cdea04136930455d67c0267e6a25300101
 wappalyzer-mapping.yml:7f03bd65baacac20c1dc6bbf35ff2407959574f1
 workflows/74cms-workflow.yaml:a6732eab4577f5dcf07eab6cf5f9c683fea75b7c
 workflows/acrolinx-workflow.yaml:ae86220e8743583a24dc5d81c8a83fa01deb157f