From 0193468ac4a60805f853699a9296d0b02a5393de Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Mon, 5 Nov 2018 07:39:26 +0000
Subject: [PATCH] Fixed-up some log output messages: - user alias was missing
from some messages or in the wrong place - added hostname and IP address to
the "ILLEGAL FILENAME ATTEMPT" warnings
---
src/sbbs3/ftpsrvr.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 26cdde0110..1d3a83b3b3 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -3298,8 +3298,8 @@ static void ctrl_thread(void* arg)
continue;
}
if((i=getuserdat(&scfg, &user))!=0) {
- lprintf(LOG_ERR,"%04d !ERROR %d getting data for user #%d (%s)"
- ,sock,i,user.number,user.alias);
+ lprintf(LOG_ERR,"%04d <%s> !ERROR %d getting data for user #%d"
+ ,sock, user.alias, i, user.number);
sockprintf(sock,sess,"530 Database error %d",i);
user.number=0;
continue;
@@ -3339,7 +3339,7 @@ static void ctrl_thread(void* arg)
SAFEPRINTF2(sys_pass,"%s:%s",user.pass,scfg.sys_pass);
if(!user.pass[0]) { /* Guest/Anonymous */
if(trashcan(&scfg,password,"email")) {
- lprintf(LOG_NOTICE,"%04d !BLOCKED e-mail address: %s",sock,password);
+ lprintf(LOG_NOTICE,"%04d <%s> !BLOCKED e-mail address: %s", sock, user.alias, password);
user.number=0;
if(badlogin(sock, sess, &login_attempts, NULL, NULL, NULL, NULL))
break;
@@ -5290,7 +5290,7 @@ static void ctrl_thread(void* arg)
JS_BEGINREQUEST(js_cx);
js_val=INT_TO_JSVAL(timeleft);
if(!JS_SetProperty(js_cx, js_ftp, "time_left", &js_val))
- lprintf(LOG_ERR,"%04d !JavaScript ERROR setting user.time_left",sock);
+ lprintf(LOG_ERR,"%04d <%s> !JavaScript ERROR setting user.time_left",sock, user.alias);
js_generate_index(js_cx, js_ftp, sock, fp, lib, dir, &user, &client);
JS_ENDREQUEST(js_cx);
#endif
@@ -5368,8 +5368,8 @@ static void ctrl_thread(void* arg)
if(strcspn(p,ILLEGAL_FILENAME_CHARS)!=strlen(p)) {
success=FALSE;
- lprintf(LOG_WARNING,"%04d !ILLEGAL FILENAME ATTEMPT by %s: %s"
- ,sock,user.alias,p);
+ lprintf(LOG_WARNING,"%04d <%s> !ILLEGAL FILENAME ATTEMPT by %s [%s]: %s"
+ ,sock, user.alias, host_name, host_ip, p);
ftp_hacklog("FTP FILENAME", user.alias, cmd, host_name, &ftp.client_addr);
} else {
if(fexistcase(fname)) {
@@ -5451,7 +5451,7 @@ static void ctrl_thread(void* arg)
}
if(transfer_inprogress==TRUE) {
- lprintf(LOG_WARNING,"%04d !TRANSFER already in progress (%s)",sock,cmd);
+ lprintf(LOG_WARNING,"%04d <%s> !TRANSFER already in progress (%s)",sock, user.alias, cmd);
sockprintf(sock,sess,"425 Transfer already in progress.");
continue;
}
@@ -5541,8 +5541,8 @@ static void ctrl_thread(void* arg)
if(*p=='-'
|| strcspn(p,ILLEGAL_FILENAME_CHARS)!=strlen(p)
|| trashcan(&scfg,p,"file")) {
- lprintf(LOG_WARNING,"%04d !ILLEGAL FILENAME ATTEMPT by %s: %s"
- ,sock,user.alias,p);
+ lprintf(LOG_WARNING,"%04d <%s> !ILLEGAL FILENAME ATTEMPT by %s [%s]: %s"
+ ,sock, user.alias, host_name, host_ip, p);
sockprintf(sock,sess,"553 Illegal filename attempt");
ftp_hacklog("FTP FILENAME", user.alias, cmd, host_name, &ftp.client_addr);
continue;
--
GitLab