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

Remediates proxy port parsing hazards

Browse Source
This commit is contained in:
nnposter
2018-03-05 01:32:12 +00:00
parent 8f36afdbc6
commit a2c93e87d0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ncat/ncat_main.c
View File

@@ -160,25 +160,27 @@
static int ncat_connect_mode(void);
static int ncat_listen_mode(void);
/* Determines if it's parsing HTTP or SOCKS by looking at defport */
/* Parses proxy address/port combo */
static size_t parseproxy(char *str, struct sockaddr_storage *ss,
size_t *sslen, unsigned short *portno)
{
char *c = strrchr(str, ':'), *ptr;
char *p = strrchr(str, ':');
char *q;
long pno;
int rc;
ptr = str;
if (p != NULL) {
*p++ = '\0';
pno = strtol(p, &q, 10);
if (pno < 1 || pno > 0xFFFF || *q)
bye("Invalid proxy port number \"%s\".", p);
*portno = (unsigned short) pno;
}
if (c)
*c = 0;
if (c && strlen((c + 1)))
*portno = (unsigned short) atoi(c + 1);
rc = resolve(ptr, *portno, ss, sslen, o.af);
rc = resolve(str, *portno, ss, sslen, o.af);
if (rc != 0) {
loguser("Could not resolve proxy \"%s\": %s.\n", ptr, gai_strerror(rc));
if (o.af == AF_INET6 && *portno)
loguser("Could not resolve proxy \"%s\": %s.\n", str, gai_strerror(rc));
if (o.af == AF_INET6)
loguser("Did you specify the port number? It's required for IPv6.\n");
exit(EXIT_FAILURE);
}