Merge branch 'master' into live

aurweb/config.py

@@ -6,7 +6,7 @@ from typing import Any
 # Publicly visible version of aurweb. This is used to display
 # aurweb versioning in the footer and must be maintained.
 # Todo: Make this dynamic/automated.
-AURWEB_VERSION = "v6.0.22"
+AURWEB_VERSION = "v6.0.23"
 
 _parser = None
 

aurweb/scripts/notify.py

@@ -104,7 +104,10 @@ class Notification:
                     False: smtplib.SMTP,
                     True: smtplib.SMTP_SSL,
                 }
-                server = classes[use_ssl](server_addr, server_port)
+                smtp_timeout = aurweb.config.getint("notifications",
+                                                    "smtp-timeout")
+                server = classes[use_ssl](server_addr, server_port,
+                                          timeout=smtp_timeout)
 
                 if use_starttls:
                     server.ehlo()
@@ -399,10 +402,7 @@ class ComaintainershipEventNotification(Notification):
         self._pkgbase = db.query(PackageBase.Name).filter(
             PackageBase.ID == pkgbase_id).first().Name
 
-        user = db.query(User).filter(
+        user = db.query(User).filter(User.ID == uid).with_entities(
-            and_(User.ID == uid,
-                 User.Suspended == 0)
-        ).with_entities(
             User.Email,
             User.LangPreference
         ).first()

aurweb/testing/email.py

@@ -37,6 +37,15 @@ class Email:
         if autoparse:
             self._parse()
 
+    @staticmethod
+    def reset() -> None:
+        # Cleanup all email files for this test suite.
+        prefix = Email.email_prefix(suite=True)
+        files = os.listdir(Email.TEST_DIR)
+        for file in files:
+            if file.startswith(prefix):
+                os.remove(os.path.join(Email.TEST_DIR, file))
+
     @staticmethod
     def email_prefix(suite: bool = False) -> str:
         """

aurweb/testing/smtp.py

@@ -36,6 +36,9 @@ class FakeSMTP:
     def quit(self) -> None:
         self.quit_count += 1
 
+    def __call__(self, *args, **kwargs) -> "FakeSMTP":
+        return self
+
 
 class FakeSMTP_SSL(FakeSMTP):
     """ A fake version of smtplib.SMTP_SSL used for testing. """

conf/config.defaults

@@ -65,6 +65,7 @@ smtp-use-ssl = 0
 smtp-use-starttls = 0
 smtp-user =
 smtp-password =
+smtp-timeout = 60
 sender = notify@aur.archlinux.org
 reply-to = noreply@aur.archlinux.org
 

pyproject.toml

@@ -8,7 +8,7 @@
 #
 [tool.poetry]
 name = "aurweb"
-version = "v6.0.22"
+version = "v6.0.23"
 license = "GPL-2.0-only"
 description = "Source code for the Arch User Repository's website"
 homepage = "https://aur.archlinux.org"

test/test_notify.py

@@ -299,6 +299,21 @@ You were removed from the co-maintainer list of {pkgbase.Name} [1].
     assert email.body == expected
 
 
+def test_suspended_ownership_change(user: User, pkgbases: List[PackageBase]):
+    with db.begin():
+        user.Suspended = 1
+
+    pkgbase = pkgbases[0]
+    notif = notify.ComaintainerAddNotification(user.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+    Email.reset()  # Clear the Email pool
+    notif = notify.ComaintainerRemoveNotification(user.ID, pkgbase.ID)
+    notif.send()
+    assert Email.count() == 1
+
+
 def test_delete(user: User, user2: User, pkgbases: List[PackageBase]):
     pkgbase = pkgbases[0]
     notif = notify.DeleteNotification(user2.ID, pkgbase.ID)
@@ -532,18 +547,18 @@ def test_smtp(user: User):
     with db.begin():
         user.ResetKey = "12345678901234567890123456789012"
 
-    SMTP = FakeSMTP()
+    smtp = FakeSMTP()
 
     get = "aurweb.config.get"
     getboolean = "aurweb.config.getboolean"
     with mock.patch(get, side_effect=mock_smtp_config(str)):
         with mock.patch(getboolean, side_effect=mock_smtp_config(bool)):
-            with mock.patch("smtplib.SMTP", side_effect=lambda a, b: SMTP):
+            with mock.patch("smtplib.SMTP", side_effect=smtp):
                 config.rehash()
                 notif = notify.WelcomeNotification(user.ID)
                 notif.send()
     config.rehash()
-    assert len(SMTP.emails) == 1
+    assert len(smtp.emails) == 1
 
 
 def mock_smtp_starttls_config(cls):
@@ -571,25 +586,25 @@ def test_smtp_starttls(user: User):
         user.ResetKey = "12345678901234567890123456789012"
         user.BackupEmail = "backup@example.org"
 
-    SMTP = FakeSMTP()
+    smtp = FakeSMTP()
 
     get = "aurweb.config.get"
     getboolean = "aurweb.config.getboolean"
     with mock.patch(get, side_effect=mock_smtp_starttls_config(str)):
         with mock.patch(
                 getboolean, side_effect=mock_smtp_starttls_config(bool)):
-            with mock.patch("smtplib.SMTP", side_effect=lambda a, b: SMTP):
+            with mock.patch("smtplib.SMTP", side_effect=smtp):
                 notif = notify.WelcomeNotification(user.ID)
                 notif.send()
-    assert SMTP.starttls_enabled
+    assert smtp.starttls_enabled
-    assert SMTP.user
+    assert smtp.user
-    assert SMTP.passwd
+    assert smtp.passwd
 
-    assert len(SMTP.emails) == 2
+    assert len(smtp.emails) == 2
-    to = SMTP.emails[0][1]
+    to = smtp.emails[0][1]
     assert to == [user.Email]
 
-    to = SMTP.emails[1][1]
+    to = smtp.emails[1][1]
     assert to == [user.BackupEmail]
 
 
@@ -614,19 +629,19 @@ def test_smtp_ssl(user: User):
     with db.begin():
         user.ResetKey = "12345678901234567890123456789012"
 
-    SMTP = FakeSMTP_SSL()
+    smtp = FakeSMTP_SSL()
 
     get = "aurweb.config.get"
     getboolean = "aurweb.config.getboolean"
     with mock.patch(get, side_effect=mock_smtp_ssl_config(str)):
         with mock.patch(getboolean, side_effect=mock_smtp_ssl_config(bool)):
-            with mock.patch("smtplib.SMTP_SSL", side_effect=lambda a, b: SMTP):
+            with mock.patch("smtplib.SMTP_SSL", side_effect=smtp):
                 notif = notify.WelcomeNotification(user.ID)
                 notif.send()
-    assert len(SMTP.emails) == 1
+    assert len(smtp.emails) == 1
-    assert SMTP.use_ssl
+    assert smtp.use_ssl
-    assert SMTP.user
+    assert smtp.user
-    assert SMTP.passwd
+    assert smtp.passwd
 
 
 def test_notification_defaults():
@@ -640,6 +655,7 @@ def test_notification_oserror(user: User, caplog: pytest.LogCaptureFixture):
     """ Try sending a notification with a bad SMTP configuration. """
     caplog.set_level(ERROR)
     config_get = config.get
+    config_getint = config.getint
 
     mocked_options = {
         "sendmail": str(),
@@ -647,8 +663,9 @@ def test_notification_oserror(user: User, caplog: pytest.LogCaptureFixture):
         "smtp-port": "587",
         "smtp-user": "notify@server.xyz",
         "smtp-password": "notify_server_xyz",
+        "smtp-timeout": 1,
         "sender": "notify@server.xyz",
-        "reply-to": "no-reply@server.xyz"
+        "reply-to": "no-reply@server.xyz",
     }
 
     def mock_config_get(section: str, key: str) -> str:
@@ -657,9 +674,16 @@ def test_notification_oserror(user: User, caplog: pytest.LogCaptureFixture):
                 return mocked_options.get(key)
         return config_get(section, key)
 
+    def mock_config_getint(section: str, key: str) -> str:
+        if section == "notifications":
+            if key in mocked_options:
+                return mocked_options.get(key)
+        return config_getint(section, key)
+
     notif = notify.WelcomeNotification(user.ID)
-    with mock.patch("aurweb.config.get", side_effect=mock_config_get):
+    with mock.patch("aurweb.config.getint", side_effect=mock_config_getint):
-        notif.send()
+        with mock.patch("aurweb.config.get", side_effect=mock_config_get):
+            notif.send()
 
     expected = "Unable to emit notification due to an OSError"
     assert expected in caplog.text