bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-10-17 08:55:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Authorize FTP commands and data connections by the rules in force

Browse Source 
An FTP control connection authorizes each OPEN or USER and each data
connection while it lasts, which may be across a reload: these go
through clientauth() too, as a client of the newest service on its
listener after a reload.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Vladimir Dubrovin 2026-10-15 00:49:53 +03:00
parent ae27a5cf90
commit dfee08ded4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ftp.c
View File

@ -203,13 +203,13 @@ SOCKET ftpdata(struct clientparam *param){
*SAPORT(&param->sinsl) = 0; *SAPORT(&param->sinsl) = 0;
i = param->operation; i = param->operation;
param->operation = FTP_DATA; param->operation = FTP_DATA;
if((param->res = (*param->srv->authfunc)(param))) { if((param->res = clientauth(param))) {
if(param->remsock != INVALID_SOCKET) { if(param->remsock != INVALID_SOCKET) {
param->srv->so._closesocket(param->sostate, param->remsock); param->srv->so._closesocket(param->sostate, param->remsock);
param->remsock = INVALID_SOCKET; param->remsock = INVALID_SOCKET;
} }
memset(&param->sinsl, 0, sizeof(param->sinsl)); memset(&param->sinsl, 0, sizeof(param->sinsl));
if((param->res = (*param->srv->authfunc)(param))) { if((param->res = clientauth(param))) {
param->remsock = rem; param->remsock = rem;
return INVALID_SOCKET; return INVALID_SOCKET;
} }

4
src/ftppr.c
View File

@ -54,7 +54,7 @@ void * ftpprchild(struct clientparam* param) {
param->srv->so._closesocket(param->sostate, param->remsock); param->srv->so._closesocket(param->sostate, param->remsock);
param->remsock = INVALID_SOCKET; param->remsock = INVALID_SOCKET;
} }
if((res = (*param->srv->authfunc)(param))) {RETURN(res);} if((res = clientauth(param))) {RETURN(res);}
param->ctrlsocksrv = param->remsock; param->ctrlsocksrv = param->remsock;
if(socksend(param, param->ctrlsock, (unsigned char *)"220 Ready\r\n", 11, param->srv->timeouts[STRING_S])!=11) {RETURN (801);} if(socksend(param, param->ctrlsock, (unsigned char *)"220 Ready\r\n", 11, param->srv->timeouts[STRING_S])!=11) {RETURN (801);}
status = 1; status = 1;
@ -62,7 +62,7 @@ void * ftpprchild(struct clientparam* param) {
else if (!strncasecmp((char *)buf, "USER ", 5)){ else if (!strncasecmp((char *)buf, "USER ", 5)){
if(parseconnusername((char *)buf +5, param, 0, 21)){RETURN(804);} if(parseconnusername((char *)buf +5, param, 0, 21)){RETURN(804);}
if(!status){ if(!status){
if((res = (*param->srv->authfunc)(param))) {RETURN(res);} if((res = clientauth(param))) {RETURN(res);}
param->ctrlsocksrv = param->remsock; param->ctrlsocksrv = param->remsock;
} }
if(socksend(param, param->ctrlsock, (unsigned char *)"331 ok\r\n", 8, param->srv->timeouts[STRING_S])!=8) {RETURN (807);} if(socksend(param, param->ctrlsock, (unsigned char *)"331 ok\r\n", 8, param->srv->timeouts[STRING_S])!=8) {RETURN (807);}