- Testing scaffold in place.

Author: general-kroll-4-life

cicd/version.txt

@@ -1,2 +1,2 @@
 MajorVersion=0
-MinorVersion=5
+MinorVersion=6

test/mockserver/expectations/static-auth-testing-expectations.json

@@ -45,5 +45,35 @@
         }]
       }
     }
+  },
+  {
+    "httpRequest": {
+      "method": "GET",
+      "path": "/v1/collectors/100000001",
+      "headers": {
+        "Authorization": ["^Bearer\\ 1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M$" ]
+      }
+    },
+    "httpResponse": {
+      "body": {
+        "collector": {
+          "id":100000001,
+          "name":"Netlify",
+          "category":"netlify",
+          "timeZone":"Australia/Melbourne",
+          "fields":{
+            
+          },
+          "links":[{
+            "rel":"sources",
+            "href":"/v1/collectors/100000001/sources"
+          }],
+          "collectorType":"Hosted",
+          "collectorVersion":"",
+          "lastSeenAlive":1670366500147,
+          "alive":true
+        }
+      }
+    }
   }
 ]

test/python/flask/oauth2/token_srv.py

@@ -1,5 +1,7 @@
 from flask import Flask, request
 
+from werkzeug.datastructures import ImmutableMultiDict
+
 import json
 
 import base64
@@ -53,16 +55,17 @@ def generate_google_response_dict(self, default_scopes: List[str]=["https://www.
             "expires_in": 3600
         }
 
+# conforming to [RFC 6749](https://datatracker.ietf.org/doc/html/rfc6749#section-5.1)
 _SIMPLE_RESPONSE = {
             "access_token": "1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M",
             "scope": 'my-scope',
             "token_type": "Bearer",
+            "refresh_token": "1/9xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M", # optional, per the RFC
             "expires_in": 3600
         }
 
-@app.route("/")
-def hello_world():
-    return "<p>Hello, World!</p>"
+def _form_to_str(form: ImmutableMultiDict) -> str:
+    return json.dumps(form.to_dict(flat=False), sort_keys=True)
 
 @app.route("/google/simple/token", methods=['POST'])
 def google_simple_token():
@@ -79,4 +82,5 @@ def google_simple_error_token():
 @app.route("/contrived/simple/token", methods=['POST'])
 def contrived_simple_token():
     request_data = request.form
+    app.logger.info(f'POST /contrived/simple/token request data: {_form_to_str(request_data)}')
     return json.dumps(_SIMPLE_RESPONSE, sort_keys=True)

test/python/registry-rewrite.py

@@ -4,6 +4,8 @@
 
 from pathlib import Path
 
+import urllib.parse
+
 import shutil
 import yaml
 
@@ -131,6 +133,11 @@ def __init__(self, name :str, srcdir :str, destdir :str, port :int, replacement_
 
   def isServerRewriteRequired(self) -> bool:
     return self.name != 'k8s' 
+  
+def _replace_token_url(url :str, replacement_host :str) -> str:
+  parsed = urllib.parse.urlparse(url)
+  replaced = parsed._replace(netloc="{}:{}".format(replacement_host, parsed.port))
+  return urllib.parse.urlunparse(replaced)
 
 def rewrite_provider(args :ProviderArgs):
     os.chdir(args.srcdir)
@@ -146,6 +153,9 @@ def rewrite_provider(args :ProviderArgs):
             for srv in servs:
               srv['url'] = f'https://{args.replacement_host}:{args.port}/'
           d['servers'] = servs
+          token_url = d.get('config', {}).get('auth', {}).get('token_url')
+          if args.isServerRewriteRequired() and token_url:
+            d['config']['auth']['token_url'] = _replace_token_url(token_url, args.replacement_host)
           for path, path_item in d.get('paths', {}).items():
             path_item_servers = path_item.get('servers', [])
             if args.isServerRewriteRequired():
@@ -208,6 +218,9 @@ def __init__(self, processed_args :argparse.Namespace) -> None:
       "stackql_auth_testing": {
         "port": processed_args.stackql_auth_testing_port
       },
+      "stackql_oauth2_testing": {
+        "port": processed_args.stackql_auth_testing_port # shared port acceptable coz auth server decooupled for outh2
+      },
       "__default__": {
         "port": processed_args.default_port
       }

test/registry/src/stackql_oauth2_testing/v0.1.0/provider.yaml

@@ -0,0 +1,33 @@
+id: stackql_oauth2_testing
+name: stackql_oauth2_testing
+version: v0.1.0
+providerServices:
+  collectors:
+    description: Interact with and view information about collectors.
+    id: collectors:v0.1.0
+    name: collectors
+    preferred: true
+    service:
+      $ref: stackql_oauth2_testing/v0.1.0/services/collectors.yaml
+    title: Sumo Logic v1 REST API - users
+    version: v0.1.0
+  users:
+    description: Interact with and view information about users.
+    id: users:v0.1.0
+    name: users
+    preferred: true
+    service:
+      $ref: stackql_oauth2_testing/v0.1.0/services/users.yaml
+    title: Sumo Logic v1 REST API - users
+    version: v0.1.0
+openapi: 3.0.3
+config:
+  auth:
+    client_id_env_var: 'YOUR_OAUTH2_CLIENT_ID_ENV_VAR'
+    client_secret_env_var: 'YOUR_OAUTH2_CLIENT_SECRET_ENV_VAR'
+    type: "oauth2"
+    grant_type: "client_credentials"
+    token_url: 'http://localhost:2091/contrived/simple/token'
+    scopes:
+      - 'scope-01'
+      - 'scope-02'