Skip to content

Commit cfbecdd

Browse files
authored
2903 [Bug] exim ratelimit file per domain doesn't update when deleting mail account (hestiacp#2905)
* Fix bug hestiacp#2903 * Edit non working test * Delete unused code
1 parent 354a18c commit cfbecdd

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

bin/v-delete-mail-account

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
5959
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
6060
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/accounts
6161
sed -i "/^$account$/d" $HOMEDIR/$user/conf/mail/$domain/fwd_only
62+
sed -i "/^$account@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/limits
6263
rm -rf $HOMEDIR/$user/mail/$domain/$account
63-
rm -f $HOMEDIR/$user/conf/mail/$domain/limits/$account
6464
fi
6565

6666
#----------------------------------------------------------#

test/test.bats

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,7 @@ function check_ip_not_banned(){
14711471
@test "MAIL: Add account" {
14721472
run v-add-mail-account $user $domain test "$userpass2"
14731473
assert_success
1474+
assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain"
14741475
refute_output
14751476
}
14761477

@@ -1491,6 +1492,11 @@ function check_ip_not_banned(){
14911492
assert_output --partial "error"
14921493
}
14931494

1495+
@test "MAIL: Change rate limit" {
1496+
run v-change-mail-account-rate-limit $user $domain test 10
1497+
assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain:10"
1498+
}
1499+
14941500
@test "MAIL: Delete account" {
14951501
run v-delete-mail-account $user $domain test
14961502
assert_success

0 commit comments

Comments
 (0)