Merge pull request #13 from GLEIF-IT/feature/signed_headers_verification

Added /authorizations signed headers verification support

Author: aydarng

controllers.py

@@ -1,5 +1,5 @@
 import logging
-from vlei_verifier_client import VerifierClient, VerifierResponse, AsyncVerifierClient
+from vlei_verifier_client import VerifierResponse, AsyncVerifierClient
 from utils.router_state import RouterState
 
 # Configure logging
@@ -33,7 +33,7 @@ async def presentation(said: str, vlei: str) -> VerifierResponse:
         """
         logger.info(f"Starting presentation for SAID: {said}")
         verifier_client = VerifierController._get_verifier_client(said=said)
-        verifier_response = await verifier_client.login(said=said, vlei=vlei)
+        verifier_response = await verifier_client.presentation(said=said, vlei=vlei)
 
         if verifier_response.code >= 300:
             logger.warning(f"Presentation failed for SAID: {said}. Code: {verifier_response.code}, Message: {verifier_response.message}")
@@ -46,13 +46,13 @@ async def presentation(said: str, vlei: str) -> VerifierResponse:
         return verifier_response
 
     @staticmethod
-    async def authorization(aid: str) -> VerifierResponse:
+    async def authorization(aid: str, headers) -> VerifierResponse:
         """
         Handle authorization logic for a given AID.
         """
         logger.info(f"Starting authorization for AID: {aid}")
         verifier_client = VerifierController._get_verifier_client(aid=aid)
-        verifier_response = await verifier_client.check_login(aid=aid)
+        verifier_response = await verifier_client.authorization(aid=aid, headers=headers)
 
         if verifier_response.code >= 300:
             logger.warning(f"Authorization failed for AID: {aid}. Code: {verifier_response.code}, Message: {verifier_response.message}")
@@ -61,6 +61,23 @@ async def authorization(aid: str) -> VerifierResponse:
 
         return verifier_response
 
+    @staticmethod
+    async def presentations_history(aid: str) -> VerifierResponse:
+        """
+        Handle authorization logic for a given AID.
+        """
+        logger.info(f"Starting get presentations history for AID: {aid}")
+        verifier_client = VerifierController._get_verifier_client(aid=aid)
+        verifier_response = await verifier_client.get_presentations_history(aid=aid)
+
+        if verifier_response.code >= 300:
+            logger.warning(
+                f"Authorization failed for AID: {aid}. Code: {verifier_response.code}, Message: {verifier_response.message}")
+        else:
+            logger.info(f"Get presentations history successful for AID: {aid}")
+
+        return verifier_response
+
     @staticmethod
     async def signed_headers_verification(aid: str, sig: str, ser: str) -> VerifierResponse:
         """

docker-compose-load-test.yml

@@ -106,66 +106,13 @@ services:
       - redis_data:/data
     restart: always
 
-  vlei-server:
-    image: gleif/vlei
-    environment:
-      - PYTHONUNBUFFERED=1
-      - PYTHONIOENCODING=UTF-8
-    command:
-      - vLEI-server
-      - -s
-      - ./schema/acdc
-      - -c
-      - ./samples/acdc/
-      - -o
-      - ./samples/oobis/
-    healthcheck:
-      test:
-        - CMD
-        - curl
-        - -f
-        - http://localhost:7723/oobi/EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao
-      interval: 2s
-      timeout: 3s
-      retries: 5
-      start_period: 2s
-    ports:
-      - 7723:7723
-
-  witness-demo:
-    image: weboftrust/keri-witness-demo:1.1.0
-    environment:
-      - PYTHONUNBUFFERED=1
-      - PYTHONIOENCODING=UTF-8
-    healthcheck:
-      test: [ 'CMD', 'curl', '-f', 'http://localhost:5642/oobi' ]
-      interval: 2s
-      timeout: 3s
-      retries: 5
-      start_period: 2s
-    configs:
-      - source: wan.json
-        target: /keripy/scripts/keri/cf/main/wan.json
-      - source: wes.json
-        target: /keripy/scripts/keri/cf/main/wes.json
-      - source: wil.json
-        target: /keripy/scripts/keri/cf/main/wil.json
-      - source: wit.json
-        target: /keripy/scripts/keri/cf/main/wit.json
-      - source: wub.json
-        target: /keripy/scripts/keri/cf/main/wub.json
-      - source: wyx.json
-        target: /keripy/scripts/keri/cf/main/wyx.json
-
   vlei-verifier-single-mode:
-    image: gleif/vlei-verifier:latest
+    image: gleif/vlei-verifier:0.1.2
     container_name: vlei-verifier-single-mode
     hostname: vlei-verifier-single-mode
     environment:
       - VERIFIER_CONFIG_FILE=verifier-config-test.json
-    depends_on:
-      - vlei-server
-      - witness-demo
+      - VERIFIER_MODE=test
     ports:
       - 7676:7676
     healthcheck:
@@ -176,14 +123,12 @@ services:
       start_period: 2s
 
   vlei-verifier-1:
-    image: gleif/vlei-verifier:latest
+    image: gleif/vlei-verifier:0.1.2
     container_name: vlei-verifier-1
     hostname: vlei-verifier-1
     environment:
       - VERIFIER_CONFIG_FILE=verifier-config-test.json
-    depends_on:
-      - vlei-server
-      - witness-demo
+      - VERIFIER_MODE=test
     ports:
       - 5652:7676
     healthcheck:
@@ -194,14 +139,12 @@ services:
       start_period: 2s
 
   vlei-verifier-2:
-    image: gleif/vlei-verifier:latest
+    image: gleif/vlei-verifier:0.1.2
     container_name: vlei-verifier-2
     hostname: vlei-verifier-2
     environment:
       - VERIFIER_CONFIG_FILE=verifier-config-test.json
-    depends_on:
-      - vlei-server
-      - witness-demo
+      - VERIFIER_MODE=test
     ports:
       - 5653:7676
     healthcheck:
@@ -212,14 +155,12 @@ services:
       start_period: 2s
 
   vlei-verifier-3:
-    image: gleif/vlei-verifier:latest
+    image: gleif/vlei-verifier:0.1.2
     container_name: vlei-verifier-3
     hostname: vlei-verifier-3
     environment:
       - VERIFIER_CONFIG_FILE=verifier-config-test.json
-    depends_on:
-      - vlei-server
-      - witness-demo
+      - VERIFIER_MODE=test
     ports:
       - 5654:7676
     healthcheck:
@@ -230,14 +171,12 @@ services:
       start_period: 2s
 
   vlei-verifier-4:
-    image: gleif/vlei-verifier:latest
+    image: gleif/vlei-verifier:0.1.2
     container_name: vlei-verifier-4
     hostname: vlei-verifier-4
     environment:
       - VERIFIER_CONFIG_FILE=verifier-config-test.json
-    depends_on:
-      - vlei-server
-      - witness-demo
+      - VERIFIER_MODE=test
     ports:
       - 5655:7676
     healthcheck:
@@ -248,14 +187,12 @@ services:
       start_period: 2s
 
   vlei-verifier-5:
-    image: gleif/vlei-verifier:latest
+    image: gleif/vlei-verifier:0.1.2
     container_name: vlei-verifier-5
     hostname: vlei-verifier-5
     environment:
       - VERIFIER_CONFIG_FILE=verifier-config-test.json
-    depends_on:
-      - vlei-server
-      - witness-demo
+      - VERIFIER_MODE=test
     ports:
       - 5656:7676
     healthcheck:
@@ -269,22 +206,29 @@ services:
     image: alpine:latest
     command: [ 'echo', 'Router mode dependencies running' ]
     depends_on:
-      vlei-server:
-        condition: service_healthy
-      witness-demo:
-        condition: service_healthy
       vlei-verifier-router:
         condition: service_healthy
 
   verifier:
     image: alpine:latest
     command: [ 'echo', 'Verifier mode dependencies running' ]
     depends_on:
-      vlei-server:
+      vlei-verifier-single-mode:
+        condition: service_healthy
+
+  verifier-instances:
+    image: alpine:latest
+    command: [ 'echo', 'Verifier mode dependencies running' ]
+    depends_on:
+      vlei-verifier-1:
         condition: service_healthy
-      witness-demo:
+      vlei-verifier-2:
         condition: service_healthy
-      vlei-verifier-single-mode:
+      vlei-verifier-3:
+        condition: service_healthy
+      vlei-verifier-4:
+        condition: service_healthy
+      vlei-verifier-5:
         condition: service_healthy
 
 

main.py

@@ -12,7 +12,7 @@
 
 
 @asynccontextmanager
-async def lifespan(app: FastAPI):
+async def lifespan(fastapi_app: FastAPI):
     """
     Lifespan event handler for FastAPI.
     """
@@ -35,8 +35,14 @@ async def present_credential(said: str, request: Request):
 
 
 @app.get("/authorizations/{aid}")
-async def authorization(aid: str,):
-    response = await VerifierController.authorization(aid)
+async def authorization(aid: str, request: Request):
+    response = await VerifierController.authorization(aid, request.headers)
+    return JSONResponse(status_code=response.code, content=response.body)
+
+
+@app.get("/presentations/history/{aid}")
+async def presentations_history(aid: str, request: Request):
+    response = await VerifierController.presentations_history(aid)
     return JSONResponse(status_code=response.code, content=response.body)
 
 
@@ -77,6 +83,23 @@ async def add_verifier_instance(request: Request):
     return JSONResponse(status_code=200, content="Success")
 
 
+@app.get("/service_status")
+async def add_verifier_instance():
+    return JSONResponse(status_code=200, content={
+        "status": "OK",
+        "mode": "router"
+    })
+
+
+@app.get("/get_verifier_url_for_aid/{aid}")
+async def add_verifier_instance(aid: str):
+    router_state = RouterState.get_state()
+    verifier_instance = router_state.get_verifier_instance_for_aid(aid)
+    return JSONResponse(status_code=200, content={
+        "verifier_url": verifier_instance
+    })
+
+
 def main():
     logger.info("Starting Vlei-Verifier_Router")
     import uvicorn
@@ -85,4 +108,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

setup.py

@@ -15,7 +15,7 @@
 
 setup(
     name='vlei-verifier-router',
-    version='0.1.0',  # also change in src/verifier/__init__.py
+    version='0.1.1',
     license='Apache Software License 2.0',
     description='Vlei Verifier Router',
     long_description="Vlei Verifier Router",
@@ -60,7 +60,7 @@
         "requests>=2.32.3",
         "python-multipart",
         "apscheduler>=3.11.0",
-        "vlei-verifier-client==0.1.1",
+        "vlei-verifier-client==0.1.4",
         "redis>=5.2.1"
     ],
     extras_require={

test/load/load_test.py

@@ -14,8 +14,8 @@ async def send_post_request(aid, said, vlei):
         client = AsyncVerifierClient("http://localhost:7676")
         start_time = time.perf_counter()
 
-        presentations_response: VerifierResponse = await client.login(said, vlei)
-        auth_response: VerifierResponse = await client.check_login(aid)
+        presentations_response: VerifierResponse = await client.presentation(said, vlei)
+        auth_response: VerifierResponse = await client.authorization(aid)
 
         end_time = time.perf_counter()
         latency = end_time - start_time

utils/router_state.py

@@ -1,6 +1,6 @@
 import json
 import os
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 import redis
 from typing import List, Dict, Optional
 import logging
@@ -17,7 +17,7 @@ class RouterState:
     """
 
     _instance: Optional["RouterState"] = None
-    __current_verifier_instance_num: int = 0
+    _current_verifier_instance_num: int = 0
 
     def __new__(cls, *args, **kwargs):
         """
@@ -158,10 +158,9 @@ def _get_next_verifier_instance(self) -> str:
             raise ValueError("No verifier instances available.")
 
         # Round-robin selection
-        if self.__current_verifier_instance_num >= len(verifier_instances):
-            self.__current_verifier_instance_num = 0
-        instance = verifier_instances[self.__current_verifier_instance_num]
-        self.__current_verifier_instance_num += 1
-        instance = instance
+        if self._current_verifier_instance_num >= len(verifier_instances):
+            self._current_verifier_instance_num = 0
+        instance = verifier_instances[self._current_verifier_instance_num]
+        self._current_verifier_instance_num += 1
         logger.debug(f"Selected verifier instance: {instance}")
         return instance