Skip to content
Merged
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
push:
pull_request:

# Least privilege: jobs read the code; one that needs more (the image push) asks for it itself.
permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
Expand Down
6 changes: 4 additions & 2 deletions krater/services/compute_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ def list_files(store: ObjectStore, actor: Actor, *, job: ComputeJob) -> list[Job
def download_url(store: ObjectStore, actor: Actor, *, job: ComputeJob, area: str, name: str) -> str:
"""A short-lived URL for one of the job's files. Only for a file that exists, so a name can't reach elsewhere."""
_require(actor, job.project)
if area not in AREAS or not any(f.area == area and f.name == name for f in list_files(store, actor, job=job)):
found = next((f for f in list_files(store, actor, job=job) if f.area == area and f.name == name), None)
if area not in AREAS or found is None:
raise NotFound("No such file.")
return store.presign_download(_prefix(job, area) + name, expires=DOWNLOAD_EXPIRES_SECONDS)
# The key comes from the listing, not the request: the URL can only point at a file the job really has.
return store.presign_download(_prefix(job, found.area) + found.name, expires=DOWNLOAD_EXPIRES_SECONDS)


def list_downloads(store: ObjectStore, actor: Actor, *, job: ComputeJob) -> list[tuple[JobFile, str]]:
Expand Down
9 changes: 8 additions & 1 deletion krater/services/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@


class DomainError(Exception):
"""Base class for every error raised by a Krater service."""
"""Base class for every error raised by a Krater service.

`message` is the text written for the person who hit the error, safe to send back to them. Routers show it rather
than `str(exc)`, so a response carries only what a service chose to say."""

def __init__(self, message: str = "") -> None:
super().__init__(message)
self.message = message


class NotAllowed(DomainError):
Expand Down
4 changes: 2 additions & 2 deletions krater/web/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ def create_app() -> FastAPI:
@app.exception_handler(NotAllowed)
def _handle_not_allowed(request: Request, exc: NotAllowed):
if _is_api(request):
return JSONResponse({"error": str(exc)}, status_code=403)
return JSONResponse({"error": exc.message}, status_code=403)
return templates.TemplateResponse(request, "errors/403.html", status_code=403)

@app.exception_handler(NotFound)
def _handle_not_found(request: Request, exc: NotFound):
if _is_api(request):
return JSONResponse({"error": str(exc)}, status_code=404)
return JSONResponse({"error": exc.message}, status_code=404)
return templates.TemplateResponse(request, "errors/404.html", status_code=404)

# Unknown URLs and the auth dependencies' 403s are plain `HTTPException`s, which FastAPI renders as
Expand Down
2 changes: 1 addition & 1 deletion krater/web/deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def fresh_actor(
fresh = request.method not in _CACHEABLE_METHODS
return user_service.authorize(db_session, weave_client, user, fresh=fresh)
except NotAMember as exc:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=str(exc)) from exc
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=exc.message) from exc
except WeaveUnavailableError as exc:
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="Weave is unavailable") from exc

Expand Down
2 changes: 1 addition & 1 deletion krater/web/routers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def _quilt_action(db_session: Session, request: Request, action, actor: Actor, e
action(db_session, actor, row_id=event_id, reason=reason)
except (InvalidState, ValidationFailed) as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse("/admin#quilt", status_code=303)
db_session.commit()
kick_quilt_delivery()
Expand Down
46 changes: 23 additions & 23 deletions krater/web/routers/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def api_actor(
try:
return user_service.authorize(db_session, weave_client, user, fresh=request.method not in ("GET", "HEAD"))
except NotAMember as exc:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=str(exc)) from exc
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=exc.message) from exc
except WeaveUnavailableError as exc:
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="Weave is unavailable") from exc

Expand Down Expand Up @@ -476,7 +476,7 @@ async def submit(
except ConfirmationRequired as exc:
db_session.rollback()
# Sent again with `"confirm_transfer_cost": true`, the job is queued.
return _error(409, str(exc), confirm="confirm_transfer_cost")
return _error(409, exc.message, confirm="confirm_transfer_cost")
except StorageError:
db_session.rollback()
return _error(503, "Krater's storage didn't answer; try again in a minute.")
Expand All @@ -485,10 +485,10 @@ async def submit(
return _error(422, "Check the job's fields.", fields=exc.errors)
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except (InvalidState, DomainError) as exc:
db_session.rollback()
return _error(409, str(exc))
return _error(409, exc.message)
db_session.commit()
return {**_job_json(job), "estimate": _estimate_json(db_session, project, job)}

Expand Down Expand Up @@ -570,7 +570,7 @@ async def begin_input_upload(project_id: uuid.UUID, request: Request, actor: Me,
)
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except ValidationFailed as exc:
db_session.rollback()
return _error(422, "Check the upload.", fields=exc.errors)
Expand All @@ -596,7 +596,7 @@ async def complete_input_upload(project_id: uuid.UUID, request: Request, actor:
etags=etags,
)
except NotAllowed as exc:
return _error(403, str(exc))
return _error(403, exc.message)
except ValidationFailed as exc:
return _error(422, "Check the upload.", fields=exc.errors)
except StorageError:
Expand All @@ -610,7 +610,7 @@ def delete_input(project_id: uuid.UUID, name: str, actor: Me, db_session: Db):
try:
deleted = compute_inputs.delete_input(get_compute_store(), actor, project=project, name=name)
except NotAllowed as exc:
return _error(403, str(exc))
return _error(403, exc.message)
except ValidationFailed as exc:
return _error(404, exc.errors.get("name", "No such input."))
except StorageError:
Expand All @@ -632,7 +632,7 @@ def job_logs(job_id: uuid.UUID, actor: Me, db_session: Db, attempt: int | None =
get_compute_store(), actor, job=job, attempt=attempt, max_bytes=max(1, min(bytes, 1024 * 1024))
)
except NotAllowed as exc:
return _error(403, str(exc))
return _error(403, exc.message)
except StorageError:
return _error(503, "Krater's storage didn't answer; try again in a minute.")
if tail is None:
Expand All @@ -651,7 +651,7 @@ def job_files(job_id: uuid.UUID, actor: Me, db_session: Db):
"files": [{"area": f.area, "name": f.name, "size_bytes": f.size_bytes, "url": url} for f, url in downloads]
}
except NotAllowed as exc:
return _error(403, str(exc))
return _error(403, exc.message)
except StorageError:
return _error(503, "Krater's storage didn't answer; try again in a minute.")

Expand All @@ -670,7 +670,7 @@ def project_files_summary(project_id: uuid.UUID, actor: Me, db_session: Db):
try:
shown = project_files.summary(db_session, get_compute_store(), actor, project)
except NotAllowed as exc:
return _error(403, str(exc))
return _error(403, exc.message)
except StorageError:
return _error(503, "Krater's storage didn't answer; try again in a minute.")
return {
Expand Down Expand Up @@ -734,9 +734,9 @@ def workspace_files(project_id: uuid.UUID, workspace_id: uuid.UUID, actor: Me, d
_, workspace = _workspace(db_session, actor, project_id, workspace_id)
shown, urls = workspaces.downloads(get_compute_store(), workspace)
except NotAllowed as exc:
return _error(403, str(exc))
return _error(403, exc.message)
except NotFound as exc:
return _error(404, str(exc))
return _error(404, exc.message)
except StorageError:
return _error(503, "Krater's storage didn't answer; try again in a minute.")
return {
Expand Down Expand Up @@ -765,13 +765,13 @@ def delete_workspace(project_id: uuid.UUID, workspace_id: uuid.UUID, actor: Me,
count = workspaces.delete(db_session, get_compute_store(), actor, workspace=workspace, now=datetime.now(UTC))
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except NotFound as exc:
db_session.rollback()
return _error(404, str(exc))
return _error(404, exc.message)
except InvalidState as exc:
db_session.rollback()
return _error(409, str(exc))
return _error(409, exc.message)
except StorageError:
db_session.rollback()
return _error(503, "Krater's storage didn't answer; try again in a minute.")
Expand Down Expand Up @@ -828,10 +828,10 @@ async def post_update(project_id: uuid.UUID, request: Request, actor: Me, db_ses
update = project_updates.post(db_session, actor, project=project, body=body["body"])
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except InvalidState as exc:
db_session.rollback()
return _error(409, str(exc))
return _error(409, exc.message)
except ValidationFailed as exc:
db_session.rollback()
return _error(422, "Check the update.", fields=exc.errors)
Expand Down Expand Up @@ -866,10 +866,10 @@ def job_action(
_ACTIONS[action](db_session, actor, job=job, now=datetime.now(UTC), **extra)
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except (InvalidState, DomainError) as exc:
db_session.rollback()
return _error(409, str(exc))
return _error(409, exc.message)
db_session.commit()
return _job_json(job)

Expand Down Expand Up @@ -905,10 +905,10 @@ async def set_secret(project_id: uuid.UUID, name: str, request: Request, actor:
return _error(422, "Check the secret.", fields=exc.errors)
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except InvalidState as exc:
db_session.rollback()
return _error(409, str(exc))
return _error(409, exc.message)
db_session.commit()
return {"name": secret.name, "updated_at": _iso(secret.updated_at)}

Expand All @@ -920,10 +920,10 @@ def delete_secret(project_id: uuid.UUID, name: str, actor: Me, db_session: Db):
project_secrets.delete_secret(db_session, actor, project=project, name=name)
except NotAllowed as exc:
db_session.rollback()
return _error(403, str(exc))
return _error(403, exc.message)
except NotFound as exc:
db_session.rollback()
return _error(404, str(exc))
return _error(404, exc.message)
db_session.commit()
return {"deleted": name}

Expand Down
10 changes: 5 additions & 5 deletions krater/web/routers/compute.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def set_secret(
return _index_page(request, db_session, actor, project, errors=exc.errors, posted={"name": name})
except InvalidState as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse(f"/projects/{project.id}/compute", status_code=303)
db_session.commit()
flash(request, f"Saved {secret.name}. Jobs get it when they next start.", "success")
Expand Down Expand Up @@ -463,7 +463,7 @@ async def submit_job(
)
except ConfirmationRequired as exc:
db_session.rollback()
return _form_page(request, db_session, project, weave_client, posted=posted, transfer_warning=str(exc))
return _form_page(request, db_session, project, weave_client, posted=posted, transfer_warning=exc.message)
except (ValidationFailed, ValueError) as exc:
db_session.rollback()
errors = (
Expand All @@ -481,7 +481,7 @@ async def submit_job(
return _form_page(request, db_session, project, weave_client, errors=errors, posted=posted, status_code=503)
except InvalidState as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse(f"/projects/{project.id}/compute", status_code=303)
db_session.commit()
flash(request, "Queued. It starts when an offer at or under your price appears.", "success")
Expand Down Expand Up @@ -775,7 +775,7 @@ def delete_workspace(
count = workspaces.delete(db_session, get_compute_store(), actor, workspace=workspace, now=datetime.now(UTC))
except InvalidState as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse(back, status_code=303)
db_session.commit()
flash(request, f"Deleted the workspace {workspace.name} ({count:,} stored files).", "success")
Expand Down Expand Up @@ -816,7 +816,7 @@ def job_action(
service(db_session, actor, job=job, now=datetime.now(UTC), **extra)
except InvalidState as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
else:
db_session.commit()
flash(request, message, "success")
Expand Down
4 changes: 2 additions & 2 deletions krater/web/routers/compute_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ async def stop_all_compute(
return _global_page(request, db_session, switch_errors=exc.errors, switch_reason=reason, status_code=422)
except InvalidState as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse("/admin/compute", status_code=303)
db_session.commit()
if mode == compute_halt.STOP_EMERGENCY:
Expand Down Expand Up @@ -263,7 +263,7 @@ async def start_all_compute(
return _global_page(request, db_session, switch_errors=exc.errors, switch_reason=reason, status_code=422)
except InvalidState as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse("/admin/compute", status_code=303)
db_session.commit()
flash(request, "Compute is back on. Queued jobs start on the next pass, within a minute.", "success")
Expand Down
2 changes: 1 addition & 1 deletion krater/web/routers/funders.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def ospool_export(
funder_packet.record_export(db_session, actor, packet)
except FunderPacketUnavailable as exc:
db_session.rollback()
flash(request, str(exc), "error")
flash(request, exc.message, "error")
return RedirectResponse(PAGE, status_code=303)
except ValidationFailed as exc:
db_session.rollback()
Expand Down
Loading
Loading