fix: Removed garbage code, and improving tests

Author: Robin-Van-de-Merghel

diracx-db/src/diracx/db/sql/pilot_agents/db.py

@@ -54,28 +54,6 @@ async def add_pilot_references(
         await self.conn.execute(stmt)
         return
 
-    async def register_pilot(self, pilot_reference: str, pilot_secret: str):
-        hashed_secret = hash(pilot_secret)
-
-        stmt = (
-            select(PilotRegistrations)
-            .join(PilotAgents, PilotRegistrations.pilot_id == PilotAgents.pilot_id)
-            .where(PilotRegistrations.pilot_hashed_secret == hashed_secret)
-            .where(PilotAgents.pilot_job_reference == pilot_reference)
-        )
-
-        # Execute the request
-        res = await self.conn.execute(stmt)
-
-        result = res.fetchone()
-
-        if result is None:
-            raise AuthorizationError(detail="bad pilot_reference / pilot_secret")
-
-        # Increment the count
-        await self.increment_pilot_secret_use(pilot_reference=pilot_reference)
-        return
-
     async def increment_pilot_secret_use(
         self,
         pilot_reference: str,
@@ -200,9 +178,9 @@ async def get_pilots(self):
 
     async def get_pilot_by_id(self, pilot_id: int):
         stmt = (
-            select(PilotRegistrations)
+            select(PilotAgents)
             .with_for_update()
-            .where(PilotRegistrations.pilot_id == pilot_id)
+            .where(PilotAgents.pilot_id == pilot_id)
         )
 
         return dict((await self.conn.execute(stmt)).one()._mapping)

diracx-db/tests/pilot_agents/test_pilot_agents_db.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 import pytest
+from sqlalchemy.exc import NoResultFound
 
+from diracx.core.exceptions import AuthorizationError
 from diracx.db.sql.pilot_agents.db import PilotAgentsDB
 
 
@@ -41,6 +43,9 @@ async def test_insert_and_select_single(pilot_agents_db: PilotAgentsDB):
 
         res = await pilot_agents_db.get_pilot_by_id(new_pilot_id)
 
+        with pytest.raises(NoResultFound):
+            await pilot_agents_db.get_pilot_by_id(10)
+
         # Set values
         assert res["PilotID"] == new_pilot_id
         assert res["VO"] == "pilot-vo"
@@ -50,3 +55,28 @@ async def test_insert_and_select_single(pilot_agents_db: PilotAgentsDB):
         assert res["PilotStamp"] == ""
         assert res["BenchMark"] == 0.0
         assert res["Status"] == "Unknown"
+
+
+async def test_create_pilot_and_verify_secret(pilot_agents_db: PilotAgentsDB):
+
+    async with pilot_agents_db as pilot_agents_db:
+        # Add a pilot reference
+        pilot_ref = "pilot-ref"
+
+        new_pilot_id = await pilot_agents_db.register_new_pilot(
+            vo="pilot-vo", pilot_job_reference=pilot_ref
+        )
+
+        # Add creds
+        secret = await pilot_agents_db.add_pilot_credentials(new_pilot_id)
+
+        assert secret is not None
+
+        await pilot_agents_db.verify_pilot_secret(
+            pilot_reference=pilot_ref, pilot_secret=secret
+        )
+
+        with pytest.raises(AuthorizationError):
+            await pilot_agents_db.verify_pilot_secret(
+                pilot_reference=pilot_ref, pilot_secret="I love stawberries :)"
+            )