@@ -435,8 +435,24 @@ async def scan_many(request: Request, user: User = Depends(current_user)):
435435
436436# ------------------------------------------------------------------ one site
437437
438+ SCANS_PER_PAGE = 5
439+
440+
441+ def _safe_back (raw , asset_id : int , fallback : str ) -> str :
442+ """Where a button on one of our pages asked to go back to: the list, or
443+ this site's page, with at most a page number of its scans. Anything else
444+ is ignored, so the field cannot send anybody off the site."""
445+ import re as _re
446+
447+ text = str (raw or "" )
448+ if text == "/external" or _re .fullmatch (rf"/external/{ int (asset_id )} (\?scans=\d{{1,5}})?" , text ):
449+ return text
450+ return fallback
451+
452+
438453@router .get ("/external/{asset_id}" )
439- def detail_page (asset_id : int , request : Request , user : User = Depends (current_user )):
454+ def detail_page (asset_id : int , request : Request , scans : int = 1 ,
455+ user : User = Depends (current_user )):
440456 from app .core import ai , dast_engines
441457
442458 with session_scope () as db :
@@ -446,29 +462,36 @@ def detail_page(asset_id: int, request: Request, user: User = Depends(current_us
446462 links = external .Mapper (db , user ).links (asset )
447463 names = [l ["full_name" ] for l in links ]
448464 counts = external .sast_counts (db , names , user )
449- scans = (db .query (ExternalDastScan )
450- .filter (ExternalDastScan .asset_id == asset .id )
451- .order_by (ExternalDastScan .id .desc ()).limit (100 ).all ())
465+ # Newest first, a page at a time. Started, then finished, time
466+ # order and id order agree, so the id is the cheap way to sort.
467+ scan_query = db .query (ExternalDastScan ).filter (ExternalDastScan .asset_id == asset .id )
468+ scan_total = scan_query .count ()
469+ scan_pages = max (1 , - (- scan_total // SCANS_PER_PAGE ))
470+ scan_page = min (max (1 , scans ), scan_pages )
471+ page_scans = (scan_query .order_by (ExternalDastScan .id .desc ())
472+ .offset ((scan_page - 1 ) * SCANS_PER_PAGE ).limit (SCANS_PER_PAGE ).all ())
473+ running = external .running_scans (db , [asset .id ])
452474 linked = {l ["full_name" ]: counts .get (l ["full_name" ], {}) for l in links if l ["linked" ]}
453475 try :
454476 review = json .loads (asset .ai_review or "{}" ) if asset .ai_review else {}
455477 except ValueError :
456478 review = {}
479+ active_scan = running .get (asset .id )
457480 busy = (asset .telemetry_status == "running" or asset .ai_status == "running"
458- or any (s .status in ("queued" , "running" ) or s .ai_status == "running"
459- for s in scans ))
460- active_scan = next ((s for s in scans if s .status in ("queued" , "running" )), None )
481+ or active_scan is not None
482+ or any (s .ai_status == "running" for s in page_scans ))
461483 context = _shared (db , user )
462484 context .update (
463485 active_page = "external" , asset = asset , tele = external .telemetry_of (asset ),
464486 tags = asset .tag_list (), links = links , counts = counts ,
465487 risk = external .combined_risk (asset , linked ),
466488 due = external .due_status (asset , opts ["max_age_days" ]),
467- blocked = external .blocked (db , asset ), scans = scans , active_scan = active_scan ,
489+ blocked = external .blocked (db , asset ), scans = page_scans , active_scan = active_scan ,
490+ scan_page = scan_page , scan_pages = scan_pages , scan_total = scan_total ,
468491 fields = external .fields_of (asset ), security_headers = external .SECURITY_HEADERS ,
469492 picks_json = json .dumps (external .picks_of (db , asset )),
470493 environments = external .ENVIRONMENTS , statuses = external .STATUSES ,
471- scan_views = [external .scan_dict (s ) for s in scans ],
494+ scan_views = [external .scan_dict (s ) for s in page_scans ],
472495 servers = db .query (DastServer ).order_by (DastServer .name ).all (),
473496 profiles = dast_engines .PROFILES , active = dast_engines .ACTIVE_PROFILES ,
474497 plans = dast_engines .PLANS , engines = dast_engines .installed (),
@@ -704,23 +727,24 @@ async def scan_action(asset_id: int, scan_id: int, action: str, request: Request
704727 scan = _scan (db , asset_id , scan_id )
705728 host = asset .host
706729 if action == "delete" :
730+ form = await request .form ()
731+ back = _safe_back (form .get ("back" ), asset_id , f"/external/{ asset_id } " )
707732 if scan .status in ("queued" , "running" ):
708- return redirect (_back (here , "Stop it first." , "error" ))
733+ return redirect (_back (back if back != f"/external/{ asset_id } " else here ,
734+ "Stop it first." , "error" ))
709735 db .delete (scan )
710736 db .flush ()
711737 external .copy_newest (db , asset )
712738 record (db , "external.scan_deleted" , actor = user .username , target = host ,
713739 detail = f"scan { scan_id } " , source_ip = client_ip (request ))
714- return redirect (_back (f"/external/ { asset_id } " , "Removed that scan." ))
740+ return redirect (_back (back , "Removed that scan." ))
715741 if action == "stop" :
716742 ok = external .stop_scan (scan_id )
717743 message , kind = ("Stopping the scan of " + host + "." , "ok" ) if ok \
718744 else ("It is not running." , "error" )
719745 form = await request .form ()
720746 # Back to where the Stop was pressed, and only to a page of ours.
721- back = str (form .get ("back" ) or "" )
722- if back in ("/external" , f"/external/{ asset_id } " ):
723- here = back
747+ here = _safe_back (form .get ("back" ), asset_id , here )
724748 elif action == "triage" :
725749 problem = external .start_triage (scan_id , user .username )
726750 message , kind = (problem , "error" ) if problem else ("Asking the model. This page "
0 commit comments