Merge pull request #152 from CSCfi/dev

Dev
CSCfi · Sep 18, 2020 · e189de6 · e189de6
2 parents 1fdc0da + c55b31b
commit e189de6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -8,14 +8,14 @@ jobs:
       max-parallel: 4
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.6, 3.7]
+        python-version: [3.6, 3.7.7]
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install libcurl-devel

diff --git a/beacon_api/conf/config.ini b/beacon_api/conf/config.ini
@@ -7,7 +7,7 @@
 title=GA4GHBeacon at CSC
 
 # Version of the Beacon implementation
-version=1.7.0
+version=1.7.1
 
 # Author of this software
 author=CSC developers

diff --git a/beacon_api/utils/validate_jwt.py b/beacon_api/utils/validate_jwt.py
@@ -7,7 +7,7 @@
 from ..api.exceptions import BeaconUnauthorised, BeaconForbidden, BeaconServerError
 from aiohttp import web
 from authlib.jose import jwt
-from authlib.jose.errors import MissingClaimError, InvalidClaimError, ExpiredTokenError, InvalidTokenError
+from authlib.jose.errors import MissingClaimError, InvalidClaimError, ExpiredTokenError, InvalidTokenError, DecodeError
 import re
 import aiohttp
 from os import environ
@@ -131,6 +131,8 @@ async def token_middleware(request: web.Request, handler):
                 raise BeaconForbidden(obj, request.host, f'Token info not corresponding with claim: {e}')  # pragma: no cover
             except InvalidTokenError as e:  # pragma: no cover
                 raise BeaconUnauthorised(obj, request.host, "invalid_token", f'Invalid authorization token: {e}')  # pragma: no cover
+            except DecodeError as e:  # pragma: no cover
+                raise BeaconUnauthorised(obj, request.host, "invalid_token", f'Invalid JWT format: {e}')  # pragma: no cover
         else:
             request["token"] = {"bona_fide_status": False,
                                 "permissions": None,

diff --git a/tox.ini b/tox.ini
@@ -50,5 +50,5 @@ commands = py.test  -x --cov=beacon_api tests/ --cov-fail-under=80
 
 [gh-actions]
 python =
-    3.6: flake8, unit_tests, docs, bandit, mypy
+    3.6: unit_tests
     3.7: flake8, unit_tests, docs, bandit, mypy