Skip to content

High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.

fix(dialog): navigate, history, wait, find, evaluate, batches, element reads, upload, solve, download and emulation refuse a dialog-blocked tab instantly with 409 dialog_blocked; a dialog opened mid-batch stops the run with a coded failed step; a census places every binding for the guard (PIN-425)

Luigi Agostia9742c2eb7e3
diff --git a/internal/handlers/actions.go b/internal/handlers/actions.go
index 4ada485f..dc8d3286 100644
--- a/internal/handlers/actions.go
+++ b/internal/handlers/actions.go
@@ -858,6 +858,9 @@ func (h *Handlers) handleActionsBatch(w http.ResponseWriter, r *http.Request, re
return
}
}
+ if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDialogBlocked); !ok {
+ return
+ }
run := newMultiStepRun(len(req.Actions), req.StopOnError)
for i := 0; i < len(req.Actions) && !run.stopped; i++ {
@@ -879,6 +882,10 @@ func (h *Handlers) handleActionsBatch(w http.ResponseWriter, r *http.Request, re
if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDomainPolicy); !ok {
return
}
+ if dialog := pendingTabDialog(h.Bridge, resolvedTabID); dialog != nil {
+ run.stop(dialogBlockedActionResult(i, resolvedTabID, dialog))
+ continue
+ }
if err := h.enforceTabNotPausedForHandoff(resolvedTabID); err != nil {
run.record(h.handoffPausedActionResult(i, resolvedTabID, err))
continue
@@ -930,6 +937,11 @@ func (m *multiStepRun) record(result actionResult) {
}
}
+func (m *multiStepRun) stop(result actionResult) {
+ m.results = append(m.results, result)
+ m.stopped = true
+}
+
func (h *Handlers) runMultiStepActionTail(
ctx, tCtx context.Context,
r *http.Request, w http.ResponseWriter,
@@ -1115,6 +1127,9 @@ func (h *Handlers) HandleMacro(w http.ResponseWriter, r *http.Request) {
return
}
}
+ if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDialogBlocked); !ok {
+ return
+ }
run := newMultiStepRun(len(req.Steps), req.StopOnError)
for i := 0; i < len(req.Steps) && !run.stopped; i++ {
@@ -1125,6 +1140,10 @@ func (h *Handlers) HandleMacro(w http.ResponseWriter, r *http.Request) {
if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDomainPolicy); !ok {
return
}
+ if dialog := pendingTabDialog(h.Bridge, resolvedTabID); dialog != nil {
+ run.stop(dialogBlockedActionResult(i, resolvedTabID, dialog))
+ continue
+ }
if err := h.enforceTabNotPausedForHandoff(resolvedTabID); err != nil {
run.record(h.handoffPausedActionResult(i, resolvedTabID, err))
continue
diff --git a/internal/handlers/actions_test.go b/internal/handlers/actions_test.go
index a6d8a6c6..fa144b07 100644
--- a/internal/handlers/actions_test.go
+++ b/internal/handlers/actions_test.go
@@ -117,6 +117,8 @@ func (m *failMockBridge) AvailableActions() []string {
return []string{bridge.ActionClick, bridge.ActionType}
}
+func (m *failMockBridge) GetDialogManager() *bridge.DialogManager { return nil }
+
func (m *failMockBridge) Evaluate(ctx context.Context, expression string, result any, opts bridge.EvalOpts) error {
return nil
}
diff --git a/internal/handlers/credentials.go b/internal/handlers/credentials.go
index 81e8cf55..a35d2057 100644
--- a/internal/handlers/credentials.go
+++ b/internal/handlers/credentials.go
@@ -135,7 +135,7 @@ func (h *Handlers) setCredentials(w http.ResponseWriter, r *http.Request, req cr
// Non-empty username requires password field (empty password is allowed).
// Empty username means "clear credentials".
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/current_tab_test.go b/internal/handlers/current_tab_test.go
index 90c67f8b..0b0e6997 100644
--- a/internal/handlers/current_tab_test.go
+++ b/internal/handlers/current_tab_test.go
@@ -36,6 +36,8 @@ func newScopedCurrentTabBridge() *scopedCurrentTabBridge {
}
}
+func (b *scopedCurrentTabBridge) GetDialogManager() *bridge.DialogManager { return nil }
+
func (b *scopedCurrentTabBridge) TabContext(tabID string) (*bridge.TabHandle, string, error) {
if tabID == "" {
tabID = b.globalTab
diff --git a/internal/handlers/dialog_blocked.go b/internal/handlers/dialog_blocked.go
index af0a95c3..01960eee 100644
--- a/internal/handlers/dialog_blocked.go
+++ b/internal/handlers/dialog_blocked.go
@@ -59,3 +59,13 @@ func (h *Handlers) refuseIfDialogBlocked(w http.ResponseWriter, tabID string) bo
writeDialogBlocked(w, tabID, dialog, "")
return true
}
+
+func dialogBlockedActionResult(index int, tabID string, dialog *bridge.DialogState) actionResult {
+ return actionResult{
+ Index: index,
+ Success: false,
+ Error: dialogBlockedStepError(dialogBlockedMessage(tabID, dialog)),
+ Code: dialogBlockedCode,
+ Details: dialogBlockedDetails(tabID, dialog),
+ }
+}
diff --git a/internal/handlers/dialog_blocked_resolution_test.go b/internal/handlers/dialog_blocked_resolution_test.go
index 2bf8524f..843be48f 100644
--- a/internal/handlers/dialog_blocked_resolution_test.go
+++ b/internal/handlers/dialog_blocked_resolution_test.go
@@ -68,7 +68,7 @@ func handlersOverAPendingAlert(t *testing.T) *Handlers {
return New(b, cfg, nil, nil, nil)
}
-func TestAStepWhoseSelectorResolutionTimesOutBehindADialogCarriesTheRemedyOnce(t *testing.T) {
+func TestABatchOverAPendingDialogIsRefusedBeforeAnyStep(t *testing.T) {
h := handlersOverAPendingAlert(t)
for _, tc := range []struct{ name, path, body string }{
{"batch", "/actions", `{"tabId":"` + pendingAlertTab + `","actions":[{"kind":"click","selector":"#c"}]}`},
@@ -83,19 +83,19 @@ func TestAStepWhoseSelectorResolutionTimesOutBehindADialogCarriesTheRemedyOnce(t
} else {
h.HandleActions(rec, req)
}
- var envelope batchEnvelope
+ var envelope struct {
+ Code string `json:"code"`
+ Error string `json:"error"`
+ Details map[string]any `json:"details"`
+ }
if err := json.Unmarshal(rec.Body.Bytes(), &envelope); err != nil {
t.Fatalf("decode: %v: %s", err, rec.Body.String())
}
- if len(envelope.Results) != 1 || envelope.Results[0].Success {
- t.Fatalf("want one failed result: %s", rec.Body.String())
- }
- got := envelope.Results[0].Error
- if !strings.Contains(got, "timed out") || !strings.Contains(got, `"hi"`) {
- t.Fatalf("step error does not name the blocking dialog: %q", got)
+ if rec.Code != http.StatusConflict || envelope.Code != dialogBlockedCode {
+ t.Fatalf("want 409 %s before any step runs, got %d: %s", dialogBlockedCode, rec.Code, rec.Body.String())
}
- if n := strings.Count(got, dialogBlockedStepRemedy); n != 1 {
- t.Fatalf("remedy sentence appears %d times, want 1: %q", n, got)
+ if remedy, _ := envelope.Details["remedy"].(string); !strings.Contains(envelope.Error, `"hi"`) || remedy == "" {
+ t.Fatalf("refusal does not name the dialog with its remedy: %s", rec.Body.String())
}
})
}
diff --git a/internal/handlers/download.go b/internal/handlers/download.go
index 4d102eb2..266d6766 100644
--- a/internal/handlers/download.go
+++ b/internal/handlers/download.go
@@ -117,7 +117,7 @@ func (h *Handlers) enforceDownloadTabPolicy(w http.ResponseWriter, r *http.Reque
httpx.ErrorCode(w, http.StatusLocked, "tab_locked", err.Error(), false, nil)
return false
}
- currentURL, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDomainPolicy|guardHandoffPause)
+ currentURL, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return false
}
diff --git a/internal/handlers/download_test.go b/internal/handlers/download_test.go
index 0345be3d..2dc5a433 100644
--- a/internal/handlers/download_test.go
+++ b/internal/handlers/download_test.go
@@ -23,6 +23,8 @@ type downloadPolicyBridge struct {
hasState bool
}
+func (b *downloadPolicyBridge) GetDialogManager() *bridge.DialogManager { return nil }
+
func (m *downloadPolicyBridge) BrowserContext() context.Context {
ctx, cancel := context.WithCancel(context.Background())
cancel() // cancel immediately - no browser spawned
diff --git a/internal/handlers/evaluate.go b/internal/handlers/evaluate.go
index c7bd9bda..fdc6bacb 100644
--- a/internal/handlers/evaluate.go
+++ b/internal/handlers/evaluate.go
@@ -41,7 +41,7 @@ func (h *Handlers) HandleEvaluate(w http.ResponseWriter, r *http.Request) {
return
}
- ctx, _, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, _, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/find.go b/internal/handlers/find.go
index 1f41d7a2..eddfbf7f 100644
--- a/internal/handlers/find.go
+++ b/internal/handlers/find.go
@@ -68,7 +68,7 @@ func (h *Handlers) HandleFind(w http.ResponseWriter, r *http.Request) {
return
}
- ctxTab, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy)
+ ctxTab, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy)
if !ok {
return
}
diff --git a/internal/handlers/find_test.go b/internal/handlers/find_test.go
index 3b46a61c..186f099d 100644
--- a/internal/handlers/find_test.go
+++ b/internal/handlers/find_test.go
@@ -24,6 +24,7 @@ type findMockBridge struct {
refCache *bridge.RefCache
}
+func (m *findMockBridge) GetDialogManager() *bridge.DialogManager { return nil }
func (m *findMockBridge) EnsureBrowser(cfg *config.RuntimeConfig) error { return nil }
func (m *findMockBridge) RestartBrowser(cfg *config.RuntimeConfig) error { return nil }
diff --git a/internal/handlers/geolocation.go b/internal/handlers/geolocation.go
index 9b833d72..387174b7 100644
--- a/internal/handlers/geolocation.go
+++ b/internal/handlers/geolocation.go
@@ -64,7 +64,7 @@ func (h *Handlers) setGeolocation(w http.ResponseWriter, r *http.Request, req ge
req.Accuracy = 1.0
}
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index 122e8fd0..d3eef0cc 100644
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -334,10 +334,10 @@ type routeBinding struct {
// method so the per-binding handlers can close over the receiver h.
func (h *Handlers) bridgeBindings() []routeBinding {
return []routeBinding{
- {pattern: "POST /navigate", root: h.HandleNavigate, tab: h.HandleTabNavigate, guards: guardHandoffPause},
- {pattern: "POST /back", root: h.HandleBack, tab: h.HandleTabBack, guards: guardHandoffPause},
- {pattern: "POST /forward", root: h.HandleForward, tab: h.HandleTabForward, guards: guardHandoffPause},
- {pattern: "POST /reload", root: h.HandleReload, tab: h.HandleTabReload, guards: guardHandoffPause},
+ {pattern: "POST /navigate", root: h.HandleNavigate, tab: h.HandleTabNavigate, guards: guardDialogBlocked | guardHandoffPause},
+ {pattern: "POST /back", root: h.HandleBack, tab: h.HandleTabBack, guards: guardDialogBlocked | guardHandoffPause},
+ {pattern: "POST /forward", root: h.HandleForward, tab: h.HandleTabForward, guards: guardDialogBlocked | guardHandoffPause},
+ {pattern: "POST /reload", root: h.HandleReload, tab: h.HandleTabReload, guards: guardDialogBlocked | guardHandoffPause},
{pattern: "GET /snapshot", root: h.HandleSnapshot, tab: h.HandleTabSnapshot, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "GET /frame", root: h.HandleFrame, tab: h.HandleTabFrame, guards: guardNone},
{pattern: "POST /frame", root: h.HandleFrame, tab: h.HandleTabFrame, guards: guardNone},
@@ -349,20 +349,20 @@ func (h *Handlers) bridgeBindings() []routeBinding {
{pattern: "GET /url", root: h.HandleURL, tab: h.HandleTabURL, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "GET /html", root: h.HandleHTML, tab: h.HandleTabHTML, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "GET /styles", root: h.HandleStyles, tab: h.HandleTabStyles, guards: guardDialogBlocked | guardDomainPolicy},
- {pattern: "GET /value", root: h.HandleGetValue, tab: h.HandleTabGetValue, guards: guardDomainPolicy},
- {pattern: "GET /attr", root: h.HandleGetAttr, tab: h.HandleTabGetAttr, guards: guardDomainPolicy},
- {pattern: "GET /count", root: h.HandleCount, tab: h.HandleTabCount, guards: guardDomainPolicy},
- {pattern: "GET /box", root: h.HandleGetBox, tab: h.HandleTabGetBox, guards: guardDomainPolicy},
- {pattern: "GET /visible", root: h.HandleGetVisible, tab: h.HandleTabGetVisible, guards: guardDomainPolicy},
- {pattern: "GET /enabled", root: h.HandleGetEnabled, tab: h.HandleTabGetEnabled, guards: guardDomainPolicy},
- {pattern: "GET /checked", root: h.HandleGetChecked, tab: h.HandleTabGetChecked, guards: guardDomainPolicy},
+ {pattern: "GET /value", root: h.HandleGetValue, tab: h.HandleTabGetValue, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "GET /attr", root: h.HandleGetAttr, tab: h.HandleTabGetAttr, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "GET /count", root: h.HandleCount, tab: h.HandleTabCount, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "GET /box", root: h.HandleGetBox, tab: h.HandleTabGetBox, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "GET /visible", root: h.HandleGetVisible, tab: h.HandleTabGetVisible, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "GET /enabled", root: h.HandleGetEnabled, tab: h.HandleTabGetEnabled, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "GET /checked", root: h.HandleGetChecked, tab: h.HandleTabGetChecked, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "GET /pdf", root: h.HandlePDF, tab: h.HandleTabPDF, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "POST /pdf", root: h.HandlePDF, tab: h.HandleTabPDF, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "POST /action", root: h.HandleAction, tab: h.HandleTabAction, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /actions", root: h.HandleActions, tab: h.HandleTabActions, guards: guardDomainPolicy}, // handoff-pause enforced PER STEP inside the batch loop, not as a request gate
+ {pattern: "POST /actions", root: h.HandleActions, tab: h.HandleTabActions, guards: guardDialogBlocked | guardDomainPolicy}, // handoff-pause enforced PER STEP inside the batch loop, not as a request gate; the dialog guard gates the request and is re-checked per step
{pattern: "POST /dialog", root: h.HandleDialog, tab: h.HandleTabDialog, guards: guardHandoffPause},
- {pattern: "POST /wait", root: h.HandleWait, tab: h.HandleTabWait, guards: guardDomainPolicy},
- {pattern: "POST /find", root: h.HandleFind, tab: h.HandleFind, guards: guardDomainPolicy},
+ {pattern: "POST /wait", root: h.HandleWait, tab: h.HandleTabWait, guards: guardDialogBlocked | guardDomainPolicy},
+ {pattern: "POST /find", root: h.HandleFind, tab: h.HandleFind, guards: guardDialogBlocked | guardDomainPolicy},
{pattern: "POST /tab", root: h.HandleTab, guards: guardNone},
{pattern: "POST /close", root: h.HandleClose, tab: h.HandleTabClose, guards: guardNone},
{pattern: "POST /lock", root: h.HandleTabLock, tab: h.HandleTabLockByID, guards: guardNone},
@@ -400,14 +400,14 @@ func (h *Handlers) bridgeBindings() []routeBinding {
{pattern: "POST /fingerprint/rotate", root: h.HandleFingerprintRotate, guards: guardDomainPolicy | guardHandoffPause},
{pattern: "GET /solvers", root: h.HandleListSolvers, guards: guardNone},
{pattern: "GET /config/autosolver", root: h.HandleAutoSolverConfig, guards: guardNone},
- {pattern: "POST /solve", root: h.HandleSolve, tab: h.HandleTabSolve, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /solve/{name}", root: h.HandleSolve, tab: h.HandleTabSolve, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /emulation/viewport", root: h.HandleSetViewport, tab: h.HandleTabSetViewport, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /emulation/geolocation", root: h.HandleSetGeolocation, tab: h.HandleTabSetGeolocation, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /emulation/offline", root: h.HandleSetOffline, tab: h.HandleTabSetOffline, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /emulation/headers", root: h.HandleSetHeaders, tab: h.HandleTabSetHeaders, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /emulation/credentials", root: h.HandleSetCredentials, tab: h.HandleTabSetCredentials, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /emulation/media", root: h.HandleSetMedia, tab: h.HandleTabSetMedia, guards: guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /solve", root: h.HandleSolve, tab: h.HandleTabSolve, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /solve/{name}", root: h.HandleSolve, tab: h.HandleTabSolve, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /emulation/viewport", root: h.HandleSetViewport, tab: h.HandleTabSetViewport, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /emulation/geolocation", root: h.HandleSetGeolocation, tab: h.HandleTabSetGeolocation, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /emulation/offline", root: h.HandleSetOffline, tab: h.HandleTabSetOffline, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /emulation/headers", root: h.HandleSetHeaders, tab: h.HandleTabSetHeaders, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /emulation/credentials", root: h.HandleSetCredentials, tab: h.HandleTabSetCredentials, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /emulation/media", root: h.HandleSetMedia, tab: h.HandleTabSetMedia, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
{pattern: "POST /cache/clear", root: h.HandleCacheClear, guards: guardNone},
{pattern: "GET /cache/status", root: h.HandleCacheStatus, guards: guardNone},
{pattern: "POST /storage", root: h.HandleStorage, tab: h.HandleTabStorageSet, guards: guardDomainPolicy | guardHandoffPause},
@@ -420,10 +420,10 @@ func (h *Handlers) bridgeBindings() []routeBinding {
{pattern: "POST /state/load", root: h.HandleStateLoad, guards: guardDomainPolicy | guardHandoffPause},
{pattern: "DELETE /state", root: h.HandleStateDelete, guards: guardNone},
{pattern: "POST /state/clean", root: h.HandleStateClean, guards: guardNone},
- {pattern: "POST /evaluate", root: h.HandleEvaluate, tab: h.HandleTabEvaluate, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /macro", root: h.HandleMacro, guards: guardDomainPolicy}, // handoff-pause enforced PER STEP inside the macro loop, not as a request gate
- {pattern: "GET /download", root: h.HandleDownload, tab: h.HandleTabDownload, guards: guardDomainPolicy | guardHandoffPause},
- {pattern: "POST /upload", root: h.HandleUpload, tab: h.HandleTabUpload, guards: guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /evaluate", root: h.HandleEvaluate, tab: h.HandleTabEvaluate, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /macro", root: h.HandleMacro, guards: guardDialogBlocked | guardDomainPolicy}, // handoff-pause enforced PER STEP inside the macro loop, not as a request gate
+ {pattern: "GET /download", root: h.HandleDownload, tab: h.HandleTabDownload, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
+ {pattern: "POST /upload", root: h.HandleUpload, tab: h.HandleTabUpload, guards: guardDialogBlocked | guardDomainPolicy | guardHandoffPause},
{pattern: "GET /screencast", root: h.HandleScreencast, guards: guardDomainPolicy},
{pattern: "GET /screencast/tabs", root: h.HandleScreencastAll, guards: guardNone},
{pattern: "POST /record/start", root: h.HandleRecordStart, guards: guardNone},
diff --git a/internal/handlers/headers.go b/internal/handlers/headers.go
index f419d9c4..f9b58670 100644
--- a/internal/handlers/headers.go
+++ b/internal/handlers/headers.go
@@ -48,7 +48,7 @@ func (h *Handlers) setHeaders(w http.ResponseWriter, r *http.Request, req header
return
}
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/history.go b/internal/handlers/history.go
index 13783d03..7f7b3749 100644
--- a/internal/handlers/history.go
+++ b/internal/handlers/history.go
@@ -33,7 +33,7 @@ func (h *Handlers) handleHistoryNav(w http.ResponseWriter, r *http.Request,
}
tabID := r.URL.Query().Get("tabId")
dismissBanners := historyDismissBannersFlag(r)
- ctx, resolvedID, ok := h.guardedTabContext(w, r, tabID, guardHandoffPause)
+ ctx, resolvedID, ok := h.guardedTabContext(w, r, tabID, guardDialogBlocked|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/inspect_lifecycle.go b/internal/handlers/inspect_lifecycle.go
index 10bb12c4..03aae650 100644
--- a/internal/handlers/inspect_lifecycle.go
+++ b/internal/handlers/inspect_lifecycle.go
@@ -92,7 +92,7 @@ func (h *Handlers) inspectElement(w http.ResponseWriter, r *http.Request, tabID
return
}
- ctx, resolvedTabID, ok := h.guardedTabContextWithHeader(w, r, tabID, guardDomainPolicy)
+ ctx, resolvedTabID, ok := h.guardedTabContextWithHeader(w, r, tabID, guardDialogBlocked|guardDomainPolicy)
if !ok {
return
}
diff --git a/internal/handlers/media.go b/internal/handlers/media.go
index 818ada1b..70c4e01e 100644
--- a/internal/handlers/media.go
+++ b/internal/handlers/media.go
@@ -53,7 +53,7 @@ func (h *Handlers) setMedia(w http.ResponseWriter, r *http.Request, req mediaReq
return
}
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/navigation.go b/internal/handlers/navigation.go
index 0c071c7a..15a50a18 100644
--- a/internal/handlers/navigation.go
+++ b/internal/handlers/navigation.go
@@ -435,7 +435,7 @@ func (h *Handlers) executeNavigate(w http.ResponseWriter, r *http.Request, req n
WriteTabContextError(w, err, 404)
return
}
- if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardHandoffPause); !ok {
+ if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDialogBlocked|guardHandoffPause); !ok {
return
}
// Navigate signals fresh work on this tab — drop any pending auto-close
diff --git a/internal/handlers/offline.go b/internal/handlers/offline.go
index 25ff0e8a..43aa86fc 100644
--- a/internal/handlers/offline.go
+++ b/internal/handlers/offline.go
@@ -55,7 +55,7 @@ func (h *Handlers) setOffline(w http.ResponseWriter, r *http.Request, req offlin
req.UploadThroughput = -1
}
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/solver.go b/internal/handlers/solver.go
index 78755ff4..efee7479 100644
--- a/internal/handlers/solver.go
+++ b/internal/handlers/solver.go
@@ -75,7 +75,7 @@ func (h *Handlers) HandleSolve(w http.ResponseWriter, r *http.Request) {
return
}
- if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDomainPolicy|guardHandoffPause); !ok {
+ if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause); !ok {
return
}
diff --git a/internal/handlers/tab_guards_test.go b/internal/handlers/tab_guards_test.go
index dc7c84c2..ac986f0c 100644
--- a/internal/handlers/tab_guards_test.go
+++ b/internal/handlers/tab_guards_test.go
@@ -483,3 +483,148 @@ func TestRootStorageMethodDispatchSplitsTheGuard(t *testing.T) {
})
}
}
+
+var mustDeclareDialogGuard = []string{
+ "POST /navigate", "POST /back", "POST /forward", "POST /reload",
+ "GET /snapshot", "GET /screenshot", "GET /annotate", "GET /capture", "GET /text", "GET /title", "GET /url", "GET /html", "GET /styles",
+ "GET /value", "GET /attr", "GET /count", "GET /box", "GET /visible", "GET /enabled", "GET /checked",
+ "GET /pdf", "POST /pdf", "GET /timing", "GET /a11y/audit",
+ "POST /action", "POST /actions", "POST /macro", "POST /wait", "POST /find", "POST /evaluate",
+ "POST /upload", "POST /solve", "POST /solve/{name}", "GET /download",
+ "POST /emulation/viewport", "POST /emulation/geolocation", "POST /emulation/offline",
+ "POST /emulation/headers", "POST /emulation/credentials", "POST /emulation/media",
+}
+
+var dialogGuardAllowList = map[string]string{
+ "POST /dialog": "dialog",
+ "GET /frame": "frame",
+ "POST /frame": "frame",
+ "POST /tab": "tabs",
+ "POST /close": "tabs",
+ "POST /lock": "tabs",
+ "POST /unlock": "tabs",
+ "POST /handoff": "handoff",
+ "POST /resume": "handoff",
+ "GET /handoff": "handoff",
+ "POST /audit/page": "own-tab",
+ "POST /audit": "own-tab",
+ "POST /scrape": "own-tab",
+ "GET /cookies": "browser-side",
+ "POST /cookies": "browser-side",
+ "DELETE /cookies": "browser-side",
+ "GET /metrics": "browser-side",
+ "GET /network/route": "browser-side",
+ "POST /network/route": "browser-side",
+ "DELETE /network/route": "browser-side",
+ "POST /cache/clear": "browser-side",
+ "GET /cache/status": "browser-side",
+ "GET /stealth/status": "browser-side",
+ "GET /solvers": "browser-side",
+ "GET /config/autosolver": "browser-side",
+ "GET /screencast/tabs": "browser-side",
+ "GET /record/status": "browser-side",
+ "GET /state/list": "browser-side",
+ "GET /state/show": "browser-side",
+ "DELETE /state": "browser-side",
+ "POST /state/clean": "browser-side",
+ "GET /network": "buffer",
+ "GET /network/stream": "buffer",
+ "GET /network/export": "buffer",
+ "GET /network/export/stream": "buffer",
+ "GET /network/{requestId}": "buffer",
+ "POST /network/clear": "buffer",
+ "GET /console": "buffer",
+ "POST /console/clear": "buffer",
+ "GET /errors": "buffer",
+ "POST /errors/clear": "buffer",
+ "GET /clipboard/read": "unprobed",
+ "POST /clipboard/write": "unprobed",
+ "POST /clipboard/copy": "unprobed",
+ "GET /clipboard/paste": "unprobed",
+ "POST /fingerprint/rotate": "unprobed",
+ "GET /storage": "unprobed",
+ "POST /storage": "unprobed",
+ "DELETE /storage": "unprobed",
+ "GET /state": "unprobed",
+ "POST /state/save": "unprobed",
+ "POST /state/load": "unprobed",
+ "GET /screencast": "unprobed",
+ "POST /record/start": "unprobed",
+ "POST /record/stop": "unprobed",
+}
+
+func TestEveryBindingIsPlacedForTheDialogGuard(t *testing.T) {
+ must := map[string]bool{}
+ for _, route := range mustDeclareDialogGuard {
+ must[route] = true
+ if _, listed := dialogGuardAllowList[route]; listed {
+ t.Errorf("%s is both in the must-declare set and the allow-list", route)
+ }
+ }
+ seen := map[string]bool{}
+ for _, b := range (*Handlers)(nil).bridgeBindings() {
+ seen[b.pattern] = true
+ declared := b.guards&guardDialogBlocked != 0
+ reason, allowed := dialogGuardAllowList[b.pattern]
+ switch {
+ case must[b.pattern] && !declared:
+ t.Errorf("%s drives the page through CDP but does not declare guardDialogBlocked", b.pattern)
+ case allowed && declared:
+ t.Errorf("%s declares guardDialogBlocked but is allow-listed (%s); move it to the must-declare set", b.pattern, reason)
+ case allowed && reason == "":
+ t.Errorf("%s is allow-listed without a reason", b.pattern)
+ case !must[b.pattern] && !allowed:
+ t.Errorf("%s is in neither the must-declare set nor the allow-list; place it with a one-word reason", b.pattern)
+ }
+ }
+ for route := range must {
+ if !seen[route] {
+ t.Errorf("must-declare route %s has no binding", route)
+ }
+ }
+ for route := range dialogGuardAllowList {
+ if !seen[route] {
+ t.Errorf("allow-listed route %s has no binding", route)
+ }
+ }
+}
+
+type dialogMidBatchBridge struct {
+ mockBridge
+ dialogs *bridge.DialogManager
+}
+
+func (b *dialogMidBatchBridge) GetDialogManager() *bridge.DialogManager { return b.dialogs }
+
+func (b *dialogMidBatchBridge) ExecuteAction(context.Context, string, bridge.ActionRequest) (map[string]any, error) {
+ b.dialogs.SetPending("tab1", &bridge.DialogState{Type: "alert", Message: "opened by step 1"})
+ return map[string]any{"ok": true}, nil
+}
+
+func TestActionsBatchStopsOnADialogOpenedMidRun(t *testing.T) {
+ b := &dialogMidBatchBridge{dialogs: bridge.NewDialogManager()}
+ h := New(b, &config.RuntimeConfig{ActionTimeout: time.Second}, nil, nil, nil)
+ body := `{"actions":[{"kind":"press","key":"Enter"},{"kind":"press","key":"Enter"},{"kind":"press","key":"Enter"}]}`
+ req := httptest.NewRequest("POST", "/actions", strings.NewReader(body))
+ req.Header.Set("Content-Type", "application/json")
+ w := httptest.NewRecorder()
+ h.HandleActions(w, req)
+
+ var resp struct {
+ Results []actionResult `json:"results"`
+ Total int `json:"total"`
+ }
+ if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+ t.Fatalf("decode: %v\n%s", err, w.Body.String())
+ }
+ if w.Code != http.StatusOK || len(resp.Results) != 2 || resp.Total != 3 {
+ t.Fatalf("status=%d results=%d total=%d, want 200 with the run stopped after the second step\n%s", w.Code, len(resp.Results), resp.Total, w.Body.String())
+ }
+ if !resp.Results[0].Success {
+ t.Errorf("step 1 should have run: %+v", resp.Results[0])
+ }
+ second := resp.Results[1]
+ if second.Success || second.Code != dialogBlockedCode || second.Details["remedy"] == nil || !strings.Contains(second.Error, "opened by step 1") {
+ t.Errorf("step 2 = %+v, want a failed step carrying %s with the remedy", second, dialogBlockedCode)
+ }
+}
diff --git a/internal/handlers/upload.go b/internal/handlers/upload.go
index d11b1a4f..5fbc4bbd 100644
--- a/internal/handlers/upload.go
+++ b/internal/handlers/upload.go
@@ -194,7 +194,7 @@ func (h *Handlers) HandleUpload(w http.ResponseWriter, r *http.Request) {
httpx.ErrorCode(w, http.StatusLocked, "tab_locked", err.Error(), false, nil)
return
}
- if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDomainPolicy|guardHandoffPause); !ok {
+ if _, ok := h.applyTabGuards(w, r, ctx, resolvedTabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause); !ok {
return
}
diff --git a/internal/handlers/viewport.go b/internal/handlers/viewport.go
index 939784a3..68716bd3 100644
--- a/internal/handlers/viewport.go
+++ b/internal/handlers/viewport.go
@@ -56,7 +56,7 @@ func (h *Handlers) setViewport(w http.ResponseWriter, r *http.Request, req viewp
req.DeviceScaleFactor = 1.0
}
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy|guardHandoffPause)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy|guardHandoffPause)
if !ok {
return
}
diff --git a/internal/handlers/wait.go b/internal/handlers/wait.go
index 4dd9d0aa..85a9d1c8 100644
--- a/internal/handlers/wait.go
+++ b/internal/handlers/wait.go
@@ -173,7 +173,7 @@ func (h *Handlers) handleWaitCore(w http.ResponseWriter, r *http.Request, req wa
return
}
- ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDomainPolicy)
+ ctx, resolvedTabID, ok := h.guardedTabContext(w, r, req.TabID, guardDialogBlocked|guardDomainPolicy)
if !ok {
return
}