Просмотр исходного кода

2903 [Bug] exim ratelimit file per domain doesn't update when deleting mail account (#2905)

* Fix bug #2903

* Edit non working test

* Delete unused code
Jaap Marcus 3 лет назад
Родитель
Сommit
4b4b070e6a
2 измененных файлов с 7 добавлено и 1 удалено
  1. 1 1
      bin/v-delete-mail-account
  2. 6 0
      test/test.bats

+ 1 - 1
bin/v-delete-mail-account

@@ -59,8 +59,8 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/accounts
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/accounts
     sed -i "/^$account$/d" $HOMEDIR/$user/conf/mail/$domain/fwd_only
     sed -i "/^$account$/d" $HOMEDIR/$user/conf/mail/$domain/fwd_only
+    sed -i "/^$account@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/limits
     rm -rf $HOMEDIR/$user/mail/$domain/$account
     rm -rf $HOMEDIR/$user/mail/$domain/$account
-    rm -f $HOMEDIR/$user/conf/mail/$domain/limits/$account
 fi
 fi
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#

+ 6 - 0
test/test.bats

@@ -1471,6 +1471,7 @@ function check_ip_not_banned(){
 @test "MAIL: Add account" {
 @test "MAIL: Add account" {
     run v-add-mail-account $user $domain test "$userpass2"
     run v-add-mail-account $user $domain test "$userpass2"
     assert_success
     assert_success
+    assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain"
     refute_output
     refute_output
 }
 }
 
 
@@ -1491,6 +1492,11 @@ function check_ip_not_banned(){
   assert_output --partial "error"
   assert_output --partial "error"
 }
 }
 
 
+@test "MAIL: Change rate limit" {
+    run v-change-mail-account-rate-limit $user $domain test 10
+    assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain:10"
+}
+
 @test "MAIL: Delete account" {
 @test "MAIL: Delete account" {
     run v-delete-mail-account $user $domain test
     run v-delete-mail-account $user $domain test
     assert_success
     assert_success