novabbs
/
rocksolid-light
3
0
Fork 1
Code Issues 22 Pull Requests Releases Wiki Activity

Log socket ip addresses from nntp connections in auth.log.

This commit is contained in:
Retro_Guy 2024-07-21 08:11:32 -07:00
parent 20cbe6e17d
commit 2e0f7431a6
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Rocksolid_Light/rocksolid/newsportal.php
View File

@ -1302,7 +1302,7 @@ function verify_logged_in($name) {
file_put_contents($auth_log, "\n" . logging_prefix() . " SESSION PASS OK for: " . $name, FILE_APPEND); file_put_contents($auth_log, "\n" . logging_prefix() . " SESSION PASS OK for: " . $name, FILE_APPEND);
} else { } else {
$logged_in = false; $logged_in = false;
file_put_contents($auth_log, "\n" . logging_prefix() . " SESSION PASS expired or not set: " . $name, FILE_APPEND); file_put_contents($auth_log, "\n" . logging_prefix() . " SESSION PASS expired or not set for: " . $name, FILE_APPEND);
} }
if ($CONFIG['anonuser'] == '1') { if ($CONFIG['anonuser'] == '1') {
$logged_in = false; $logged_in = false;
@ -1342,7 +1342,7 @@ function set_user_logged_in_cookies($name, $keys) {
<?php <?php
} }
function check_bbs_auth($username, $password) function check_bbs_auth($username, $password, $sockip = null)
{ {
global $config_dir, $spooldir, $CONFIG, $auth_log; global $config_dir, $spooldir, $CONFIG, $auth_log;
@ -1361,7 +1361,7 @@ function check_bbs_auth($username, $password)
if ($banned[0] == '#') if ($banned[0] == '#')
continue; continue;
if (strtolower(trim($username)) == strtolower(trim($banned))) { if (strtolower(trim($username)) == strtolower(trim($banned))) {
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH Failed for: " . $username . ' (user is banned)', FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH Failed for: " . $username . ' (user is banned)', FILE_APPEND);
return false; return false;
} }
} }
@ -1385,7 +1385,7 @@ function check_bbs_auth($username, $password)
} }
if (trim($username) == strtolower($CONFIG['anonusername']) && $CONFIG['anonuser'] != true) { if (trim($username) == strtolower($CONFIG['anonusername']) && $CONFIG['anonuser'] != true) {
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH Failed for: " . $username . ' (' . $CONFIG["anonusername"] . ' is disabled)', FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH Failed for: " . $username . ' (' . $CONFIG["anonusername"] . ' is disabled)', FILE_APPEND);
return FALSE; return FALSE;
} }
@ -1397,9 +1397,9 @@ function check_bbs_auth($username, $password)
$ok = TRUE; $ok = TRUE;
} else { } else {
if(trim($password) == '') { if(trim($password) == '') {
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH Failed for: " . $username . ' (no password)', FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH Failed for: " . $username . ' (no password)', FILE_APPEND);
} else { } else {
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH Failed for: " . $username . ' (password incorrect)', FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH Failed for: " . $username . ' (password incorrect)', FILE_APPEND);
} }
return FALSE; return FALSE;
} }
@ -1408,7 +1408,7 @@ function check_bbs_auth($username, $password)
} }
if ($ok) { if ($ok) {
if ($username != 'localuser') { if ($username != 'localuser') {
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH OK for: " . $username, FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH OK for: " . $username, FILE_APPEND);
} }
return TRUE; return TRUE;
} else { } else {
@ -1424,10 +1424,10 @@ function check_bbs_auth($username, $password)
fclose($userFileHandle); fclose($userFileHandle);
chmod($userFilename, 0666); chmod($userFilename, 0666);
} }
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH OK for: " . $username . ' (auto created user)', FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH OK for: " . $username . ' (auto created user)', FILE_APPEND);
return TRUE; return TRUE;
} else { } else {
file_put_contents($logfile, "\n" . logging_prefix() . " AUTH Failed for: " . $username, FILE_APPEND); file_put_contents($logfile, "\n" . logging_prefix($sockip) . " AUTH Failed for: " . $username, FILE_APPEND);
return FALSE; return FALSE;
} }
} }
@ -1581,12 +1581,22 @@ function check_spam($subject, $from, $newsgroups, $ref, $body, $msgid, $useheade
); );
} }
function logging_prefix() { function logging_prefix($sockip = null) {
global $client_ip_address; global $client_ip_address;
if(trim($client_ip_address == '')) { if($sockip) {
if(preg_match("/\[/", $sockip)) {
$ipv6_addr = explode("]", $sockip);
$client_ip = substr($ipv6_addr[0], 1);
} else {
$client_ip = $sockip;
}
} else {
$client_ip = $client_ip_address;
}
if(trim($client_ip == '')) {
return format_log_date(); return format_log_date();
} else { } else {
return format_log_date() . " [" . $client_ip_address . "]"; return format_log_date() . " [" . $client_ip . "]";
} }
} }

2
Rocksolid_Light/rslight/scripts/rslight-lib.php
View File

@ -155,7 +155,7 @@ function interact($msgsock, $use_crypto = false)
$msg = "482 Authentication commands issued out of sequence\r\n"; $msg = "482 Authentication commands issued out of sequence\r\n";
} else { } else {
$pass = $command[2]; $pass = $command[2];
if (check_bbs_auth($user, $pass)) { if (check_bbs_auth($user, $pass, stream_socket_get_name($msgsock, true))) {
$auth_ok = 1; $auth_ok = 1;
$msg = "281 Authentication succeeded\r\n"; $msg = "281 Authentication succeeded\r\n";
} else { } else {