Merge pull request #360 from esune/fix/sub-never-changing

Fix: update subject_id that was never changing

docker/docker-compose.yaml

@@ -15,6 +15,7 @@ services:
       fi"
     environment:
       - DEBUGGER=${DEBUGGER}
+      - LOG_LEVEL=${LOG_LEVEL}
       - DB_HOST=${MONGODB_HOST}
       - DB_PORT=${MONGODB_PORT}
       - DB_NAME=${MONGODB_NAME}

docker/manage

@@ -147,6 +147,7 @@ configureEnvironment() {
 
   ## global
   export COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-vc-authn}"
+  export LOG_LEVEL=${LOG_LEVEL:-"DEBUG"}
 
   # controller-db
   export MONGODB_HOST="controller-db"

oidc-controller/api/clientConfigurations/models.py

@@ -1,13 +1,19 @@
 from enum import Enum
-from typing import Optional, List
+from typing import List, Optional
+
 from pydantic import BaseModel, Field
 
-from .examples import ex_client_config
 from ..core.config import settings
+from .examples import ex_client_config
 
 
 class TOKENENDPOINTAUTHMETHODS(str, Enum):
     client_secret_basic = "client_secret_basic"
+    client_secret_post = "client_secret_post"
+
+    @classmethod
+    def list(cls):
+        return list(map(lambda c: c.value, cls))
 
 
 class ClientConfigurationBase(BaseModel):

oidc-controller/api/core/oidc/issue_token_service.py

@@ -96,7 +96,7 @@ def get_claims(
                 """subject_identifer not found in presentation values,
                   generating random subject_identifier"""
             )
-            sub_id_value = uuid.uuid4()
+            sub_id_value = str(uuid.uuid4())
         else:
             sub_id_value = sub_id_claim.value
 
@@ -115,7 +115,7 @@ def get_claims(
                 result[key] = value.value
 
         return result
-    
+
     # TODO: Determine if this is useful to keep, and remove it if it's not. It is currently unused.
     # renames and calculates dict members appropriate to
     # https://openid.net/specs/openid-connect-core-1_0.html#IDToken

oidc-controller/api/core/oidc/provider.py

@@ -1,8 +1,10 @@
 import os
+import secrets
 from urllib.parse import urlparse
 
 import structlog
 import structlog.typing
+from api.clientConfigurations.models import TOKENENDPOINTAUTHMETHODS
 from api.core.config import settings
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
@@ -11,6 +13,7 @@
 from pymongo.database import Database
 from pyop.authz_state import AuthorizationState
 from pyop.provider import Provider
+from pyop.storage import StatelessWrapper
 from pyop.subject_identifier import HashBasedSubjectIdentifierFactory
 from pyop.userinfo import Userinfo
 
@@ -105,14 +108,15 @@ def pem_file_exists(filepath) -> bool:
     "request_parameter_supported": True,
     "request_uri_parameter_supported": False,
     "scopes_supported": ["openid"],
-    "token_endpoint_auth_methods_supported": ["client_secret_basic"],
+    "token_endpoint_auth_methods_supported": TOKENENDPOINTAUTHMETHODS.list(),
     "frontchannel_logout_supported": True,
     "frontchannel_logout_session_supported": True,
     "backchannel_logout_supported": True,
     "backchannel_logout_session_supported": True,
 }
 
 subject_id_factory = HashBasedSubjectIdentifierFactory(settings.SUBJECT_ID_HASH_SALT)
+stateless_storage = StatelessWrapper("vc-authn", secrets.token_urlsafe())
 
 # placeholder that gets set on app_start and write operations to ClientConfigurationCRUD
 provider = None
@@ -131,7 +135,12 @@ async def init_provider(db: Database):
     provider = Provider(
         signing_key,
         configuration_information,
-        AuthorizationState(subject_id_factory),
+        AuthorizationState(
+            subject_id_factory,
+            authorization_code_db=stateless_storage,
+            access_token_db=stateless_storage,
+            refresh_token_db=stateless_storage,
+        ),
         client_db,
         Userinfo(user_db),
     )

oidc-controller/api/routers/oidc.py

@@ -6,8 +6,8 @@
 import qrcode
 import structlog
 from fastapi import APIRouter, Depends, HTTPException, Request
-from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 from fastapi import status as http_status
+from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 from jinja2 import Template
 from oic.oic.message import AccessTokenRequest, AuthorizationRequest
 from pymongo.database import Database
@@ -88,9 +88,10 @@ async def get_authorize(request: Request, db: Database = Depends(get_db)):
         )
     except InvalidAuthenticationRequest as e:
         raise HTTPException(
-            status_code=http_status.HTTP_400_BAD_REQUEST, 
-            detail=f"Invalid auth request: {e}")
-
+            status_code=http_status.HTTP_400_BAD_REQUEST,
+            detail=f"Invalid auth request: {e}",
+        )
+
     #  fetch placeholder user/model and create proof
     authn_response = provider.provider.authorize(model, "vc-user")
 
@@ -161,17 +162,14 @@ async def post_token(request: Request, db: Database = Depends(get_db)):
     """Called by oidc platform to retrieve token contents"""
     form = await request.form()
     model = AccessTokenRequest().from_dict(form._dict)
-    client = AcapyClient()
 
     auth_session = await AuthSessionCRUD(db).get_by_pyop_auth_code(model.get("code"))
     ver_config = await VerificationConfigCRUD(db).get(auth_session.ver_config_id)
     claims = Token.get_claims(auth_session, ver_config)
 
     # modify subject identifier value to use vc-attribute as configured
     new_sub = claims.pop("sub")
-    provider.provider.authz_state.authorization_codes[model.get("code")][
-        "public"
-    ] = new_sub
+    provider.provider.authz_state.subject_identifiers["vc-user"]["public"] = new_sub
 
     # convert form data to what library expects, Flask.app.request.get_data()
     data = urlencode(form._dict)

oidc-controller/requirements-dev.txt

@@ -6,3 +6,4 @@ pytest-asyncio==0.21.1
 pytest-cov==4.1.0
 pytest==7.3.1
 requests-mock==1.11.0
+setuptools==68.2.2