Support a v3 with latest deck (#104)

* v3 to support new deck

* upg flask and jinja

* upd v3 of the api to use new deck

microservices/gatewayApi/Dockerfile

@@ -21,10 +21,16 @@ RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -
 
 #COPY --from=build /deck/deck /usr/local/bin
 
+# gwa api v1/v2
 RUN curl -sL https://github.com/kong/deck/releases/download/v1.5.0/deck_1.5.0_linux_amd64.tar.gz -o deck.tar.gz && \
    tar -xf deck.tar.gz -C /tmp && \
    cp /tmp/deck /usr/local/bin/
 
+# gwa api v3
+RUN curl -sL https://github.com/Kong/deck/releases/download/v1.27.1/deck_1.27.1_linux_amd64.tar.gz -o deck.tar.gz && \
+   tar -xf deck.tar.gz -C /tmp && \
+   cp /tmp/deck /usr/local/bin/deck127
+
 COPY requirements.txt requirements.txt
 
 RUN pip install -r requirements.txt

microservices/gatewayApi/app.py

@@ -15,6 +15,7 @@
 
 import v1.v1 as v1
 import v2.v2 as v2
+import v3.v3 as v3
 
 def create_app(test_config=None):
 
@@ -43,6 +44,7 @@ def create_app(test_config=None):
     ##Routes##
     v1.Register(app)
     v2.Register(app)
+    v3.Register(app)
     Compress(app)
 
     @app.before_request

microservices/gatewayApi/clients/portal.py

@@ -40,9 +40,9 @@ def record_gateway_event(event_id, action, result, namespace, message="", blob="
     entity = 'gateway configuration'
 
     actor = "Unknown Actor"
-    if "clientId" in g.principal:
+    if 'principal' in g and "clientId" in g.principal:
         actor = g.principal["clientId"]
-    if "name" in g.principal:
+    if 'principal' in g and "name" in g.principal:
         actor = g.principal["name"]
 
     payload = {

microservices/gatewayApi/requirements.txt

@@ -1,3 +1,4 @@
+werkzeug==2.2.2
 ply==3.10
 cryptography==38.0.4
 authlib==0.15.3
@@ -21,4 +22,4 @@ pytest-cov==4.0.0
 pytest-mock==3.10.0
 pycodestyle==2.10.0
 pylint==1.7.2
-flask-jwt-simple==0.0.3
+flask-jwt-simple==0.0.3

microservices/gatewayApi/swagger.py

@@ -37,7 +37,6 @@ def openapi_spec(ver:str):
             return Response(open("%s/%s.yaml" % (conf.data['workingFolder'], ver)).read(), mimetype='application/x-yaml')
 
         #app.add_url_rule("/%s/docs/openapi.yaml" % version, openapi_spec)
-        app.register_blueprint(swaggerui_blueprint)
 
         for version in versions:
             ## Template the spec and write it to a temporary location
@@ -52,10 +51,12 @@ def openapi_spec(ver:str):
                 authorization_url = discovery["authorization_endpoint"],
                 accesstoken_url = discovery["token_endpoint"]
             ))
-
 
             log.info("Configured /%s/docs" % version)
 
+        app.register_blueprint(swaggerui_blueprint)
+        log.info("Swagger UI registered")
+
     except:
         traceback.print_exc(file=sys.stdout)
         log.error("Failed to do OIDC Discovery for %s, sleeping 5 seconds and trying again." % version)

microservices/gatewayApi/v3/auth/auth.py

@@ -0,0 +1,3 @@
+from auth.auth import admin_jwt
+from auth.authz import enforce_authorization, enforce_role_authorization, users_group_root, admins_group_root, ns_claim
+from auth.uma import uma_enforce