mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
socks: a host name with control bytes or spaces is refused where it is read
This commit is contained in:
1 parent
83269785df
commit
61b5ae5e0b
5 files changed
+100
No files matched your search
@@ -545,11 +545,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;
|
||||
|
||||
@@ -471,6 +471,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);
|
||||
|
||||
@@ -139,6 +139,7 @@ void * sockschild(struct clientparam* param) {
|
||||
default:
|
||||
RETURN(997);
|
||||
}
|
||||
if(badhostname((char *)buf)) {RETURN(21);}
|
||||
if(PARAMSTR(param, hostname, buf)){RETURN(21);}
|
||||
if (ver == 5) {
|
||||
if ((res = sockgetcharcli(param, param->srv->timeouts[SINGLEBYTE_S], 0)) == EOF) {RETURN(441);}
|
||||
@@ -158,6 +159,7 @@ void * sockschild(struct clientparam* param) {
|
||||
param->service = S_SOCKS45;
|
||||
if(sockgetlinebuf(param, CLIENT, buf, BUFSIZE - 1, 0, param->srv->timeouts[STRING_S]) < 0) {RETURN(441);}
|
||||
buf[127] = 0;
|
||||
if(badhostname((char *)buf)) {RETURN(21);}
|
||||
if(PARAMSTR(param, hostname, buf)){RETURN(21);}
|
||||
if(!getip46m(param->srv->resolvmode, param->srv->family, buf, (struct sockaddr *) ¶m->req)) RETURN(100);
|
||||
param->sinsr = param->req;
|
||||
|
||||
@@ -265,6 +265,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 (!getip46m(param->srv->resolvmode, param->srv->family, (unsigned char *)dstnamebuf,
|
||||
|
||||
Reference in new issue
Block a user