fix: scanner now handles real guarddog v2 JSON format
This commit is contained in:
@@ -28,9 +28,7 @@ def _render(name: str, **context) -> HTMLResponse:
|
||||
@router.get("/", response_class=HTMLResponse)
|
||||
async def dashboard(request: Request, session: AsyncSession = Depends(get_session)):
|
||||
total_scans = await session.scalar(select(func.count(Scan.id)))
|
||||
flagged_scans = await session.scalar(
|
||||
select(func.count(Scan.id)).where(Scan.flagged == True)
|
||||
)
|
||||
flagged_scans = await session.scalar(select(func.count(Scan.id)).where(Scan.flagged == True))
|
||||
recent_flagged = await session.scalar(
|
||||
select(func.count(Scan.id)).where(
|
||||
Scan.flagged == True,
|
||||
@@ -39,9 +37,7 @@ async def dashboard(request: Request, session: AsyncSession = Depends(get_sessio
|
||||
)
|
||||
total_findings = await session.scalar(select(func.count(Finding.id)))
|
||||
latest_scans = (
|
||||
(await session.execute(
|
||||
select(Scan).order_by(Scan.started_at.desc()).limit(10)
|
||||
))
|
||||
(await session.execute(select(Scan).order_by(Scan.started_at.desc()).limit(10)))
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
@@ -138,10 +134,7 @@ async def packages_list(
|
||||
total = await session.scalar(select(func.count()).select_from(subq))
|
||||
rows = (
|
||||
await session.execute(
|
||||
select(subq)
|
||||
.order_by(subq.c.last_scan.desc())
|
||||
.offset(offset)
|
||||
.limit(per_page)
|
||||
select(subq).order_by(subq.c.last_scan.desc()).offset(offset).limit(per_page)
|
||||
)
|
||||
).all()
|
||||
|
||||
@@ -166,13 +159,17 @@ async def package_detail(
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
scans = (
|
||||
await session.execute(
|
||||
select(Scan)
|
||||
.where(Scan.package_name == name, Scan.package_version == version)
|
||||
.options(selectinload(Scan.findings))
|
||||
.order_by(Scan.started_at.desc())
|
||||
(
|
||||
await session.execute(
|
||||
select(Scan)
|
||||
.where(Scan.package_name == name, Scan.package_version == version)
|
||||
.options(selectinload(Scan.findings))
|
||||
.order_by(Scan.started_at.desc())
|
||||
)
|
||||
)
|
||||
).scalars().all()
|
||||
.scalars()
|
||||
.all()
|
||||
)
|
||||
|
||||
if not scans:
|
||||
return HTMLResponse("<h1>Not found</h1>", status_code=404)
|
||||
|
||||
Reference in New Issue
Block a user