Skip to content
Snippets Groups Projects
Commit 92fb7361 authored by rswindell's avatar rswindell
Browse files

Reject filenames beginning with '-' (security concern).

parent cbb0d4c6
No related branches found
No related tags found
No related merge requests found
...@@ -4123,7 +4123,8 @@ static void ctrl_thread(void* arg) ...@@ -4123,7 +4123,8 @@ static void ctrl_thread(void* arg)
sockprintf(sock,"553 Insufficient access."); sockprintf(sock,"553 Insufficient access.");
continue; continue;
} }
if(strcspn(p,ILLEGAL_FILENAME_CHARS)!=strlen(p) if(*p=='-'
|| strcspn(p,ILLEGAL_FILENAME_CHARS)!=strlen(p)
|| trashcan(&scfg,p,"file")) { || trashcan(&scfg,p,"file")) {
lprintf(LOG_WARNING,"%04d !ILLEGAL FILENAME ATTEMPT by %s: %s" lprintf(LOG_WARNING,"%04d !ILLEGAL FILENAME ATTEMPT by %s: %s"
,sock,user.alias,p); ,sock,user.alias,p);
...@@ -4649,7 +4650,7 @@ void DLLCALL ftp_server(void* arg) ...@@ -4649,7 +4650,7 @@ void DLLCALL ftp_server(void* arg)
return; return;
} }
lprintf(LOG_DEBUG,"%04d FTP socket opened",server_socket); lprintf(LOG_DEBUG,"%04d FTP Server socket opened",server_socket);
/*****************************/ /*****************************/
/* Listen for incoming calls */ /* Listen for incoming calls */
...@@ -4782,6 +4783,10 @@ void DLLCALL ftp_server(void* arg) ...@@ -4782,6 +4783,10 @@ void DLLCALL ftp_server(void* arg)
served++; served++;
} }
#ifdef _DEBUG
lprintf(LOG_DEBUG,"0000 server_socket: %d",server_socket);
lprintf(LOG_DEBUG,"0000 terminate_server: %d",terminate_server);
#endif
if(active_clients) { if(active_clients) {
lprintf(LOG_DEBUG,"0000 Waiting for %d active clients to disconnect...", active_clients); lprintf(LOG_DEBUG,"0000 Waiting for %d active clients to disconnect...", active_clients);
start=time(NULL); start=time(NULL);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment