Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
"module": "blueapi",
"args": "--config ${input:config_path} serve",
"env": {
"OTLP_EXPORT_ENABLED": "false"
"OTLP_EXPORT_ENABLED": "false",
"EPICS_CA_NAME_SERVERS": "127.0.0.1:9064",
"EPICS_PVA_NAME_SERVERS": "127.0.0.1:9075",
"EPICS_CA_ADDR_LIST": "127.0.0.1:9064"
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ filterwarnings = ["error", "ignore::DeprecationWarning"]
# Doctest python code in docs, python code in src docstrings, test functions in tests
testpaths = "docs src tests"
asyncio_mode = "auto"
timeout = 3
timeout = 100

[tool.coverage.run]
patch = ["subprocess"]
Expand Down
12 changes: 12 additions & 0 deletions src/blueapi/service/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,15 @@ def get_access_token(self):
def sync_auth_flow(self, request):
request.headers["Authorization"] = f"Bearer {self.get_access_token()}"
yield request


class OPAClient: # placeholder until https://jira.diamond.ac.uk/browse/ACQP-550 is done
def do_some_checks(self, task_request) -> bool:
return True

def admin(self):
return False


def get_opa_client() -> OPAClient: # placeholder
return OPAClient()
75 changes: 71 additions & 4 deletions src/blueapi/service/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
from blueapi import __version__
from blueapi.config import ApplicationConfig, OIDCConfig, Tag
from blueapi.service import interface
from blueapi.service.authentication import OPAClient, get_opa_client
from blueapi.worker import TrackableTask, WorkerState
from blueapi.worker.event import TaskStatusEnum

Expand Down Expand Up @@ -166,6 +167,50 @@ def inner(request: Request, access_token: str = Depends(oauth_scheme)):
TRACER = get_tracer("interface")


def submit_permission(
opa: Annotated[OPAClient, Depends(get_opa_client)],
task_request: TaskRequest,
):
allowed = opa.do_some_checks(task_request)

if not allowed:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)


def access_task_permission(
opa: Annotated[OPAClient, Depends(get_opa_client)],
request: Request,
task_id: str,
runner: Annotated[WorkerDispatcher, Depends(_runner)],
):
access_token: dict[str, Any] | None = getattr(
request.state, "decoded_access_token", None
)
task = runner.run(interface.get_task_by_id, task_id)

if not opa.admin() and (
access_token
and task
and access_token.get("fedid") != task.task.metadata.get("user")
):
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)


# start_task_permission is used when there is WorkerTask
def start_task_permission(
opa: Annotated[OPAClient, Depends(get_opa_client)],
request: Request,
task: WorkerTask,
runner: Annotated[WorkerDispatcher, Depends(_runner)],
):
if not task.task_id:
raise HTTPException(
status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
detail="No task id provided",
)
access_task_permission(opa, request, task.task_id, runner)


async def on_key_error_404(_: Request, __: Exception):
return JSONResponse(
status_code=status.HTTP_404_NOT_FOUND,
Expand Down Expand Up @@ -291,6 +336,7 @@ def submit_task(
request: Request,
response: Response,
task_request: Annotated[TaskRequest, Body(..., examples=[example_task_request])],
_: Annotated[None, Depends(submit_permission)],
runner: Annotated[WorkerDispatcher, Depends(_runner)],
) -> TaskResponse:
"""Submit a task to the worker."""
Expand All @@ -299,10 +345,7 @@ def submit_task(
access_token: dict[str, Any] | None = getattr(
request.state, "decoded_access_token", None
)
if access_token:
user: str = access_token.get("fedid", "Unknown")
else:
user = "Unknown"
user = access_token.get("fedid") if access_token else None

task_id: str = runner.run(interface.submit_task, task_request, {"user": user})
response.headers["Location"] = f"{request.url}/{task_id}"
Expand Down Expand Up @@ -336,6 +379,7 @@ def submit_task(
@start_as_current_span(TRACER, "task_id")
def delete_submitted_task(
task_id: str,
_: Annotated[None, Depends(access_task_permission)],
runner: Annotated[WorkerDispatcher, Depends(_runner)],
) -> TaskResponse:
return TaskResponse(task_id=runner.run(interface.clear_task, task_id))
Expand All @@ -353,6 +397,7 @@ def validate_task_status(v: str) -> TaskStatusEnum:
@secure_router.get("/tasks", status_code=status.HTTP_200_OK, tags=[Tag.TASK])
@start_as_current_span(TRACER)
def get_tasks(
request: Request,
runner: Annotated[WorkerDispatcher, Depends(_runner)],
task_status: str | SkipJsonSchema[None] = None,
) -> TasksListResponse:
Expand All @@ -373,6 +418,14 @@ def get_tasks(
tasks = runner.run(interface.get_tasks_by_status, desired_status)
else:
tasks = runner.run(interface.get_tasks)

access_token: dict[str, Any] | None = getattr(
request.state, "decoded_access_token", None
)
user = access_token.get("fedid") if access_token else None

tasks = [t for t in tasks if t.task.metadata.get("user") == user]

return TasksListResponse(tasks=tasks)


Expand All @@ -390,6 +443,7 @@ def get_tasks(
def set_active_task(
request: Request,
task: WorkerTask,
_: Annotated[None, Depends(start_task_permission)],
runner: Annotated[WorkerDispatcher, Depends(_runner)],
) -> WorkerTask:
"""Set a task to active status, the worker should begin it as soon as possible.
Expand Down Expand Up @@ -420,6 +474,7 @@ def get_passthrough_headers(request: Request) -> dict[str, str]:
@start_as_current_span(TRACER, "task_id")
def get_task(
task_id: str,
_: Annotated[None, Depends(access_task_permission)],
runner: Annotated[WorkerDispatcher, Depends(_runner)],
) -> TrackableTask:
"""Retrieve a task"""
Expand Down Expand Up @@ -495,8 +550,11 @@ def get_state(runner: Annotated[WorkerDispatcher, Depends(_runner)]) -> WorkerSt
)
@start_as_current_span(TRACER, "state_change_request.new_state")
def set_state(
request: Request,
state_change_request: StateChangeRequest,
response: Response,
opa: Annotated[OPAClient, Depends(get_opa_client)],
# _: Annotated[None, Depends(access_task_permission)],
runner: Annotated[WorkerDispatcher, Depends(_runner)],
) -> WorkerState:
"""
Expand All @@ -523,6 +581,15 @@ def set_state(
current_state in _ALLOWED_TRANSITIONS
and new_state in _ALLOWED_TRANSITIONS[current_state]
):
active = runner.run(interface.get_active_task)
access_token: dict[str, Any] | None = getattr(
request.state, "decoded_access_token", None
)
user = access_token.get("fedid") if access_token else None

if not opa.admin() and active and active.task.metadata.get("user") != user:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)

if new_state == WorkerState.PAUSED:
runner.run(interface.pause_worker, state_change_request.defer)
elif new_state == WorkerState.RUNNING:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/service/test_rest_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def test_create_task(mock_runner: Mock, client: TestClient) -> None:

response = client.post("/tasks", json=task.model_dump())

mock_runner.run.assert_called_with(submit_task, task, {"user": "Unknown"})
mock_runner.run.assert_called_with(submit_task, task, {"user": None})
assert response.json() == {"task_id": task_id}


Expand Down
Loading