Merge pull request #15 from CSCfi/devel

bump version to 0.1.6

Author: blankdots

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.12 as BACKEND
+FROM python:3.8-alpine3.12 as BACKEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -13,15 +13,15 @@ RUN pip install --upgrade pip\
     && pip install -r /root/swift_upload_runner/requirements.txt \
     && pip install /root/swift_upload_runner
 
-FROM python:3.7-alpine3.12
+FROM python:3.8-alpine3.12
 
 RUN apk add --no-cache --update bash
 
 LABEL maintainer "CSC Developers"
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.vcs-url="https://github.com/CSCFI/swift-upload-runner"
 
-COPY --from=BACKEND /usr/local/lib/python3.7 /usr/local/lib/python3.7/
+COPY --from=BACKEND /usr/local/lib/python3.8 /usr/local/lib/python3.8/
 
 COPY --from=BACKEND /usr/local/bin/gunicorn /usr/local/bin/
 

setup.py

@@ -46,7 +46,7 @@
         # Pick your license as you wish
         'License :: OSI Approved :: MIT License',
 
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
 )

swift_upload_runner/__init__.py

@@ -1,6 +1,6 @@
 """Runner for swift-browser-ui upload and replication operations."""
 
 __name__ = "swift_upload_runner"
-__version__ = "0.1.5"
+__version__ = "0.1.6"
 __author__ = "CSC Developers"
 __license__ = "MIT License"

swift_upload_runner/replicate.py

@@ -10,11 +10,15 @@
 import keystoneauth1.session
 
 import swift_upload_runner.common as common
-
+import ssl
+import certifi
 
 LOGGER = logging.getLogger(__name__)
 LOGGER.setLevel(logging.DEBUG)
 
+ssl_context = ssl.create_default_context()
+ssl_context.load_verify_locations(certifi.where())
+
 
 # The replication process needs a generous timeout, due to aiohttp having
 # a default value of 5 minutes. This is too low for the replication
@@ -81,7 +85,8 @@ async def a_create_container(
                 headers={
                     "Content-Length": str(0),
                     "X-Auth-Token": self.auth.get_token()
-                }
+                },
+                ssl=ssl_context
         ) as resp:
             if resp.status not in {201, 202}:
                 raise aiohttp.web.HTTPForbidden(
@@ -103,7 +108,8 @@ async def a_sync_object_segments(
                     "X-Auth-Token": self.auth.get_token(),
                     "Accept-Encoding": "identity"
                 },
-                timeout=REPL_TIMEOUT
+                timeout=REPL_TIMEOUT,
+                ssl=ssl_context
         ) as resp:
             if resp.status == 404:
                 raise aiohttp.web.HTTPNotFound(
@@ -140,7 +146,8 @@ async def a_sync_object_segments(
                         "X-Auth-Token": self.auth.get_token(),
                         "Accept-Encoding": "identity"
                     },
-                    timeout=REPL_TIMEOUT
+                    timeout=REPL_TIMEOUT,
+                    ssl=ssl_context
             ) as resp_g:
                 length = int(resp_g.headers["Content-Length"])
                 headers = {
@@ -166,7 +173,8 @@ async def a_sync_object_segments(
                         to_url,
                         data=self.a_generate_object_from_reader(resp_g),
                         headers=headers,
-                        timeout=REPL_TIMEOUT
+                        timeout=REPL_TIMEOUT,
+                        ssl=ssl_context
                 ) as resp_p:
                     LOGGER.debug(f"Segment {segment} status {resp_p.status}")
                     if resp_p.status == 408:
@@ -197,7 +205,8 @@ async def a_copy_object(
                     "X-Auth-Token": self.auth.get_token(),
                     "Accept-Encoding": "identity"
                 },
-                timeout=REPL_TIMEOUT
+                timeout=REPL_TIMEOUT,
+                ssl=ssl_context
         ) as resp_g:
             # If the source object doesn't exist, abort
             if resp_g.status != 200:
@@ -236,7 +245,8 @@ async def a_copy_object(
                         ),
                         data=self.a_generate_object_from_reader(resp_g),
                         headers=headers,
-                        timeout=REPL_TIMEOUT
+                        timeout=REPL_TIMEOUT,
+                        ssl=ssl_context
                 ) as resp_p:
                     if resp_p.status == 408:
                         raise aiohttp.web.HTTPRequestTimeout()
@@ -267,7 +277,8 @@ async def a_copy_object(
                         ),
                         data=b"",
                         headers=headers,
-                        timeout=REPL_TIMEOUT
+                        timeout=REPL_TIMEOUT,
+                        ssl=ssl_context
                 ) as resp:
                     if resp.status != 201:
                         raise aiohttp.web.HTTPInternalServerError(
@@ -294,7 +305,8 @@ async def a_copy_from_container(self) -> None:
                 headers={
                     "X-Auth-Token": self.auth.get_token()
                 },
-                timeout=REPL_TIMEOUT
+                timeout=REPL_TIMEOUT,
+                ssl=ssl_context
         ) as resp:
             if resp.status != 200:
                 LOGGER.debug(

swift_upload_runner/upload.py

@@ -13,6 +13,13 @@
 
 import swift_upload_runner.common as common
 
+import ssl
+import certifi
+
+
+ssl_context = ssl.create_default_context()
+ssl_context.load_verify_locations(certifi.where())
+
 
 LOGGER = logging.getLogger(__name__)
 LOGGER.setLevel(logging.DEBUG)
@@ -94,6 +101,7 @@ async def a_sync_segments(
             headers={
                 "X-Auth-Token": self.auth.get_token()
             },
+            ssl=ssl_context
         ) as resp:
             if resp.status in {200}:
                 segments = await resp.text()
@@ -121,7 +129,8 @@ async def a_create_container(
                 headers={
                     "Content-Length": str(0),
                     "X-Auth-Token": self.auth.get_token()
-                }
+                },
+                ssl=ssl_context
         ) as resp:
             if resp.status not in {201, 202}:
                 raise aiohttp.web.HTTPForbidden(
@@ -139,7 +148,8 @@ async def a_check_container(
                 ),
                 headers={
                     "X-Auth-Token": self.auth.get_token()
-                }
+                },
+                ssl=ssl_context
         ) as resp:
             if resp.status != 204:
                 if self.project != self.auth.get_project_id():
@@ -155,7 +165,8 @@ async def a_check_container(
                 ),
                 headers={
                     "X-Auth-Token": self.auth.get_token()
-                }
+                },
+                ssl=ssl_context
             ) as resp:
                 if resp.status != 204:
                     if self.project != self.auth.get_project_id():
@@ -176,7 +187,8 @@ async def a_check_segment(
             self.url,
             headers={
                 "X-Auth-Token": self.auth.get_token()
-            }
+            },
+            ssl=ssl_context
         ) as request:
             if request.status == 200:
                 return aiohttp.web.Response(status=200)
@@ -201,7 +213,8 @@ async def a_add_manifest(
             headers={
                 "X-Auth-Token": self.auth.get_token(),
                 "X-Object-Manifest": manifest
-            }
+            },
+            ssl=ssl_context
         ) as resp:
             if resp.status != 201:
                 raise aiohttp.web.HTTPBadRequest()
@@ -232,7 +245,8 @@ async def a_add_chunk(
                     "Content-Length": query["resumableCurrentChunkSize"],
                     "Content-Type": "application/swiftclient-segment",
                 },
-                timeout=UPL_TIMEOUT
+                timeout=UPL_TIMEOUT,
+                ssl=ssl_context
             ) as resp:
                 if resp.status == 408:
                     raise aiohttp.web.HTTPRequestTimeout()
@@ -243,7 +257,7 @@ async def a_add_chunk(
                 LOGGER.debug(f"Success in uploding chunk {chunk_number}")
                 return aiohttp.web.Response(status=201)
         else:
-            LOGGER.debug(f"Concatenatig chunk {chunk_number}")
+            LOGGER.debug(f"Concatenating chunk {chunk_number}")
             await self.q.put((
                 # Using chunk number as priority, to handle chunks in any
                 # order
@@ -272,7 +286,8 @@ async def upload_file(self) -> None:
                     "X-Auth-Token": self.auth.get_token(),
                     "Content-Length": str(self.total_size),
                 },
-                timeout=UPL_TIMEOUT
+                timeout=UPL_TIMEOUT,
+                ssl=ssl_context
         ) as resp:
             if resp.status == 408:
                 raise aiohttp.web.HTTPRequestTimeout()