PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Add DTLS tunnel scanning to -sV

Browse Source
This commit is contained in:
dmiller
2022-10-10 20:48:15 +00:00
parent 4e6c8feb15
commit 84e2e9be52
3 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -1,5 +1,10 @@
#Nmap Changelog ($Id$); -*-text-*- #Nmap Changelog ($Id$); -*-text-*-
o Nmap's service scan (-sV) can now probe the UDP service behind a DTLS tunnel,
the same as it already does for TCP services with SSL/TLS encryption. The
DTLSSessionReq probe has had its rarity lowered to 2 to allow it to be sent
sooner in the scan. [Daniel Miller]
o [Ncat] Ncat in listen mode with --udp --ssl will use DTLS to secure incoming o [Ncat] Ncat in listen mode with --udp --ssl will use DTLS to secure incoming
connections. [Daniel Miller] connections. [Daniel Miller]

2
nmap-service-probes
View File

@@ -16455,7 +16455,7 @@ softmatch coap m|^`E|
##############################NEXT PROBE############################## ##############################NEXT PROBE##############################
# DTLS Client Hello. Dissection available in nmap-payloads # DTLS Client Hello. Dissection available in nmap-payloads
Probe UDP DTLSSessionReq q|\x16\xfe\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x36\x01\x00\x00\x2a\x00\x00\x00\x00\x00\x00\x00\x2a\xfe\xfd\x00\x00\x00\x00\x7c\x77\x40\x1e\x8a\xc8\x22\xa0\xa0\x18\xff\x93\x08\xca\xac\x0a\x64\x2f\xc9\x22\x64\xbc\x08\xa8\x16\x89\x19\x30\x00\x00\x00\x02\x00\x2f\x01\x00| Probe UDP DTLSSessionReq q|\x16\xfe\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x36\x01\x00\x00\x2a\x00\x00\x00\x00\x00\x00\x00\x2a\xfe\xfd\x00\x00\x00\x00\x7c\x77\x40\x1e\x8a\xc8\x22\xa0\xa0\x18\xff\x93\x08\xca\xac\x0a\x64\x2f\xc9\x22\x64\xbc\x08\xa8\x16\x89\x19\x30\x00\x00\x00\x02\x00\x2f\x01\x00|
rarity 5 rarity 2
ports 443,853,4433,4740,5349,5684,5868,6514,6636,8232,10161,10162,12346,12446,12546,12646,12746,12846,12946,13046 ports 443,853,4433,4740,5349,5684,5868,6514,6636,8232,10161,10162,12346,12446,12546,12646,12746,12846,12946,13046
# OpenSSL 1.1.0 s_server -dtls -listen # OpenSSL 1.1.0 s_server -dtls -listen

66
service_scan.cc
View File

@@ -2055,44 +2055,40 @@ static void startNextProbe(nsock_pool nsp, nsock_iod nsi, ServiceGroup *SG,
if (!isInitial) if (!isInitial)
probe = svc->nextProbe(true); // if was initial, currentProbe() returned the right one to execute. probe = svc->nextProbe(true); // if was initial, currentProbe() returned the right one to execute.
if (probe) { if (probe) {
// For a TCP probe, we start by requesting a new connection to the target nsock_iod_delete(nsi, NSOCK_PENDING_SILENT);
if (svc->proto == IPPROTO_TCP) { if ((svc->niod = nsock_iod_new(nsp, svc)) == NULL) {
nsock_iod_delete(nsi, NSOCK_PENDING_SILENT); fatal("Failed to allocate Nsock I/O descriptor in %s()", __func__);
if ((svc->niod = nsock_iod_new(nsp, svc)) == NULL) { }
fatal("Failed to allocate Nsock I/O descriptor in %s()", __func__); if (o.spoofsource) {
} o.SourceSockAddr(&ss, &ss_len);
if (o.spoofsource) { nsock_iod_set_localaddr(svc->niod, &ss, ss_len);
o.SourceSockAddr(&ss, &ss_len); }
nsock_iod_set_localaddr(svc->niod, &ss, ss_len); if (o.ipoptionslen)
} nsock_iod_set_ipoptions(svc->niod, o.ipoptions, o.ipoptionslen);
if (o.ipoptionslen) if (svc->target->TargetName()) {
nsock_iod_set_ipoptions(svc->niod, o.ipoptions, o.ipoptionslen); if (nsock_iod_set_hostname(svc->niod, svc->target->TargetName()) == -1)
if (svc->target->TargetName()) { fatal("nsock_iod_set_hostname(\"%s\" failed in %s()",
if (nsock_iod_set_hostname(svc->niod, svc->target->TargetName()) == -1) svc->target->TargetName(), __func__);
fatal("nsock_iod_set_hostname(\"%s\" failed in %s()", }
svc->target->TargetName(), __func__); svc->target->TargetSockAddr(&ss, &ss_len);
} if (svc->tunnel == SERVICE_TUNNEL_NONE) {
svc->target->TargetSockAddr(&ss, &ss_len); if (svc->proto == IPPROTO_TCP) {
if (svc->tunnel == SERVICE_TUNNEL_NONE) {
nsock_connect_tcp(nsp, svc->niod, servicescan_connect_handler, nsock_connect_tcp(nsp, svc->niod, servicescan_connect_handler,
DEFAULT_CONNECT_TIMEOUT, svc, DEFAULT_CONNECT_TIMEOUT, svc,
(struct sockaddr *) &ss, ss_len, (struct sockaddr *) &ss, ss_len,
svc->portno); svc->portno);
} else { }
assert(svc->tunnel == SERVICE_TUNNEL_SSL); else {
nsock_connect_ssl(nsp, svc->niod, servicescan_connect_handler, nsock_connect_udp(nsp, svc->niod, servicescan_connect_handler,
DEFAULT_CONNECT_SSL_TIMEOUT, svc, svc, (struct sockaddr *) &ss, ss_len,
(struct sockaddr *) &ss, svc->portno);
ss_len, svc->proto, svc->portno, svc->ssl_session);
} }
} else { } else {
assert(svc->proto == IPPROTO_UDP); assert(svc->tunnel == SERVICE_TUNNEL_SSL);
/* Can maintain the same UDP "connection" */ nsock_connect_ssl(nsp, svc->niod, servicescan_connect_handler,
svc->currentprobe_exec_time = *nsock_gettimeofday(); DEFAULT_CONNECT_SSL_TIMEOUT, svc,
send_probe_text(nsp, nsi, svc, probe); (struct sockaddr *) &ss,
// Now let us read any results ss_len, svc->proto, svc->portno, svc->ssl_session);
nsock_read(nsp, nsi, servicescan_read_handler,
svc->probe_timemsleft(probe, nsock_gettimeofday()), svc);
} }
} else { } else {
// No more probes remaining! Failed to match // No more probes remaining! Failed to match
@@ -2135,8 +2131,9 @@ static int scanThroughTunnel(nsock_pool nsp, nsock_iod nsi, ServiceGroup *SG,
return 0; return 0;
} }
if (svc->proto != IPPROTO_TCP || if (!svc->probe_matched ||
!svc->probe_matched || strcmp(svc->probe_matched, "ssl") != 0) (strcmp(svc->probe_matched, "ssl") != 0 &&
strcmp(svc->probe_matched, "dtls") != 0))
return 0; // Not SSL return 0; // Not SSL
// Alright! We are going to start the tests over using SSL // Alright! We are going to start the tests over using SSL
@@ -2789,6 +2786,7 @@ int service_scan(std::vector<Target *> &Targets) {
#if HAVE_OPENSSL #if HAVE_OPENSSL
/* We don't care about connection security in version detection. */ /* We don't care about connection security in version detection. */
nsock_pool_ssl_init(nsp, NSOCK_SSL_MAX_SPEED); nsock_pool_ssl_init(nsp, NSOCK_SSL_MAX_SPEED);
nsock_pool_dtls_init(nsp, NSOCK_SSL_MAX_SPEED);
#endif #endif
launchSomeServiceProbes(nsp, SG); launchSomeServiceProbes(nsp, SG);