Update dependencies

.github/workflows/test.yaml

@@ -0,0 +1,21 @@
+# run test suite
+---
+name: Test
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout git commit
+        uses: actions/checkout@v1
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.11
+
+      - name: Install test runner
+        run: python3 -m pip install tox
+
+      - name: Run tests
+        run: tox

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.11
 
 WORKDIR /opt/app
 

jwt_proxy/api.py

@@ -1,13 +1,19 @@
-from flask import Blueprint, abort, current_app, jsonify, request, json as flask_json
+from flask import Blueprint, abort, current_app, jsonify, request
 import jwt
 import requests
 import json
+from flask.json.provider import DefaultJSONProvider
 
 from jwt_proxy.audit import audit_HAPI_change
 
 blueprint = Blueprint('auth', __name__)
 SUPPORTED_METHODS = ('GET', 'POST', 'PUT', 'DELETE', 'OPTIONS')
 
+# Workaround no JSON representation for datetime.timedelta
+class CustomJSONProvider(DefaultJSONProvider):
+    def default(self, obj):
+        return str(obj)
+
 
 def proxy_request(req, upstream_url, user_info=None):
     """Forward request to given url"""
@@ -39,6 +45,7 @@ def proxy_request(req, upstream_url, user_info=None):
     return result
 
 
+
 @blueprint.route("/", defaults={"relative_path": ""}, methods=SUPPORTED_METHODS)
 @blueprint.route("/<path:relative_path>", methods=SUPPORTED_METHODS)
 def validate_jwt(relative_path):
@@ -94,14 +101,6 @@ def smart_configuration():
 @blueprint.route("/settings/<string:config_key>")
 def config_settings(config_key):
     """Non-secret application settings"""
-
-    # workaround no JSON representation for datetime.timedelta
-    class CustomJSONEncoder(flask_json.JSONEncoder):
-        def default(self, obj):
-            return str(obj)
-
-    current_app.json_encoder = CustomJSONEncoder
-
     # return selective keys - not all can be be viewed by users, e.g.secret key
     blacklist = ("SECRET", "KEY")
 

jwt_proxy/app.py

@@ -4,11 +4,12 @@
 
 from jwt_proxy import api
 from jwt_proxy.audit import audit_log_init, audit_entry
-
+from jwt_proxy.api import CustomJSONProvider
 
 def create_app(testing=False, cli=False):
     """Application factory, used to create application"""
     app = Flask("jwt_proxy")
+    app.json = CustomJSONProvider(app)
     register_blueprints(app)
     configure_app(app)
 
@@ -22,7 +23,6 @@ def register_blueprints(app):
 
 def configure_app(app):
     """Load successive configs - overriding defaults"""
-
     app.config.from_object("jwt_proxy.config")
     configure_logging(app)
 

requirements.dev.txt

@@ -0,0 +1,89 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --extra=dev --output-file=requirements.dev.txt setup.cfg
+#
+blinker==1.8.2
+    # via flask
+cachetools==5.5.0
+    # via tox
+certifi==2024.7.4
+    # via requests
+cffi==1.17.0
+    # via cryptography
+chardet==5.2.0
+    # via tox
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via flask
+colorama==0.4.6
+    # via tox
+cryptography==43.0.0
+    # via pyjwt
+distlib==0.3.8
+    # via virtualenv
+exceptiongroup==1.2.2
+    # via pytest
+filelock==3.15.4
+    # via
+    #   tox
+    #   virtualenv
+flask==3.0.3
+    # via jwt_proxy (setup.cfg)
+gunicorn==23.0.0
+    # via jwt_proxy (setup.cfg)
+idna==3.7
+    # via requests
+importlib-metadata==8.4.0
+    # via flask
+iniconfig==2.0.0
+    # via pytest
+itsdangerous==2.2.0
+    # via flask
+jinja2==3.1.4
+    # via flask
+markupsafe==2.1.5
+    # via
+    #   jinja2
+    #   werkzeug
+packaging==24.1
+    # via
+    #   gunicorn
+    #   pyproject-api
+    #   pytest
+    #   tox
+platformdirs==4.2.2
+    # via
+    #   tox
+    #   virtualenv
+pluggy==1.5.0
+    # via
+    #   pytest
+    #   tox
+pycparser==2.22
+    # via cffi
+pyjwt[crypto]==2.9.0
+    # via jwt_proxy (setup.cfg)
+pyproject-api==1.7.1
+    # via tox
+pytest==8.3.2
+    # via jwt_proxy (setup.cfg)
+requests==2.32.3
+    # via jwt_proxy (setup.cfg)
+tomli==2.0.1
+    # via
+    #   pyproject-api
+    #   pytest
+    #   tox
+tox==4.18.0
+    # via jwt_proxy (setup.cfg)
+urllib3==2.2.2
+    # via requests
+virtualenv==20.26.3
+    # via tox
+werkzeug==3.0.3
+    # via flask
+zipp==3.20.0
+    # via importlib-metadata

requirements.txt

@@ -2,25 +2,47 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile
+#    pip-compile --output-file=requirements.txt setup.cfg
 #
-certifi==2021.5.30        # via requests
-cffi==1.14.6              # via cryptography
-charset-normalizer==2.0.4  # via requests
-click==8.0.1              # via flask
-cryptography==3.4.8       # via pyjwt
-flask==2.0.1              # via jwt_proxy (setup.py)
-gunicorn==20.1.0          # via jwt_proxy (setup.py)
-idna==3.2                 # via requests
-importlib-metadata==4.7.1  # via click
-itsdangerous==2.0.1       # via flask
-jinja2==3.0.1             # via flask
-markupsafe==2.0.1         # via jinja2
-pycparser==2.20           # via cffi
-python-json-logger==0.1.11 # via jwt_proxy (setup.py)
-pyjwt[crypto]==2.8.0      # via jwt_proxy (setup.py)
-requests==2.26.0          # via jwt_proxy (setup.py)
-typing-extensions==3.10.0.0  # via importlib-metadata
-urllib3==1.26.6           # via requests
-werkzeug==2.0.1           # via flask
-zipp==3.5.0               # via importlib-metadata
+blinker==1.8.2
+    # via flask
+certifi==2024.7.4
+    # via requests
+cffi==1.17.0
+    # via cryptography
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via flask
+cryptography==43.0.0
+    # via pyjwt
+flask==3.0.3
+    # via jwt_proxy (setup.cfg)
+gunicorn==23.0.0
+    # via jwt_proxy (setup.cfg)
+idna==3.7
+    # via requests
+importlib-metadata==8.4.0
+    # via flask
+itsdangerous==2.2.0
+    # via flask
+jinja2==3.1.4
+    # via flask
+markupsafe==2.1.5
+    # via
+    #   jinja2
+    #   werkzeug
+packaging==24.1
+    # via gunicorn
+pycparser==2.22
+    # via cffi
+pyjwt[crypto]==2.9.0
+    # via jwt_proxy (setup.cfg)
+requests==2.32.3
+    # via jwt_proxy (setup.cfg)
+urllib3==2.2.2
+    # via requests
+werkzeug==3.0.3
+    # via flask
+zipp==3.20.0
+    # via importlib-metadata

setup.cfg

@@ -15,6 +15,7 @@ include_package_data = True
 install_requires =
     flask
     gunicorn
+    python-json-logger
     # RSA encoding and decoding require the cryptography module
     pyjwt[crypto]
     requests