diff --git a/src/common.c b/src/common.c index 2e670cb..69985bf 100644 --- a/src/common.c +++ b/src/common.c @@ -569,11 +569,26 @@ int parsehost(int family, unsigned char *host, struct sockaddr *sa){ return ret; } +/* A host name is written into the request lines of parent protocols and + matched against rules, so a control byte or a space in it could end a + line early or pose as another destination. A name carrying one is + refused where it is read, and every name a client sends is read on + its way to the field. */ +int badhostname(const char *hostname){ + const unsigned char *c; + + if(!hostname) return 1; + for(c = (const unsigned char *)hostname; *c; c++) + if(*c <= ' ' || *c == 0x7f) return 1; + return 0; +} + int parsehostname(char *hostname, struct clientparam *param, uint16_t port){ char *sp=NULL,*se=NULL; int ret = 0; if(!hostname || !*hostname)return 2; + if(badhostname(hostname)) return 1; if(*hostname == '[') se=strchr(hostname, ']'); if ((sp = strchr(se?se:hostname, ':'))) { if(strchr(sp+1, ':'))sp = NULL; diff --git a/src/proxy.h b/src/proxy.h index 56ad220..7794d51 100644 --- a/src/proxy.h +++ b/src/proxy.h @@ -335,6 +335,7 @@ void hashdelete(struct hashtable *ht, void* name); int hashresolv(struct hashtable *ht, void* name, void* value, uint32_t *ttl); int parsehost(int family, unsigned char *host, struct sockaddr *sa); +int badhostname(const char *hostname); int parsehostname(char *hostname, struct clientparam *param, uint16_t port); int parseusername(char *username, struct clientparam *param, int extpasswd); int parseconnusername(char *username, struct clientparam *param, int extpasswd, uint16_t port); diff --git a/src/socks.c b/src/socks.c index cde98ec..1ad95cb 100644 --- a/src/socks.c +++ b/src/socks.c @@ -137,6 +137,7 @@ void * sockschild(struct clientparam* param) { default: RETURN(997); } + if(badhostname((char *)buf)) {RETURN(21);} if(param->hostname)free(param->hostname); param->hostname = (unsigned char *)strdup((char *)buf); if(!param->hostname){RETURN(21);} @@ -159,6 +160,7 @@ void * sockschild(struct clientparam* param) { param->service = S_SOCKS45; if(sockgetlinebuf(param, CLIENT, buf, BUFSIZE - 1, 0, conf.timeouts[STRING_S]) < 0) {RETURN(441);} buf[127] = 0; + if(badhostname((char *)buf)) {RETURN(21);} if(param->hostname)free(param->hostname); param->hostname = (unsigned char *)strdup((char *)buf); if(!param->hostname){RETURN(21);} diff --git a/src/udpsockmap.c b/src/udpsockmap.c index d9d3811..c5f28f8 100644 --- a/src/udpsockmap.c +++ b/src/udpsockmap.c @@ -277,6 +277,7 @@ int udpsockmap(struct clientparam *param, int timeo) if (len < 7 + sz) return 485; memcpy(dstnamebuf, base + 5, sz); dstnamebuf[sz] = 0; + if (badhostname(dstnamebuf)) continue; dstname = dstnamebuf; i = 5 + sz; if (!getip46(param->srv->family, (unsigned char *)dstnamebuf,