Skip: Update dependency aiohttp to v3.10.2 [SECURITY] (merge commit)

Merge branch 'renovate/pypi-aiohttp-vulnerability' into 'main'
* Fix mypy errors

* Skip: Update dependency aiohttp to v3.10.2 [SECURITY]

See merge request https://gitlab.ci.csc.fi/sds-dev/sd-connect/swift-browser-ui/-/merge_requests/351

Approved-by: Hang Le <[email protected]>
Co-authored-by: Joonatan Mäkinen <[email protected]>
Co-authored-by: renovate-bot <group_183_bot_2d78ce980e0cdf1c1f6cfb0fa4c95beb@noreply.gitlab.ci.csc.fi>
Merged by Joonatan Mäkinen <[email protected]>

Author: 3 people

pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
 ]
 dependencies = [
     "aiohttp-session==2.12.0",
-    "aiohttp==3.9.5",
+    "aiohttp==3.10.5",
     "redis==5.0.7",
     "asyncpg==0.29.0",
     "certifi==2024.7.4",

requirements.txt

@@ -1,4 +1,4 @@
-aiohttp==3.9.5
+aiohttp==3.10.5
 aiohttp-session==2.12.0
 redis==5.0.7
 asyncpg==0.29.0

swift_browser_ui/upload/cryptupload.py

@@ -13,6 +13,7 @@
 import aiohttp.web
 import certifi
 import msgpack
+from aiohttp import ClientTimeout
 
 import swift_browser_ui.common.vault_client as vault_client
 import swift_browser_ui.upload.common as common
@@ -264,7 +265,7 @@ async def upload_segment(self, order: int) -> int:
             ),
             data=self.slice_segment(order),
             headers=headers,
-            timeout=UPL_TIMEOUT,
+            timeout=ClientTimeout(total=UPL_TIMEOUT),
             ssl=ssl_context,
         ) as resp:
             LOGGER.info(f"Segment {order} finished with status {resp.status}.")

swift_browser_ui/upload/replicate.py

@@ -9,6 +9,7 @@
 import aiohttp.client
 import aiohttp.web
 import certifi
+from aiohttp import ClientTimeout
 
 import swift_browser_ui.common.vault_client
 from swift_browser_ui.upload import common
@@ -103,7 +104,7 @@ async def a_sync_object_segments(self, manifest: str) -> str:
                 "X-Auth-Token": self.token,
                 "Accept-Encoding": "identity",
             },
-            timeout=REPL_TIMEOUT,
+            timeout=ClientTimeout(total=REPL_TIMEOUT),
             ssl=ssl_context,
         ) as resp:
             if resp.status == 404:
@@ -136,7 +137,7 @@ def filter_with_prefix(segment: str) -> bool:
                     "X-Auth-Token": self.token,
                     "Accept-Encoding": "identity",
                 },
-                timeout=REPL_TIMEOUT,
+                timeout=ClientTimeout(total=REPL_TIMEOUT),
                 ssl=ssl_context,
             ) as resp_g:
                 length = int(resp_g.headers["Content-Length"])
@@ -163,7 +164,7 @@ def filter_with_prefix(segment: str) -> bool:
                     to_url,
                     data=resp_g.content.iter_chunked(65564),
                     headers=headers,
-                    timeout=REPL_TIMEOUT,
+                    timeout=ClientTimeout(total=REPL_TIMEOUT),
                     ssl=ssl_context,
                 ) as resp_p:
                     LOGGER.debug(f"Segment {segment} status {resp_p.status}")
@@ -189,7 +190,7 @@ async def a_copy_object(self, object_name: str) -> None:
                 "X-Auth-Token": self.token,
                 "Accept-Encoding": "identity",
             },
-            timeout=REPL_TIMEOUT,
+            timeout=ClientTimeout(total=REPL_TIMEOUT),
             ssl=ssl_context,
         ) as resp_g:
             # If the source object doesn't exist, abort
@@ -223,7 +224,7 @@ async def a_copy_object(self, object_name: str) -> None:
                     common.generate_download_url(self.host, self.container, object_name),
                     data=resp_g.content.iter_chunked(65564),
                     headers=headers,
-                    timeout=REPL_TIMEOUT,
+                    timeout=ClientTimeout(total=REPL_TIMEOUT),
                     ssl=ssl_context,
                 ) as resp_p:
                     if resp_p.status == 408:
@@ -252,7 +253,7 @@ async def a_copy_object(self, object_name: str) -> None:
                     ),
                     data=b"",
                     headers=headers,
-                    timeout=REPL_TIMEOUT,
+                    timeout=ClientTimeout(total=REPL_TIMEOUT),
                     ssl=ssl_context,
                 ) as resp:
                     if resp.status != 201:
@@ -307,7 +308,7 @@ async def a_get_container_page(self, marker: str = "") -> list[str]:
             ),
             headers={"X-Auth-Token": self.token},
             params={"marker": marker} if marker else None,
-            timeout=REPL_TIMEOUT,
+            timeout=ClientTimeout(total=REPL_TIMEOUT),
             ssl=ssl_context,
         ) as resp:
             if resp.status >= 400: