Skip to content

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

fix: harden credential listener lifecycle against races and clear/re-set

Mariofa4745f428e1
diff --git a/internal/handlers/credentials.go b/internal/handlers/credentials.go
index b63c0afe..f703dcd2 100644
--- a/internal/handlers/credentials.go
+++ b/internal/handlers/credentials.go
@@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
+ "log/slog"
"net/http"
"sync"
"time"
@@ -53,19 +54,21 @@ func (cs *credentialStore) Delete(tabID string) {
cs.mu.Lock()
defer cs.mu.Unlock()
delete(cs.credentials, tabID)
- delete(cs.listeners, tabID)
+ // Keep listeners[tabID] — the chromedp listener is bound to the tab's
+ // context and survives across clear/re-set cycles. Clearing the flag
+ // here would cause a second listener to be installed on re-set.
}
-func (cs *credentialStore) HasListener(tabID string) bool {
- cs.mu.RLock()
- defer cs.mu.RUnlock()
- return cs.listeners[tabID]
-}
-
-func (cs *credentialStore) MarkListener(tabID string) {
+// MarkListenerIfAbsent atomically marks a listener as installed for tabID.
+// Returns true if this call was the one that set it (i.e., no listener existed).
+func (cs *credentialStore) MarkListenerIfAbsent(tabID string) bool {
cs.mu.Lock()
defer cs.mu.Unlock()
+ if cs.listeners[tabID] {
+ return false
+ }
cs.listeners[tabID] = true
+ return true
}
type credentialsRequest struct {
@@ -172,8 +175,7 @@ func (h *Handlers) setCredentials(w http.ResponseWriter, r *http.Request, req cr
// Install event listener only once per tab. The listener reads credentials
// from the store dynamically, so updating creds doesn't need a new listener.
- if !h.credentialStore.HasListener(resolvedTabID) {
- h.credentialStore.MarkListener(resolvedTabID)
+ if h.credentialStore.MarkListenerIfAbsent(resolvedTabID) {
chromedp.ListenTarget(ctx, func(ev interface{}) {
switch e := ev.(type) {
case *fetch.EventAuthRequired:
@@ -182,19 +184,23 @@ func (h *Handlers) setCredentials(w http.ResponseWriter, r *http.Request, req cr
if !ok {
return
}
- _ = chromedp.Run(ctx, chromedp.ActionFunc(func(innerCtx context.Context) error {
+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(innerCtx context.Context) error {
return fetch.ContinueWithAuth(e.RequestID, &fetch.AuthChallengeResponse{
Response: fetch.AuthChallengeResponseResponseProvideCredentials,
Username: cred.Username,
Password: cred.Password,
}).Do(innerCtx)
- }))
+ })); err != nil {
+ slog.Warn("credentials: ContinueWithAuth failed", "tab", resolvedTabID, "err", err)
+ }
}()
case *fetch.EventRequestPaused:
go func() {
- _ = chromedp.Run(ctx, chromedp.ActionFunc(func(innerCtx context.Context) error {
+ if err := chromedp.Run(ctx, chromedp.ActionFunc(func(innerCtx context.Context) error {
return fetch.ContinueRequest(e.RequestID).Do(innerCtx)
- }))
+ })); err != nil {
+ slog.Warn("credentials: ContinueRequest failed", "tab", resolvedTabID, "err", err)
+ }
}()
}
})
diff --git a/internal/handlers/credentials_test.go b/internal/handlers/credentials_test.go
index dbeadaae..9020f3f9 100644
--- a/internal/handlers/credentials_test.go
+++ b/internal/handlers/credentials_test.go
@@ -118,27 +118,21 @@ func TestHandleTabSetCredentials_NoTab(t *testing.T) {
func TestCredentialStoreListenerDedup(t *testing.T) {
cs := newCredentialStore()
- if cs.HasListener("tab1") {
- t.Fatal("fresh store should have no listeners")
+ if !cs.MarkListenerIfAbsent("tab1") {
+ t.Fatal("first MarkListenerIfAbsent should return true")
}
- cs.MarkListener("tab1")
- if !cs.HasListener("tab1") {
- t.Fatal("expected listener after MarkListener")
+ if cs.MarkListenerIfAbsent("tab1") {
+ t.Fatal("second MarkListenerIfAbsent should return false")
}
- // Mark again — should be idempotent.
- cs.MarkListener("tab1")
- if !cs.HasListener("tab1") {
- t.Fatal("expected listener to persist after second MarkListener")
- }
-
- // Delete clears both credentials and listener tracking.
+ // Delete clears credentials but preserves listener tracking, because the
+ // chromedp listener is bound to the tab context and survives clear/re-set.
cs.Set("tab1", &credentialPair{Username: "u", Password: "p"})
cs.Delete("tab1")
- if cs.HasListener("tab1") {
- t.Fatal("Delete should clear listener tracking")
+ if cs.MarkListenerIfAbsent("tab1") {
+ t.Fatal("MarkListenerIfAbsent should return false after Delete (listener persists)")
}
if _, ok := cs.Get("tab1"); ok {
t.Fatal("Delete should clear credentials")