fix: Apparently we always get the full url as the callsign so filter the deployment out.

Author: rambo

src/rasenmaeher_api/web/api/enduserpfx/views.py

@@ -25,6 +25,9 @@ async def get_user_pfx(
     :param callsign: OTTER1.pfx
     :returns pfx or 403 error
     """
+    deplosuffix = f"_{RMSettings.singleton().deployment_name}.pfx"
+    if callsign.endswith(deplosuffix):
+        callsign = callsign[: -len(deplosuffix)]
     if callsign.endswith(".pfx"):
         callsign = callsign[:-4]
     LOGGER.debug("Called with callsign={}".format(callsign))

src/rasenmaeher_api/web/api/instructions/views.py

@@ -68,8 +68,10 @@ async def get_product_instructions(request: Request, product: str, language: str
     user = UserCRUDRequest(
         uuid=str(person.pk), callsign=person.callsign, x509cert=person.certfile.read_text(encoding="utf-8")
     )
-    response = await post_to_product(product, f"api/v1/instructions/{language}", user.dict(), InstructionData)
+    endpoint_url = f"api/v1/instructions/{language}"
+    response = await post_to_product(product, endpoint_url, user.dict(), InstructionData)
     if response is None:
+        LOGGER.error("post_to_product({}, {}): failed".format(product, endpoint_url))
         # TODO: Raise a reasonable error instead
         return None
     response = cast(InstructionData, response)

tests/ptfpapi/fprun.py

@@ -63,6 +63,7 @@ async def handle_fragment(request: web.Request) -> web.Response:
     """Respond with hello_world for user"""
     check_peer_cert(request)
     user = UserCRUDRequest.parse_raw(await request.text())
+    LOGGER.info("Called with user={}".format(user))
     zip1_bytes = zip_pem(user.x509cert, f"{user.callsign}_1.pem")
     zip2_bytes = zip_pem(user.x509cert, f"{user.callsign}_2.pem")
 
@@ -85,6 +86,7 @@ async def handle_fragment(request: web.Request) -> web.Response:
 async def handle_description(request: web.Request) -> web.Response:
     """Respond with hello_world for user"""
     _lang = request.match_info.get("language", "en")
+    LOGGER.info("Called")
 
     return web.json_response(
         {
@@ -102,6 +104,7 @@ async def handle_instructions(request: web.Request) -> web.Response:
     check_peer_cert(request)
     _lang = request.match_info.get("language", "en")
     payload = await request.json()
+    LOGGER.info("Called with payload={}".format(payload))
 
     return web.json_response(
         {

tests/test_enrollment.py

@@ -590,10 +590,16 @@ async def test_enroll_with_invite_code(  # pylint: disable=R0915
     assert pfxdata.cert
 
     # Fetch also with alternative URLs
-    resp = await unauth_client_session.get("/api/v1/enduserpfx/enrollenrique.pfx")
+    pfxurl = "/api/v1/enduserpfx/enrollenrique.pfx"
+    LOGGER.debug("Trying: {}".format(pfxurl))
+    unauth_client_session.headers.update({"Authorization": f"Bearer {enrique_jwt}"})
+    resp = await unauth_client_session.get(pfxurl)
     resp.raise_for_status()
+    pfxurl2 = f"/api/v1/enduserpfx/enrollenrique_{RMSettings.singleton().deployment_name}.pfx"
+    LOGGER.debug("Trying: {}".format(pfxurl2))
+    unauth_client_session.headers.update({"Authorization": f"Bearer {enrique_jwt}"})
     resp = await unauth_client_session.get(
-        f"/api/v1/enduserpfx/enrollenrique_{RMSettings.singleton().deployment_name}.pfx"
+        pfxurl2,
     )
     resp.raise_for_status()