Merge pull request #120 from CSCfi/devel

blankdots · web-flow · commit e94dfbeca109 · 2021-01-26T14:28:02.000+02:00
bump to 1.0.0.rc12
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -31,11 +31,6 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
diff --git a/.s2i/environment b/.s2i/environment
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.10-alpine as FRONTEND
+FROM node:14.15-alpine3.12 as FRONTEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -16,7 +16,7 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend \
     && npm install \
     && npm run build
 
-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\
@@ -32,15 +32,15 @@ RUN pip install --upgrade pip && \
     pip install -r /root/swift_ui/requirements.txt && \
     pip install /root/swift_ui
 
-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-browser-ui"
 
-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/
 
diff --git a/Dockerfile-Devel b/Dockerfile-Devel
@@ -1,4 +1,4 @@
-FROM node:12.10-alpine as FRONTEND
+FROM node:14.15-alpine3.12 as FRONTEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -16,7 +16,7 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend \
     && npm install \
     && npm run build-devel
 
-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\
@@ -32,15 +32,15 @@ RUN pip install --upgrade pip && \
     pip install -r /root/swift_ui/requirements.txt && \
     pip install /root/swift_ui
 
-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-browser-ui"
 
-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/
 
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Project documentation is hosted on readthedocs: https://swift-browser-ui.rtfd.io
 
 ### Requirements
 
-Python 3.6+ required
+Python 3.6+ required (recommended 3.7+)
 
 The dependencies mentioned in `requirements.txt` and an account that has access
 rights to [CSC Pouta](https://docs.csc.fi/cloud/pouta/) platform, 
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -28,7 +28,7 @@
 author = 'CSC Developers'
 
 # The full version, including alpha/beta/rc tags
-version = release = '1.0.0rc11'
+version = release = '1.0.0rc12'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/source/instructions.rst b/docs/source/instructions.rst
@@ -8,7 +8,7 @@ The program can be installed with pip from the git repository:
 
 .. code-block:: console
 
-    # Requires python >= 3.6
+    # Requires python >= 3.6 (recommended >= 3.7)
     git clone git@github.com:CSCfi/swift-browser-ui.git
     # Frontend files need to be separately built
     cd swift_browser_ui_frontend && npm run build && cd ..
diff --git a/docs/source/tools.rst b/docs/source/tools.rst
@@ -4,7 +4,7 @@ Tools used in project
 Backend
 -------
 The backend is written in Python, requiring at minimum Python version `3.6.8`,
-but is tested with 3.7 as well. Additionally the following libraries are used
+but is tested with 3.7 and 3.8 as well. Additionally the following libraries are used
 in the program development:
 
 * `aiohttp for the API server <https://aiohttp.readthedocs.io/en/stable/>`_
diff --git a/package-lock.json b/package-lock.json
diff --git a/requirements.txt b/requirements.txt
@@ -7,3 +7,4 @@ sphinx
 sphinx_rtd_theme
 uvloop
 gunicorn>=20.0.1
+certifi
diff --git a/setup.py b/setup.py
@@ -19,7 +19,8 @@
         'keystoneauth1',
         'click',
         'gunicorn',
-        'uvloop'
+        'uvloop',
+        'certifi'
     ],
     extras_require={
         'test': ['tox', 'pytest', 'pytest-cov', 'coverage', 'coveralls',
@@ -53,7 +54,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',
     ],
 )
diff --git a/swift_browser_ui/__init__.py b/swift_browser_ui/__init__.py
@@ -7,6 +7,6 @@
 
 
 __name__ = "swift_browser_ui"
-__version__ = "1.0.0rc11"
+__version__ = "1.0.0rc12"
 __author__ = "CSC Developers"
 __license__ = "MIT License"
diff --git a/swift_browser_ui/_convenience.py b/swift_browser_ui/_convenience.py
@@ -29,6 +29,13 @@
 
 from .settings import setd
 
+import ssl
+import certifi
+
+
+ssl_context = ssl.create_default_context()
+ssl_context.load_verify_locations(certifi.where())
+
 
 def test_swift_endpoint(endpoint: str) -> None:
     """Test swift endpoint connectivity."""
@@ -464,7 +471,8 @@ async def open_upload_runner_session(
                 params={
                     "signature": signature["signature"],
                     "valid": signature["valid_until"]
-                }
+                },
+                ssl=ssl_context
         ) as resp:
             ret = str(resp.cookies["RUNNER_SESSION_ID"].value)
             request.app['Creds'][session_key]['runner'] = ret
diff --git a/swift_browser_ui/api.py b/swift_browser_ui/api.py
@@ -4,6 +4,7 @@
 import typing
 
 import aiohttp.web
+from swiftclient.exceptions import ClientException
 from swiftclient.service import SwiftError
 from swiftclient.service import SwiftService, get_conn  # for type hints
 from swiftclient.utils import generate_temp_url
@@ -34,6 +35,17 @@ async def get_os_user(
     )
 
 
+def _unpack(item: dict,
+            cont: typing.List[dict],
+            request: aiohttp.web.Request) -> typing.Any:
+    """Unpack container list if the request was successful."""
+    if item["success"]:
+        request.app['Log'].info("container list unpacked successfully")
+        return cont.extend(item["listing"])
+    else:
+        request.app['Log'].error(item["error"])
+
+
 async def swift_list_buckets(
         request: aiohttp.web.Request
 ) -> aiohttp.web.Response:
@@ -44,6 +56,7 @@ async def swift_list_buckets(
     not necessary in this case and returns a JSON response containing all the
     necessary data.
     """
+    cont: typing.List[dict] = []
     try:
         session = api_check(request)
         request.app['Log'].info(
@@ -57,20 +70,19 @@ async def swift_list_buckets(
         # The maximum amount of buckets / containers is measured in thousands,
         # so it's not necessary to think twice about iterating over the whole
         # response at once
-        cont: typing.List[dict] = []
-        list(map(lambda i: cont.extend(i["listing"]),  # type: ignore
-                 request.app['Creds'][session]['ST_conn'].list()))
+        sess = request.app['Creds'][session]['ST_conn'].list()
+        [_unpack(i, cont, request) for i in sess]
         # for a bucket with no objects
         if not cont:
             # return empty object
             raise aiohttp.web.HTTPNotFound()
-        return aiohttp.web.json_response(cont)
 
     except SwiftError:
         raise aiohttp.web.HTTPNotFound()
     except KeyError:
         # listing is missing; possible broken swift auth
-        return aiohttp.web.json_response([])
+        return aiohttp.web.json_response(cont)
+    return aiohttp.web.json_response(cont)
 
 
 async def swift_create_container(
@@ -90,7 +102,7 @@ async def swift_create_container(
             get_conn(request.app['Creds'][session]['ST_conn']._options),
             request.match_info["container"]
         )
-    except SwiftError:
+    except (SwiftError, ClientException):
         raise aiohttp.web.HTTPServerError(
             reason="Container creation failure"
         )
@@ -123,10 +135,9 @@ async def swift_list_objects(
         )
 
         obj: typing.List[dict] = []
-        list(map(lambda i: obj.extend(i['listing']),  # type: ignore
-                 request.app['Creds'][session]['ST_conn'].list(
-                     container=request.query['bucket'])))
-
+        sess = request.app['Creds'][session]['ST_conn'].list(
+            container=request.query['bucket'])
+        [_unpack(i, obj, request) for i in sess]
         if not obj:
             raise aiohttp.web.HTTPNotFound()
 
@@ -194,6 +205,9 @@ async def swift_list_shared_objects(
 
     except SwiftError:
         return aiohttp.web.json_response([])
+    except ClientException as e:
+        request.app['Log'].error(e.msg)
+        return aiohttp.web.json_response([])
     except KeyError:
         # listing is missing; possible broken swift auth
         return aiohttp.web.json_response([])
diff --git a/swift_browser_ui/login.py b/swift_browser_ui/login.py
@@ -176,8 +176,8 @@ async def sso_query_end(
     # Save the unscoped token to the session, as it's needed for re-scoping
     request.app['Creds'][session]['Token'] = unscoped
 
-    # Check token availability
     try:
+        # Check token availability
         request.app['Creds'][session]['Avail'] =\
             get_availability_from_token(unscoped)
     except urllib.error.HTTPError:
diff --git a/swift_browser_ui/middlewares.py b/swift_browser_ui/middlewares.py
@@ -59,8 +59,8 @@ async def error_middleware(
         if ex.status == 404:
             return return_error_response(404)
         if ex.status > 404 and ex.status < 500:
+            # we forbid all dubios and unauthorized requests
             return return_error_response(403)
         if ex.status > 500:
-            # we forbid all dubios and unauthorized requests
             return return_error_response(503)
         raise
diff --git a/swift_browser_ui_frontend/package-lock.json b/swift_browser_ui_frontend/package-lock.json
diff --git a/swift_browser_ui_frontend/package.json b/swift_browser_ui_frontend/package.json
diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js
diff --git a/tests/unit/mockups.py b/tests/unit/mockups.py
