Merge branch 'pu/ccheng/test_sieve_update_fix' into '2024.11'

fix(Felamimail/Controller): check account status before create adblist sieve script See merge request tine20/tine20!5615
tine-groupware · Jul 11, 2024 · 45af2b0 · 45af2b0
2 parents eb1d144 + 6221fcd
commit 45af2b0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/tests/tine20/Felamimail/Controller/SieveTest.php b/tests/tine20/Felamimail/Controller/SieveTest.php
@@ -139,6 +139,8 @@ public function testAdbMailinglistSieveRuleForwardOnlyMembers()
 
     public function testAdbMailinglistSieveRuleForwardOnlyEnabledMembers()
     {
+        Addressbook_Config::getInstance()->set(Addressbook_Config::CONTACT_HIDDEN_CRITERIA, 'never');
+
         $this->_setFeatureForTest(Addressbook_Config::getInstance(), Addressbook_Config::FEATURE_MAILINGLIST);
         $this->_testNeedsTransaction();
 
@@ -148,6 +150,7 @@ public function testAdbMailinglistSieveRuleForwardOnlyEnabledMembers()
 
         $sclever = Tinebase_User::getInstance()->getFullUserByLoginName('sclever');
         $raii = new Tinebase_RAII(function() use($sclever) {
+            Addressbook_Config::getInstance()->set(Addressbook_Config::CONTACT_HIDDEN_CRITERIA, 'disabled');
             $sclever->accountStatus = Tinebase_Model_FullUser::ACCOUNT_STATUS_ENABLED;
             Tinebase_User::getInstance()->updateUserInSqlBackend($sclever);
         });
@@ -161,7 +164,7 @@ public function testAdbMailinglistSieveRuleForwardOnlyEnabledMembers()
         $sieve = $script->getSieve();
         self::assertStringContainsString('if address :is :all "from" ["' . $this->_originalTestUser->accountEmailAddress . '"]', $sieve);
         self::assertStringContainsString('reject "Your email has been rejected"', $sieve);
-
+        
         unset($raii);
     }
 

diff --git a/tine20/Felamimail/Controller.php b/tine20/Felamimail/Controller.php
@@ -115,16 +115,14 @@ protected function _handleEvent(Tinebase_Event_Abstract $_eventObject)
                 if ($_eventObject->account->accountStatus !== $_eventObject->oldAccount->accountStatus) {
                     $lists = Addressbook_Controller_List::getInstance()->search(
                         Tinebase_Model_Filter_FilterGroup::getFilterForModel(Addressbook_Model_List::class, [
-                            ['field' => 'showHidden', 'operator' => 'equals', 'value' => TRUE],
                             ['field' => 'showHidden', 'operator' => 'equals', 'value' => TRUE],
                             ['field' => 'xprops', 'operator' => 'contains', 'value' => Addressbook_Model_List::XPROP_USE_AS_MAILINGLIST],
                         ]));
 
                     foreach ($lists as $list) {
                         $members = $list['members'];
-
+                        $listToUpdate[] = [$list['email'] => $list->toArray()];
                         if (in_array($_eventObject->account->contact_id, $members)) {
-                            $listToUpdate[] = [$list['email'] => $list['id']];
                             $transactionId = Tinebase_TransactionManager::getInstance()->startTransaction(Tinebase_Core::getDb());
                             try {
                                 Tinebase_TransactionManager::getInstance()->registerAfterCommitCallback(function($list) {
@@ -140,6 +138,10 @@ protected function _handleEvent(Tinebase_Event_Abstract $_eventObject)
 
                                 Tinebase_TransactionManager::getInstance()->commitTransaction($transactionId);
                                 $transactionId = null;
+                            } catch (Exception $e) {
+                                Tinebase_Core::getLogger()->err(__METHOD__ . '::' . __LINE__
+                                    . ' Could not pdate sieve script for adb lists: ' . $e);
+                                throw new Tinebase_Exception_Backend($e->getMessage());
                             } finally {
                                 if (null !== $transactionId) {
                                     Tinebase_TransactionManager::getInstance()->rollBack();

diff --git a/tine20/Felamimail/Sieve/AdbList.php b/tine20/Felamimail/Sieve/AdbList.php
@@ -152,8 +152,16 @@ static public function createFromList(Addressbook_Model_List $_list)
         foreach ($receivers as $receiver) {
             /** @var Addressbook_Model_Contact $receiver */
             $email = $receiver->getPreferredEmailAddress();
+
             if ($email) {
-                $sieveRule->_receiverList[] = $email;
+                if ($receiver->type === Addressbook_Model_Contact::CONTACTTYPE_USER) {
+                    $accountStatus = Tinebase_User::getInstance()->getFullUserById($receiver->account_id)->accountStatus;
+                    if ($accountStatus === Tinebase_Model_User::ACCOUNT_STATUS_ENABLED) {
+                        $sieveRule->_receiverList[] = $email;
+                    }
+                } else {
+                    $sieveRule->_receiverList[] = $email;
+                }
             }
         }