girder 5.0.19.dev6__tar.gz → 5.0.19.dev8__tar.gz

{girder-5.0.19.dev6/girder.egg-info → girder-5.0.19.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.19.dev6
+Version: 5.0.19.dev8
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.19.dev6 → girder-5.0.19.dev8}/girder/utility/mail_utils.py

@@ -2,6 +2,7 @@ import logging
 import os
 import re
 import smtplib
+import urllib.parse
 from email.mime.text import MIMEText
 
 from mako.lookup import TemplateLookup
@@ -12,6 +13,12 @@ from girder.settings import SettingKey
 
 logger = logging.getLogger(__name__)
 
+# Socket timeout (seconds) for SMTP connections. Without an explicit value smtplib
+# inherits the global socket default, which is normally ``None``, potentially blocking
+# server thread forever if connection is silently dropped in transit.
+# Explicit timeout results in error that we can handle instead
+_SMTP_TIMEOUT = 30
+
 
 def validateEmailAddress(address):
     """
@@ -120,20 +127,40 @@ def _createMessage(subject, text, to, bcc):
     return msg, recipients
 
 
+def _localHostname():
+    """
+    Return the name to announce in the SMTP EHLO, or None to let smtplib choose.
+
+    Derived from the ``core.email_host`` setting, which already names this instance as
+    the outside world sees it. Without one, smtplib falls back to ``socket.getfqdn()``,
+    which inside a container typically cannot resolve a real name and yields a bracketed
+    address literal leaking the container's private address in every message.
+    """
+    from girder.models.setting import Setting
+
+    host = Setting().get(SettingKey.EMAIL_HOST)
+    if not host:
+        return None
+    return urllib.parse.urlparse(host).hostname or None
+
+
 class _SMTPConnection:
-    def __init__(self, host, port=None, encryption=None,
-                 username=None, password=None):
+    def __init__(self, host, port=None, encryption=None, username=None, password=None,
+                 timeout=_SMTP_TIMEOUT, localHostname=None):
         self.host = host
         self.port = port
         self.encryption = encryption
         self.username = username
         self.password = password
+        self.timeout = timeout
+        self.localHostname = localHostname
 
     def __enter__(self):
+        kwargs = {'local_hostname': self.localHostname, 'timeout': self.timeout}
         if self.encryption == 'ssl':
-            self.connection = smtplib.SMTP_SSL(self.host, self.port)
+            self.connection = smtplib.SMTP_SSL(self.host, self.port, **kwargs)
         else:
-            self.connection = smtplib.SMTP(self.host, self.port)
+            self.connection = smtplib.SMTP(self.host, self.port, **kwargs)
             if self.encryption == 'starttls':
                 self.connection.starttls()
         if self.username and self.password:
@@ -161,7 +188,8 @@ def _submitEmail(msg, recipients):
         port=setting.get(SettingKey.SMTP_PORT),
         encryption=setting.get(SettingKey.SMTP_ENCRYPTION),
         username=setting.get(SettingKey.SMTP_USERNAME),
-        password=setting.get(SettingKey.SMTP_PASSWORD)
+        password=setting.get(SettingKey.SMTP_PASSWORD),
+        localHostname=_localHostname()
     )
 
     logger.info('Sending email to %s through %s', ', '.join(recipients), smtp.host)

{girder-5.0.19.dev6 → girder-5.0.19.dev8/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.19.dev6
+Version: 5.0.19.dev8
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

girder-5.0.19.dev8/girder.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.0.18",
+  "distance": 8,
+  "node": "g72148a4ea84b2f58af5349cde4cec47ce1a3cb67",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-09-28"
+}

girder-5.0.19.dev6/girder.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.0.18",
-  "distance": 6,
-  "node": "gf25da797f86a5bc102f6613a32344c1f20130521",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-09-16"
-}