girder 5.0.19.dev4__tar.gz → 5.0.19.dev8__tar.gz

{girder-5.0.19.dev4 → girder-5.0.19.dev8}/.circleci/Dockerfile

@@ -37,6 +37,7 @@ ENV NODE_VERSION=22
 RUN mkdir /.nvm && \
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | NVM_DIR=/.nvm bash && \
     . /.nvm/nvm.sh && \
+    npm install -g npm@latest && \
     npm config set fetch-timeout 600000 && \
     npm cache clean --force && \
     ln -s $(dirname `which npm`) /usr/local/node

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

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

{girder-5.0.19.dev4 → girder-5.0.19.dev8}/girder/models/upload.py

@@ -2,6 +2,7 @@ import datetime
 import io
 import logging
 
+import pymongo
 from bson.objectid import ObjectId
 
 from girder import events
@@ -142,11 +143,18 @@ class Upload(Model):
 
         assetstore = Assetstore().load(upload['assetstoreId'])
         adapter = assetstore_utilities.getAssetstoreAdapter(assetstore)
-
+        startReceived = upload['received']
         upload = adapter.uploadChunk(upload, chunk, uploadExtraParameters)
-        if '_id' in upload or upload['received'] != upload['size']:
-            upload = self.save(upload)
-
+        if '_id' in upload:
+            self.validate(upload)
+            update_result = self.collection.find_one_and_update(
+                {'_id': upload['_id'], 'received': int(startReceived)},
+                {'$set': {k: v for k, v in upload.items() if k != '_id'}},
+                return_document=pymongo.ReturnDocument.AFTER)
+            if update_result:
+                upload.update(update_result)
+            else:
+                raise GirderException('An upload with this ID was simultaneously modified')
         # If upload is finished, we finalize it
         if upload['received'] == upload['size']:
             file = self.finalizeUpload(upload, assetstore)

{girder-5.0.19.dev4 → girder-5.0.19.dev8}/girder/utility/filesystem_assetstore_adapter.py

@@ -206,8 +206,10 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         try:
             self.checkUploadSize(upload, size)
         except ValidationException:
+            # Use the actual file size minus what we just wrote to handle
+            # concurrent uploads that may have updated upload['received'].
             with open(upload['tempFile'], 'a+b') as tempFile:
-                tempFile.truncate(upload['received'])
+                tempFile.truncate(os.path.getsize(upload['tempFile']) - size)
             raise
 
         # Persist the internal state of the checksum

{girder-5.0.19.dev4 → 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.dev4 → girder-5.0.19.dev8/girder.egg-info}/PKG-INFO

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

{girder-5.0.19.dev4 → girder-5.0.19.dev8}/girder.egg-info/scm_file_list.json

@@ -1028,6 +1028,7 @@
     "test/test_disable_anonymous_access.py",
     "test/test_events.py",
     "test/test_file.py",
+    "test/test_filesystem_assetstore_rollback.py",
     "test/test_folder.py",
     "test/test_fs_assetstore_import.py",
     "test/test_hash_state.py",

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.dev4/girder.egg-info/scm_version.json

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