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

Fix issue with usernames in keys and key data.

This commit is contained in:
Retro_Guy 2023-08-10 10:09:19 -07:00
parent 5e699cae94
commit 82b81ea123
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Rocksolid_Light/rslight/gpg.conf
View File

@ -18,9 +18,6 @@ $rslight_gpg['domain_name'] = "www.example.com";
// What nntp group to use to share mail data
$rslight_gpg['nntp_group'] = "rocksolid.shared.encryption";
// What email address for sending notices
$rslight_gpg['from_email'] = "rslight@example.com";
// A real contact email address
$rslight_gpg['contact'] = "admin@example.com";
@ -30,3 +27,5 @@ $rslight_gpg['contact'] = "admin@example.com";
// Where your .gpg data is kept
$rslight_gpg['gnupghome'] = $config_dir."/.gnupg";
// Don't change this
$rslight_gpg['from_email'] = "rslight@".$rslight_gpg['domain_name'];

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

@ -89,7 +89,10 @@ $gnupg_validity = array(
if($info[0]['summary'] > 3) {
echo $gnupg_summary[$info[0]['summary']]." in: ".$filename."\n";
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." ".$gnupg_summary[$info[0]['summary']]." in: ".$filename, FILE_APPEND);
$inspect['mailkey_domain'] = preg_replace('/rslight@/', '', $inspect['from']);
$inspect['mailkey_domain'] = preg_split('/@/', $inspect['from'], 2);
$inspect['mailkey_domain'] = $inspect['mailkey_domain'][1];
$inspect['mailkey_location'] = $inspect['mailkey_domain'].'/pubkey/server_pubkey.txt';
get_key_from_message($res, $inspect);
if(strpos($filename, '-retry') !== false) {
@ -105,7 +108,9 @@ $gnupg_validity = array(
$inspect = inspect_bbsmail($res, $plaintext);
$keyinfo = gnupg_keyinfo($res, $info[0]['fingerprint']);
$signature_domain = preg_replace('/rslight@/', '', $keyinfo[0]['uids'][0]['uid']);
$bbsmail_domain = preg_replace('/rslight@/', '', $inspect['bbsmail_from']);
$info = preg_split('/\@/', $inspect['bbsmail_from'], 2);
$bbsmail_domain = $info[1];
if(($signature_domain == $bbsmail_domain) && ($signature_domain == $inspect['bbsmail_domain'])) { // Yes, the domains match
echo "THE DOMAINS MATCH. OK TO IMPORT MESSAGE\n";
echo $plaintext;
@ -126,6 +131,7 @@ $gnupg_validity = array(
}
} else { // No, the domains DO NOT MATCH
echo "DOMAIN MISMATCH\n";
file_put_contents($logfile, "\nComparing sig_dom: ".$signature_domain." bbsmail_domain: ".$bbsmail_domain." ins[bbs_dom]: ".$inspect['bbsmail_domain'], FILE_APPEND);
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);
}
@ -334,7 +340,7 @@ function inspect_bbsmail($res, $plaintext) {
}
function inspect_message($message, $filename) {
global $logfile, $config_name;
global $logfile, $config_name, $bbsmail_path;
$header = array();
$body = array();
@ -348,6 +354,7 @@ function inspect_message($message, $filename) {
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Found BBSMAIL message ".$filename, FILE_APPEND);
} else {
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Found UNKNOWN message ".$filename, FILE_APPEND);
rename($bbsmail_path.'/in/'.$message, $bbsmail_path.'failed/'.$message);
return false;
}
}