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

Fix unprivileged behavior for -PU and others

Browse Source 
If not root, fallback to TCP ping from ICMP was incorrectly obliterating
other -P* options without warning, leading to unexpected behavior and
inconsistent error messages (i.e. including -PE would silence all
warnings usually given with -PU)
This commit is contained in:
dmiller
2023-11-27 23:05:02 +00:00
parent a3dd1f79a3
commit 53752093d7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nmap.cc
View File

@@ -390,6 +390,18 @@ void validate_scan_lists(scan_lists &vports, NmapOps &vo) {
}
}
if (!vo.isr00t) {
if (vo.pingtype & (PINGTYPE_ICMP_PING | PINGTYPE_ICMP_MASK | PINGTYPE_ICMP_TS)) {
error("Warning: You are not root -- using TCP pingscan rather than ICMP");
vo.pingtype &= ~(PINGTYPE_ICMP_PING | PINGTYPE_ICMP_MASK | PINGTYPE_ICMP_TS);
vo.pingtype |= PINGTYPE_TCP;
if (vports.syn_ping_count == 0) {
getpts_simple(DEFAULT_TCP_PROBE_PORT_SPEC, SCAN_TCP_PORT, &vports.syn_ping_ports, &vports.syn_ping_count);
assert(vports.syn_ping_count > 0);
}
}
}
if ((vo.pingtype & PINGTYPE_TCP) && (!vo.isr00t)) {
// We will have to do a connect() style ping
// Pretend we wanted SYN probes all along.
@@ -417,16 +429,6 @@ void validate_scan_lists(scan_lists &vports, NmapOps &vo) {
vo.pingtype |= PINGTYPE_TCP_USE_SYN;
}
if (!vo.isr00t) {
if (vo.pingtype & (PINGTYPE_ICMP_PING | PINGTYPE_ICMP_MASK | PINGTYPE_ICMP_TS)) {
error("Warning: You are not root -- using TCP pingscan rather than ICMP");
vo.pingtype = PINGTYPE_TCP;
if (vports.syn_ping_count == 0) {
getpts_simple(DEFAULT_TCP_PROBE_PORT_SPEC, SCAN_TCP_PORT, &vports.syn_ping_ports, &vports.syn_ping_count);
assert(vports.syn_ping_count > 0);
}
}
}
}
struct ftpinfo ftp = get_default_ftpinfo();