novabbs
/
rocksolid-light
2
0
Fork 1
Code Issues 14 Pull Requests Releases Wiki Activity

Sort processed Mail posts (failed/processed).

This commit is contained in:
Retro_Guy 2023-08-08 05:15:24 -07:00
parent 000be193b9
commit 224e58d5ab
2 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Rocksolid_Light/rocksolid/newsportal.php
View File

@ -1720,4 +1720,20 @@ function get_data_from_msgid($msgid) {
return false; return false;
} }
} }
?>
function prune_dir_by_days($path, $days) {
if($filenames = array_diff(scandir($path), array('..', '.'))) {
foreach($filenames as $file) {
$filelastmodified = filemtime($path . $file);
if((time() - $filelastmodified) > $days*86400)
{
if(is_file($path . $file)) {
unlink($path . $file);
}
}
}
} else {
return false;
}
return true;
}

53
Rocksolid_Light/rslight/scripts/interBBS_mail.php
View File

@ -20,9 +20,14 @@ $bbsmail_path=$spooldir."/bbsmail/";
if(!is_dir($bbsmail_path.'in')) { if(!is_dir($bbsmail_path.'in')) {
mkdir($bbsmail_path.'in', 0700, true); mkdir($bbsmail_path.'in', 0700, true);
} }
if(!is_dir($bbsmail_path.'out')) { if(!is_dir($bbsmail_path.'failed')) {
mkdir($bbsmail_path.'out', 0700, true); mkdir($bbsmail_path.'failed', 0700, true);
} }
if(!is_dir($bbsmail_path.'processed')) {
mkdir($bbsmail_path.'processed', 0700, true);
}
prune_dir_by_days($bbsmail_path.'failed', 30);
prune_dir_by_days($bbsmail_path.'processed', 30);
// Set up gnupg // Set up gnupg
putenv("GNUPGHOME=".$rslight_gpg['gnupghome']); putenv("GNUPGHOME=".$rslight_gpg['gnupghome']);
@ -51,10 +56,6 @@ $gnupg_validity = array(
"5" => "Validity: ULTIMATE" "5" => "Validity: ULTIMATE"
); );
/***** Send mail *****/
// $messages=scandir($bbsmail_path.'/out/');
/***** Receive mail *****/ /***** Receive mail *****/
unset($messages); unset($messages);
$messages = array_diff(scandir($bbsmail_path.'/in/'), array('..', '.')); $messages = array_diff(scandir($bbsmail_path.'/in/'), array('..', '.'));
@ -72,6 +73,7 @@ $gnupg_validity = array(
// Do we already have this key? // Do we already have this key?
if(gnupg_keyinfo($res, $inspect['mailkey_domain']) !== false) { // Yes, we do if(gnupg_keyinfo($res, $inspect['mailkey_domain']) !== false) { // Yes, we do
file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' Key already in keyring for: '.$inspect['mailkey_domain'], FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' Key already in keyring for: '.$inspect['mailkey_domain'], FILE_APPEND);
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'processed/'.$message);
} else { // No, we don't } else { // No, we don't
file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' Key not found in keyring for: '.$inspect['mailkey_domain'], FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' Key not found in keyring for: '.$inspect['mailkey_domain'], FILE_APPEND);
} }
@ -90,7 +92,11 @@ $gnupg_validity = array(
$inspect['mailkey_domain'] = preg_replace('/rslight@/', '', $inspect['from']); $inspect['mailkey_domain'] = preg_replace('/rslight@/', '', $inspect['from']);
$inspect['mailkey_location'] = $inspect['mailkey_domain'].'/pubkey/server_pubkey.txt'; $inspect['mailkey_location'] = $inspect['mailkey_domain'].'/pubkey/server_pubkey.txt';
get_key_from_message($res, $inspect); get_key_from_message($res, $inspect);
if(strpos($filename, '-retry') !== false) {
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'failed/'.$message);
} else {
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'/in/'.$message.'-retry');
}
} else { } else {
echo 'GOOD signature in: "'.$filename.'"'."\n"; echo 'GOOD signature in: "'.$filename.'"'."\n";
file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' GOOD signature in: "'.$filename.'"', FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' GOOD signature in: "'.$filename.'"', FILE_APPEND);
@ -114,25 +120,34 @@ $gnupg_validity = array(
if(!isset($inspect['bbsmail_sender']) || !isset($inspect['bbsmail_recipient']) || !isset($inspect['bbsmail_sender']) || !isset($inspect['bbsmail_body'])) { if(!isset($inspect['bbsmail_sender']) || !isset($inspect['bbsmail_recipient']) || !isset($inspect['bbsmail_sender']) || !isset($inspect['bbsmail_body'])) {
echo "Incomplete Headers... Aborting Message Import\n"; echo "Incomplete Headers... Aborting Message Import\n";
} else { } else {
import_user_message($mail_from, $rcpt_to, $date, $inspect['bbsmail_subject'], $inspect['bbsmail_body']); if(import_user_message($mail_from, $rcpt_to, $date, $inspect['bbsmail_subject'], $inspect['bbsmail_body'])) {
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'processed/'.$message);
}
} }
} else { // No, the domains DO NOT MATCH } else { // No, the domains DO NOT MATCH
echo "DOMAIN MISMATCH\n"; echo "DOMAIN MISMATCH\n";
file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' DOMAIN MISMATCH in: "'.$filename.'" '.$error, FILE_APPEND);
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'failed/'.$message);
} }
} }
} else { } else {
$error = gnupg_geterror($res); $error = gnupg_geterrorinfo($res);
print_r($error);
echo 'BAD signature in: "'.$filename.'"'."\n"; echo 'BAD signature in: "'.$filename.'"'."\n";
echo $error."\n"; echo $error['generic_message'].': '.$error['gpgme_message']."\n";
file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' BAD signature in: "'.$filename.'" '.$error, FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name.' BAD signature in: "'.$filename.'" '.$error['generic_message'].': '.$error['gpgme_message'], FILE_APPEND);
$inspect['mailkey_domain'] = preg_replace('/rslight@/', '', $inspect['from']); $inspect['mailkey_domain'] = preg_replace('/rslight@/', '', $inspect['from']);
$inspect['mailkey_location'] = $inspect['mailkey_domain'].'/pubkey/server_pubkey.txt'; $inspect['mailkey_location'] = $inspect['mailkey_domain'].'/pubkey/server_pubkey.txt';
get_key_from_message($res, $inspect); get_key_from_message($res, $inspect);
if(strpos($filename, '-retry') !== false) {
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'failed/'.$message);
} else {
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'/in/'.$message.'-retry');
}
} }
} }
} }
/***** Send key to group *****/ /***** Send key to group *****/
// How often to send key to group // How often to send key to group
// in seconds (default 1 month) // in seconds (default 1 month)
@ -446,13 +461,18 @@ function inspect_message($message, $filename) {
} }
function send_keys_to_group($res, $rslight_gpg) { function send_keys_to_group($res, $rslight_gpg) {
global $spooldir, $config_name, $mail_update_time, $CONFIG, $rslight_version; global $spooldir, $config_name, $logfile, $mail_update_time, $CONFIG, $rslight_version;
$cwd = getcwd(); $cwd = getcwd();
$keydir = preg_replace('/spoolnews/','pubkey/',$cwd); $keydir = preg_replace('/spoolnews/','pubkey/',$cwd);
$key_location = "/pubkey/server_pubkey.txt"; $key_location = "/pubkey/server_pubkey.txt";
$signing_key = trim(file_get_contents($keydir.'/server_fingerprint.txt')); $signing_key = trim(file_get_contents($keydir.'/server_fingerprint.txt'));
$fingerprint_clean = preg_replace('/\ /', '', $signing_key); $fingerprint_clean = preg_replace('/\ /', '', $signing_key);
if(gnupg_keyinfo($res, $fingerprint_clean) == false) { // We have no private key, abort.
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Private Key not Found", FILE_APPEND);
return false;
}
gnupg_addsignkey($res,$fingerprint_clean)."\n"; gnupg_addsignkey($res,$fingerprint_clean)."\n";
$start="@@BEGIN MAILKEY HEADERS"; $start="@@BEGIN MAILKEY HEADERS";
@ -478,9 +498,6 @@ function send_keys_to_group($res, $rslight_gpg) {
$outgoing_file = tempnam($outgoing_dir, 'bbsmail-'); $outgoing_file = tempnam($outgoing_dir, 'bbsmail-');
$body=''; $body='';
$body.="******************************************************\n";
$body.="THIS IS A TEST POST! DO NOT USE THIS FOR A REAL SITE!\n";
$body.="******************************************************\n\n";
$body.="You may use this to import the public key for $domain.\n"; $body.="You may use this to import the public key for $domain.\n";
$body.="This message is automatically generated by $from.\n\n"; $body.="This message is automatically generated by $from.\n\n";
@ -517,6 +534,8 @@ function send_keys_to_group($res, $rslight_gpg) {
$signed_body = gnupg_sign($res, $body); $signed_body = gnupg_sign($res, $body);
file_put_contents($outgoing_file, $header.$signed_body); file_put_contents($outgoing_file, $header.$signed_body);
echo "Posted <".$thishash."@".$domain.">\n\n"; echo "Posted <".$thishash."@".$domain.">\n\n";
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Mail Sent: <".$thishash."@".$domain.">", FILE_APPEND);
return true;
} }