From abc10e93d714bd44a8693be357b76ae1fda06537 Mon Sep 17 00:00:00 2001 From: Ernst Widerberg Date: Fri, 14 Jan 2022 12:11:50 +0100 Subject: Decrease database reconnection timer --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.py b/src/main.py index c3e5ad9..1340ba6 100755 --- a/src/main.py +++ b/src/main.py @@ -40,7 +40,7 @@ for i in range(10): f'Database not responding, will try again soon. Attempt {i + 1} of 10.') else: break - time.sleep(10) + time.sleep(1) else: print('Database did not respond after 10 attempts, quitting.') sys.exit(-1) -- cgit v1.1 From 5048ec216ffc8bc797186886cb52141f96207931 Mon Sep 17 00:00:00 2001 From: Ernst Widerberg Date: Fri, 14 Jan 2022 12:56:35 +0100 Subject: quickstart_test: Remove unused env var JWT_TOKEN --- src/quickstart_test.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/quickstart_test.sh b/src/quickstart_test.sh index e81024f..604e684 100755 --- a/src/quickstart_test.sh +++ b/src/quickstart_test.sh @@ -5,7 +5,6 @@ export COUCHDB_PASSWORD=test export DOCKER_JWT_PUBKEY_PATH="`pwd`/test/unittest_cert/" export JWT_PUBKEY_PATH="`pwd`/test/unittest_cert/public.pem" -export JWT_TOKEN="eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJ0eXBlIjoiYWNjZXNzIiwiZG9tYWlucyI6WyJzdW5ldC5zZSJdfQ._emWyVw-6qer5u65SitS8bZJas7l8bw4almnI1TB7DBnzNsch8ctU4btlgBpfJ2jbrvXZTIl8jXIcykO4crUrQ" virtualenv=no couchdb=no -- cgit v1.1 From 09355bbb7041023efb445d57277634e5061b9cec Mon Sep 17 00:00:00 2001 From: Ernst Widerberg Date: Fri, 14 Jan 2022 16:37:07 +0100 Subject: Update test JWT + cert --- src/quickstart_test.sh | 4 ++-- src/test/test_api.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/quickstart_test.sh b/src/quickstart_test.sh index 604e684..3d4945e 100755 --- a/src/quickstart_test.sh +++ b/src/quickstart_test.sh @@ -48,8 +48,8 @@ mkdir test/unittest_cert cat < test/unittest_cert/public.pem -----BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPW8bkkVIq4BX8eWwlUOUYbJhiGDv -K/6xY5T0BsvV6pbMoIUfgeThVOq5I3CmXxLt+qyPska6ol9fTN7woZLsCg== +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGHX8ipqVWtr49TXyX0f/L4GPhEpg +N0Erzy7hHkXVrkgKpnHSRLYWgbW4rscLoJAJeEv7Be5iH0TM8l09w8Q3wQ== -----END PUBLIC KEY----- EOF diff --git a/src/test/test_api.py b/src/test/test_api.py index cabe101..9d76e5e 100644 --- a/src/test/test_api.py +++ b/src/test/test_api.py @@ -9,9 +9,7 @@ from fastapi import FastAPI from fastapi import testclient client = testclient.TestClient(app) -JWT_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJ0eXBlIjoiYWNjZXNzIiwi' + \ - 'ZG9tYWlucyI6WyJzdW5ldC5zZSJdfQ._emWyVw-6qer5u65SitS8bZJas7l8bw4almnI1' + \ - 'TB7DBnzNsch8ctU4btlgBpfJ2jbrvXZTIl8jXIcykO4crUrQ' +JWT_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJmcmVzaCI6ZmFsc2UsImlhdCI6MTY0MjE2ODkyMCwianRpIjoiNjM0NGFiNjEtMTIzZC00YWMyLTk3YjMtYmVlYTE2M2JiMWMwIiwidHlwZSI6ImFjY2VzcyIsInN1YiI6InVzZXIxIiwibmJmIjoxNjQyMTY4OTIwLCJyZWFkIjpbInN1bmV0LnNlIl0sIndyaXRlIjpbInN1bmV0LnNlIl19._bX9EHI9h0Vjw75UvYvypqaH3AmsgaATFSUSOT-cYLZHrfMlxios3emr7cyKw-OV_BN5h_XNyrMBV1gIoqAk3A' JWT_HEADER = {'Authorization': f'Bearer {JWT_TOKEN}'} -- cgit v1.1 From f5001fc965eae9748e089f36a6017674ca3be839 Mon Sep 17 00:00:00 2001 From: Ernst Widerberg Date: Fri, 14 Jan 2022 16:37:20 +0100 Subject: Bugfix --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.py b/src/main.py index 1340ba6..fb359df 100755 --- a/src/main.py +++ b/src/main.py @@ -152,7 +152,7 @@ async def get_key(key=None, Authorize: AuthJWT = Depends()): data = get_data(key) - if data["domain"] not in allowed_domains: + if data and data["domain"] not in allowed_domains: return JSONResponse( content={ "status": "error", @@ -198,7 +198,7 @@ async def delete(key, Authorize: AuthJWT = Depends()): data = get_data(key) - if data["domain"] not in allowed_domains: + if data and data["domain"] not in allowed_domains: return JSONResponse( content={ "status": "error", -- cgit v1.1