Add block/white list option for email senders
This commit is contained in:
7 files changed
+164
-18
No files matched your search
+21
-3
@@ -341,8 +341,16 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
|
||||
);
|
||||
$spam_reject_score = filter_var( $_POST[ 'spam_reject_score' ] ?? null, FILTER_VALIDATE_INT );
|
||||
$valid_spam_settings = in_array( $spam_reject_score, SPAM_REJECT_SCORE_OPTIONS, true );
|
||||
$blocked_senders = is_string( $_POST[ 'blocked_senders' ] ?? null ) ? parse_sender_address_list( $_POST[ 'blocked_senders' ] ) : null;
|
||||
$whitelisted_senders = is_string( $_POST[ 'whitelisted_senders' ] ?? null ) ? parse_sender_address_list( $_POST[ 'whitelisted_senders' ] ) : null;
|
||||
$valid_sender_addresses = $blocked_senders !== null && $whitelisted_senders !== null;
|
||||
$sender_lists_overlap = $valid_sender_addresses && (bool) array_intersect( $blocked_senders, $whitelisted_senders );
|
||||
if ( ! $valid_inactivity_period || ! $valid_spam_settings ) {
|
||||
$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('Please select valid mailbox settings.')).'</div>';
|
||||
} elseif ( ! $valid_sender_addresses ) {
|
||||
$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('Please enter a valid email address on each line.')).'</div>';
|
||||
} elseif ( $sender_lists_overlap ) {
|
||||
$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('An email address cannot be both blocked and whitelisted.')).'</div>';
|
||||
} else {
|
||||
$alias_goto = '';
|
||||
if ( isset( $_POST[ 'alias_keep_copy' ] ) ) {
|
||||
@@ -355,8 +363,8 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
|
||||
$alias_goto = rtrim( $alias_goto, ',' );
|
||||
$stmt = $db->prepare( 'UPDATE alias SET goto = ?, enforce_tls_in = ?, active = ? WHERE address = ?;' );
|
||||
$stmt->execute( [ $alias_goto, ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ), $_POST[ 'user' ] ] );
|
||||
$stmt = $db->prepare( 'UPDATE mailbox SET enforce_tls_in = ?, enforce_tls_out = ?, active = ?, quota = ?, inactivity_period = ?, spam_reject_score = ?, modified = NOW() WHERE username = ?;' );
|
||||
$stmt->execute( [ ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'enforce_tls_out' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ), DEFAULT_QUOTA, $inactivity_period, $spam_reject_score, $_POST[ 'user' ] ] );
|
||||
$stmt = $db->prepare( 'UPDATE mailbox SET enforce_tls_in = ?, enforce_tls_out = ?, active = ?, quota = ?, inactivity_period = ?, spam_reject_score = ?, blocked_senders = ?, whitelisted_senders = ?, modified = NOW() WHERE username = ?;' );
|
||||
$stmt->execute( [ ( isset( $_POST[ 'enforce_tls_in' ] ) ? 1 : 0 ), ( isset( $_POST[ 'enforce_tls_out' ] ) ? 1 : 0 ), ( isset( $_POST[ 'active' ] ) ? 1 : 0 ), DEFAULT_QUOTA, $inactivity_period, $spam_reject_score, implode( "\n", $blocked_senders ), implode( "\n", $whitelisted_senders ), $_POST[ 'user' ] ] );
|
||||
$msg .= '<div class="green" role="status">'.htmlspecialchars(_('Successfully updated mailbox.')).'</div>';
|
||||
}
|
||||
}
|
||||
@@ -1163,7 +1171,7 @@ function send_new_mailbox(): void
|
||||
function send_edit_mailbox(): void
|
||||
{
|
||||
$db = get_db_instance();
|
||||
$stmt = $db->prepare( 'SELECT a.goto, m.active, m.enforce_tls_in, m.enforce_tls_out, m.inactivity_period, m.spam_reject_score FROM alias AS a INNER JOIN mailbox AS m ON (m.username=a.address) WHERE m.username = ?;' );
|
||||
$stmt = $db->prepare( 'SELECT a.goto, m.active, m.enforce_tls_in, m.enforce_tls_out, m.inactivity_period, m.spam_reject_score, m.blocked_senders, m.whitelisted_senders FROM alias AS a INNER JOIN mailbox AS m ON (m.username=a.address) WHERE m.username = ?;' );
|
||||
$stmt->execute( [ $_REQUEST[ 'user' ] ] );
|
||||
if ( $email = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
|
||||
$aliases = explode( ',', $email[ 'goto' ] );
|
||||
@@ -1223,6 +1231,16 @@ function send_edit_mailbox(): void
|
||||
</div>
|
||||
</div>
|
||||
<p><?php echo htmlspecialchars(_('Disabling spam filtering by setting the score to 0 bypasses all spam checks for incoming mail. The higher the score, the more spam you may receive.')); ?></p>
|
||||
<h3><?php echo htmlspecialchars(_('Sender rules')); ?></h3>
|
||||
<p><?php echo htmlspecialchars(_('Enter one exact sender email address per line. Blocking a sender rejects matching incoming mail. Whitelisting a sender bypasses all spam checks, for matching mail.')); ?></p>
|
||||
<div class="row">
|
||||
<div class="col"><label for="blocked_senders"><?php echo htmlspecialchars(_('Blocked senders')); ?></label></div>
|
||||
<div class="col"><textarea name="blocked_senders" id="blocked_senders"><?php echo htmlspecialchars( $email[ 'blocked_senders' ] ?? '' ); ?></textarea></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col"><label for="whitelisted_senders"><?php echo htmlspecialchars(_('Whitelisted senders')); ?></label></div>
|
||||
<div class="col"><textarea name="whitelisted_senders" id="whitelisted_senders"><?php echo htmlspecialchars( $email[ 'whitelisted_senders' ] ?? '' ); ?></textarea></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<button name="action" value="save_edit_mailbox" type="submit"><?php echo htmlspecialchars(_('Save mailbox')); ?></button>
|
||||
|
||||
+28
-1
@@ -142,6 +142,18 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
|
||||
$stmt->execute( [ $spam_reject_score, $_SESSION[ 'email_user' ] ] );
|
||||
$msg .= '<div class="green" role="status">'.htmlspecialchars(_('Successfully updated spam filter settings, changes can take up to 10 minutes to take effect.')).'</div>';
|
||||
}
|
||||
} elseif ( ! empty( $_SESSION[ 'email_user' ] ) && $_POST[ 'action' ] === 'update_sender_rules' ) {
|
||||
$blocked_senders = is_string( $_POST[ 'blocked_senders' ] ?? null ) ? parse_sender_address_list( $_POST[ 'blocked_senders' ] ) : null;
|
||||
$whitelisted_senders = is_string( $_POST[ 'whitelisted_senders' ] ?? null ) ? parse_sender_address_list( $_POST[ 'whitelisted_senders' ] ) : null;
|
||||
if ( $blocked_senders === null || $whitelisted_senders === null ) {
|
||||
$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('Please enter a valid email address on each line.')).'</div>';
|
||||
} elseif ( array_intersect( $blocked_senders, $whitelisted_senders ) ) {
|
||||
$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('An email address cannot be both blocked and whitelisted.')).'</div>';
|
||||
} else {
|
||||
$stmt = $db->prepare( 'UPDATE mailbox SET blocked_senders = ?, whitelisted_senders = ? WHERE username = ? AND active = 1;' );
|
||||
$stmt->execute( [ implode( "\n", $blocked_senders ), implode( "\n", $whitelisted_senders ), $_SESSION[ 'email_user' ] ] );
|
||||
$msg .= '<div class="green" role="status">'.htmlspecialchars(_('Successfully updated sender rules. Changes can take up to 10 minutes to take effect.')).'</div>';
|
||||
}
|
||||
} elseif ( ! empty( $_SESSION[ 'email_user' ] ) && $_POST[ 'action' ] === 'update_password' ) {
|
||||
if ( empty( $_POST[ 'pass_update' ] ) || empty( $_POST[ 'pass_update2' ] ) || $_POST[ 'pass_update' ] !== $_POST[ 'pass_update2' ] ) {
|
||||
$msg .= '<div class="red" role="alert">'.htmlspecialchars(_('Passwords empty or don\'t match')).'</div>';
|
||||
@@ -384,7 +396,7 @@ if ( empty( $_SESSION[ 'email_user' ] ) ) { ?>
|
||||
$aliases = explode( ',', $tmp[ 'goto' ] );
|
||||
}
|
||||
$aliases_to = implode( "\n", array_diff( $aliases, [ $_SESSION[ 'email_user' ] ] ) );
|
||||
$stmt = $db->prepare( 'SELECT enforce_tls_in, enforce_tls_out, inactivity_period, spam_reject_score FROM mailbox WHERE username = ?;' );
|
||||
$stmt = $db->prepare( 'SELECT enforce_tls_in, enforce_tls_out, inactivity_period, spam_reject_score, blocked_senders, whitelisted_senders FROM mailbox WHERE username = ?;' );
|
||||
$stmt->execute( [ $_SESSION[ 'email_user' ] ] );
|
||||
$mailbox_options = $stmt->fetch( PDO::FETCH_ASSOC );
|
||||
?>
|
||||
@@ -462,6 +474,21 @@ if ( empty( $_SESSION[ 'email_user' ] ) ) { ?>
|
||||
<button name="action" value="update_inactivity_period" type="submit"><?php echo htmlspecialchars(_('Update inactivity period')); ?></button>
|
||||
</form>
|
||||
|
||||
<form class="form_limit" action="manage_account.php" method="post">
|
||||
<h3><?php echo htmlspecialchars(_('Sender rules')); ?></h3>
|
||||
<p><?php echo htmlspecialchars(_('Enter one exact sender email address per line. Blocking a sender rejects matching incoming mail. Whitelisting a sender bypasses all spam checks, for matching mail.')); ?></p>
|
||||
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION[ 'csrf_token' ]; ?>">
|
||||
<div class="row">
|
||||
<div class="col"><label for="blocked_senders"><?php echo htmlspecialchars(_('Blocked senders')); ?></label></div>
|
||||
<div class="col"><textarea name="blocked_senders" id="blocked_senders"><?php echo htmlspecialchars( $mailbox_options[ 'blocked_senders' ] ); ?></textarea></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col"><label for="whitelisted_senders"><?php echo htmlspecialchars(_('Whitelisted senders')); ?></label></div>
|
||||
<div class="col"><textarea name="whitelisted_senders" id="whitelisted_senders"><?php echo htmlspecialchars( $mailbox_options[ 'whitelisted_senders' ] ); ?></textarea></div>
|
||||
</div>
|
||||
<button name="action" value="update_sender_rules" type="submit"><?php echo htmlspecialchars(_('Update sender rules')); ?></button>
|
||||
</form>
|
||||
|
||||
<h2><?php echo htmlspecialchars(_('Change password')); ?></h2>
|
||||
<form class="form_limit" action="manage_account.php" method="post">
|
||||
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION[ 'csrf_token' ]; ?>">
|
||||
|
||||
+46
-11
@@ -12,16 +12,45 @@ if ( !in_array( $_SERVER[ 'REQUEST_METHOD' ], [ 'GET', 'HEAD' ], true ) || ! has
|
||||
}
|
||||
|
||||
$db = get_db_instance();
|
||||
$stmt = $db->prepare( 'SELECT username, spam_reject_score FROM mailbox WHERE active = 1 AND spam_reject_score != ?;' );
|
||||
$stmt = $db->prepare( "SELECT username, spam_reject_score, blocked_senders, whitelisted_senders FROM mailbox WHERE active = 1 AND (spam_reject_score != ? OR blocked_senders != '' OR whitelisted_senders != '');" );
|
||||
$stmt->execute( [ DEFAULT_SPAM_REJECT_SCORE ] );
|
||||
$recipients_by_policy = [];
|
||||
$sender_settings = [];
|
||||
$sender_rule_index = 0;
|
||||
while ( $mailbox = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
|
||||
if ( (int) $mailbox[ 'spam_reject_score' ] > 0 ) {
|
||||
$policy = 'enabled_' . (int) $mailbox[ 'spam_reject_score' ];
|
||||
} else {
|
||||
$policy = 'disabled';
|
||||
if ( (int) $mailbox[ 'spam_reject_score' ] !== DEFAULT_SPAM_REJECT_SCORE ) {
|
||||
if ( (int) $mailbox[ 'spam_reject_score' ] > 0 ) {
|
||||
$policy = 'enabled_' . (int) $mailbox[ 'spam_reject_score' ];
|
||||
} else {
|
||||
$policy = 'disabled';
|
||||
}
|
||||
$recipients_by_policy[ $policy ][] = mb_strtolower( $mailbox[ 'username' ] );
|
||||
}
|
||||
|
||||
$blocked_senders = array_filter( array_map( 'trim', preg_split( '/\R/', $mailbox[ 'blocked_senders' ] ) ) );
|
||||
$whitelisted_senders = array_filter( array_map( 'trim', preg_split( '/\R/', $mailbox[ 'whitelisted_senders' ] ) ) );
|
||||
$whitelisted_sender_keys = array_fill_keys( array_map( 'mb_strtolower', $whitelisted_senders ), true );
|
||||
foreach ( $blocked_senders as $sender ) {
|
||||
if ( isset( $whitelisted_sender_keys[ mb_strtolower( $sender ) ] ) ) {
|
||||
continue;
|
||||
}
|
||||
$sender_rule_index++;
|
||||
$sender_settings[ 'blocked_sender_' . $sender_rule_index ] = [
|
||||
'priority' => 'high',
|
||||
'from' => $sender,
|
||||
'rcpt' => mb_strtolower( $mailbox[ 'username' ] ),
|
||||
'apply' => [ 'actions' => [ 'reject' => -999 ] ],
|
||||
];
|
||||
}
|
||||
foreach ( $whitelisted_senders as $sender ) {
|
||||
$sender_rule_index++;
|
||||
$sender_settings[ 'whitelisted_sender_' . $sender_rule_index ] = [
|
||||
'priority' => 'high',
|
||||
'from' => $sender,
|
||||
'rcpt' => mb_strtolower( $mailbox[ 'username' ] ),
|
||||
'want_spam' => true,
|
||||
];
|
||||
}
|
||||
$recipients_by_policy[ $policy ][] = mb_strtolower( $mailbox[ 'username' ] );
|
||||
}
|
||||
|
||||
$settings = [];
|
||||
@@ -41,16 +70,22 @@ foreach ( $recipients_by_policy as $policy => $recipients ) {
|
||||
}
|
||||
$settings[ $policy ] = $setting;
|
||||
}
|
||||
$settings += $sender_settings;
|
||||
|
||||
$output = [ 'settings {' ];
|
||||
foreach ( $settings as $name => $setting ) {
|
||||
$output[] = "\t" . $name . ' {';
|
||||
$output[] = "\t\tpriority = " . $setting[ 'priority' ] . ';';
|
||||
$recipients = array_map(
|
||||
static fn( string $recipient ): string => json_encode( $recipient, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES ),
|
||||
$setting[ 'rcpt' ]
|
||||
);
|
||||
$output[] = "\t\trcpt = [" . implode( ', ', $recipients ) . '];';
|
||||
if ( isset( $setting[ 'from' ] ) ) {
|
||||
$output[] = "\t\tfrom = " . json_encode( $setting[ 'from' ], JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES ) . ';';
|
||||
$output[] = "\t\trcpt = " . json_encode( $setting[ 'rcpt' ], JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES ) . ';';
|
||||
} else {
|
||||
$recipients = array_map(
|
||||
static fn( string $recipient ): string => json_encode( $recipient, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES ),
|
||||
$setting[ 'rcpt' ]
|
||||
);
|
||||
$output[] = "\t\trcpt = [" . implode( ', ', $recipients ) . '];';
|
||||
}
|
||||
if ( isset( $setting[ 'want_spam' ] ) ) {
|
||||
$output[] = "\t\twant_spam = yes;";
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user