bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: '-' sign incorrectly parsed in hostname ACL, bandlim race condition on configuration reload

Browse Source
This commit is contained in:
Vladimir Dubrovin 2021-04-15 12:26:34 +03:00
parent 9fae0082a3
commit 681182b1e5
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -11,6 +11,16 @@
*.lib *.lib
*.key *.key
*.pem *.pem
*.so
bin/3proxy
bin/proxy
bin/socks
bin/tcppm
bin/udppm
bin/pop3p
bin/smtpp
bin/ftppr
bin/mycrypt
bin64/ bin64/
dll/ dll/
tmp/ tmp/

21
src/conf.c
View File

@ -793,12 +793,19 @@ int scanipl(unsigned char *arg, struct iplist *dst){
#endif #endif
char * slash, *dash; char * slash, *dash;
int masklen, addrlen; int masklen, addrlen;
int res;
if((slash = strchr((char *)arg, '/'))) *slash = 0; if((slash = strchr((char *)arg, '/'))) *slash = 0;
if((dash = strchr((char *)arg,'-'))) *dash = 0; if((dash = strchr((char *)arg,'-'))) *dash = 0;
if(afdetect(arg) == -1) return 1; if(afdetect(arg) == -1) {
if(!getip46(46, arg, (struct sockaddr *)&sa)) return 1; if(slash)*slash = '/';
if(dash)*dash = '-';
return 1;
}
res = getip46(46, arg, (struct sockaddr *)&sa);
if(dash)*dash = '-';
if(!res) return 1;
memcpy(&dst->ip_from, SAADDR(&sa), SAADDRLEN(&sa)); memcpy(&dst->ip_from, SAADDR(&sa), SAADDRLEN(&sa));
dst->family = *SAFAMILY(&sa); dst->family = *SAFAMILY(&sa);
if(dash){ if(dash){
@ -810,6 +817,7 @@ int scanipl(unsigned char *arg, struct iplist *dst){
} }
memcpy(&dst->ip_to, &dst->ip_from, SAADDRLEN(&sa)); memcpy(&dst->ip_to, &dst->ip_from, SAADDRLEN(&sa));
if(slash){ if(slash){
*slash = '/';
addrlen = SAADDRLEN(&sa); addrlen = SAADDRLEN(&sa);
masklen = atoi(slash+1); masklen = atoi(slash+1);
if(masklen < 0 || masklen > (addrlen*8)) return 4; if(masklen < 0 || masklen > (addrlen*8)) return 4;
@ -1154,6 +1162,7 @@ static int h_ace(int argc, unsigned char **argv){
case REDIRECT: case REDIRECT:
acl->chains = myalloc(sizeof(struct chain)); acl->chains = myalloc(sizeof(struct chain));
if(!acl->chains) { if(!acl->chains) {
freeacl(acl);
return(21); return(21);
} }
memset(acl->chains, 0, sizeof(struct chain)); memset(acl->chains, 0, sizeof(struct chain));
@ -1177,6 +1186,7 @@ static int h_ace(int argc, unsigned char **argv){
case NOCONNLIM: case NOCONNLIM:
ncl = myalloc(sizeof(struct connlim)); ncl = myalloc(sizeof(struct connlim));
if(!ncl) { if(!ncl) {
freeacl(acl);
return(21); return(21);
} }
memset(ncl, 0, sizeof(struct connlim)); memset(ncl, 0, sizeof(struct connlim));
@ -1203,6 +1213,7 @@ static int h_ace(int argc, unsigned char **argv){
nbl = myalloc(sizeof(struct bandlim)); nbl = myalloc(sizeof(struct bandlim));
if(!nbl) { if(!nbl) {
freeacl(acl);
return(21); return(21);
} }
memset(nbl, 0, sizeof(struct bandlim)); memset(nbl, 0, sizeof(struct bandlim));
@ -1210,6 +1221,8 @@ static int h_ace(int argc, unsigned char **argv){
if(acl->action == BANDLIM) { if(acl->action == BANDLIM) {
sscanf((char *)argv[1], "%u", &nbl->rate); sscanf((char *)argv[1], "%u", &nbl->rate);
if(nbl->rate < 300) { if(nbl->rate < 300) {
myfree(nbl);
freeacl(acl);
fprintf(stderr, "Wrong bandwidth specified, line %d\n", linenum); fprintf(stderr, "Wrong bandwidth specified, line %d\n", linenum);
return(4); return(4);
} }
@ -1250,6 +1263,7 @@ static int h_ace(int argc, unsigned char **argv){
if(!conf.trafcountfunc) conf.trafcountfunc = trafcountfunc; if(!conf.trafcountfunc) conf.trafcountfunc = trafcountfunc;
tl = myalloc(sizeof(struct trafcount)); tl = myalloc(sizeof(struct trafcount));
if(!tl) { if(!tl) {
freeacl(acl);
return(21); return(21);
} }
memset(tl, 0, sizeof(struct trafcount)); memset(tl, 0, sizeof(struct trafcount));
@ -1268,6 +1282,8 @@ static int h_ace(int argc, unsigned char **argv){
tl->type = getrotate(*argv[2]); tl->type = getrotate(*argv[2]);
tl->traflim64 = ((uint64_t)lim)*(1024*1024); tl->traflim64 = ((uint64_t)lim)*(1024*1024);
if(!tl->traflim64) { if(!tl->traflim64) {
myfree(tl);
freeacl(acl);
fprintf(stderr, "Wrong traffic limit specified, line %d\n", linenum); fprintf(stderr, "Wrong traffic limit specified, line %d\n", linenum);
return(6); return(6);
} }
@ -1786,6 +1802,7 @@ void freeconf(struct extparam *confp){
confp->bandlimiter = NULL; confp->bandlimiter = NULL;
confp->bandlimiterout = NULL; confp->bandlimiterout = NULL;
confp->bandlimfunc = NULL; confp->bandlimfunc = NULL;
confp->bandlimver++;
pthread_mutex_unlock(&bandlim_mutex); pthread_mutex_unlock(&bandlim_mutex);
pthread_mutex_lock(&connlim_mutex); pthread_mutex_lock(&connlim_mutex);
cl = confp->connlimiter; cl = confp->connlimiter;