High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
fix: address security audit findings in network export
Aria2b42810aa0ee
diff --git a/internal/bridge/observe/format_har.go b/internal/bridge/observe/format_har.goindex 5574da98..b6a69c93 100644--- a/internal/bridge/observe/format_har.go+++ b/internal/bridge/observe/format_har.go@@ -19,6 +19,7 @@ type harEncoder struct {creator harCreatorw io.WriterentryCount int+ started bool}type harCreator struct {@@ -26,11 +27,12 @@ type harCreator struct {Version string `json:"version"`}-func (e *harEncoder) ContentType() string { return "application/har+json" }-func (e *harEncoder) FileExtension() string { return ".har" }+func (e *harEncoder) ContentType() string { return "application/har+json" }+func (e *harEncoder) FileExtension() string { return ".har" }func (e *harEncoder) Start(w io.Writer) error {e.w = w+ e.started = trueheader := fmt.Sprintf(`{"log":{"version":"1.2","creator":%s,"entries":[`,mustMarshal(e.creator),@@ -40,6 +42,9 @@ func (e *harEncoder) Start(w io.Writer) error {}func (e *harEncoder) Encode(entry ExportEntry) error {+ if !e.started {+ return fmt.Errorf("encoder not started")+ }if e.entryCount > 0 {if _, err := io.WriteString(e.w, ","); err != nil {return err@@ -49,12 +54,17 @@ func (e *harEncoder) Encode(entry ExportEntry) error {if err != nil {return err}- _, err = e.w.Write(data)+ if _, err := e.w.Write(data); err != nil {+ return err+ }e.entryCount++- return err+ return nil}func (e *harEncoder) Finish() error {+ if !e.started {+ return fmt.Errorf("encoder not started")+ }_, err := io.WriteString(e.w, "]}}\n")return err}diff --git a/internal/bridge/observe/format_ndjson.go b/internal/bridge/observe/format_ndjson.goindex d05ef5ed..27d8f8db 100644--- a/internal/bridge/observe/format_ndjson.go+++ b/internal/bridge/observe/format_ndjson.go@@ -2,6 +2,7 @@ package observeimport ("encoding/json"+ "fmt""io")@@ -13,19 +14,24 @@ func init() {// ndjsonEncoder writes one JSON object per line (Newline Delimited JSON).type ndjsonEncoder struct {- enc *json.Encoder+ enc *json.Encoder+ started bool}-func (e *ndjsonEncoder) ContentType() string { return "application/x-ndjson" }-func (e *ndjsonEncoder) FileExtension() string { return ".ndjson" }+func (e *ndjsonEncoder) ContentType() string { return "application/x-ndjson" }+func (e *ndjsonEncoder) FileExtension() string { return ".ndjson" }func (e *ndjsonEncoder) Start(w io.Writer) error {e.enc = json.NewEncoder(w)e.enc.SetEscapeHTML(false)+ e.started = truereturn nil}func (e *ndjsonEncoder) Encode(entry ExportEntry) error {+ if !e.started {+ return fmt.Errorf("encoder not started")+ }return e.enc.Encode(entry)}diff --git a/internal/bridge/observe/network_export.go b/internal/bridge/observe/network_export.goindex 81c3edc9..30d83ec8 100644--- a/internal/bridge/observe/network_export.go+++ b/internal/bridge/observe/network_export.go@@ -8,6 +8,7 @@ import ("sync")+// ---------------------------------------------------------------------------// ExportEncoder — pluggable format interface// ---------------------------------------------------------------------------@@ -46,10 +47,11 @@ var ()// RegisterFormat registers an export format. Called from init() in format files.+// Names are normalized to lowercase for case-insensitive lookup.func RegisterFormat(name string, factory ExportEncoderFactory) {formatsMu.Lock()defer formatsMu.Unlock()- formats[name] = factory+ formats[strings.ToLower(name)] = factory}// GetFormat returns the factory for a named format, or nil if not found.@@ -235,6 +237,27 @@ func computeTimings(entry NetworkEntry) ExportTimings {return ExportTimings{Send: send, Wait: wait, Receive: receive}}+// sensitiveHeaderNames are headers that contain credentials or session tokens.+// They are redacted by default in exports to prevent accidental data leakage.+var sensitiveHeaderNames = map[string]bool{+ "cookie": true,+ "set-cookie": true,+ "authorization": true,+ "proxy-authorization": true,+ "x-api-key": true,+ "x-csrf-token": true,+}++// RedactSensitiveHeaders replaces the values of credential-bearing headers with [REDACTED].+func RedactSensitiveHeaders(pairs []NameValuePair) []NameValuePair {+ for i := range pairs {+ if sensitiveHeaderNames[strings.ToLower(pairs[i].Name)] {+ pairs[i].Value = "[REDACTED]"+ }+ }+ return pairs+}+func contentTypeFromHeaders(headers map[string]string) string {for k, v := range headers {if strings.EqualFold(k, "content-type") {diff --git a/internal/handlers/network_export.go b/internal/handlers/network_export.goindex 18bd0567..3743bf4d 100644--- a/internal/handlers/network_export.go+++ b/internal/handlers/network_export.go@@ -1,18 +1,25 @@package handlersimport (+ "context"+ "encoding/json""fmt""net/http""os""path/filepath""strconv"+ "strings""time"+ "unicode/utf8""github.com/pinchtab/pinchtab/internal/bridge""github.com/pinchtab/pinchtab/internal/bridge/observe""github.com/pinchtab/pinchtab/internal/httpx")+// maxExportBodyBytes caps the size of a single response body included in an export.+const maxExportBodyBytes = 10 << 20 // 10 MB+// HandleNetworkExport exports captured network data in a registered format (HAR, NDJSON, etc.).//// @Endpoint GET /network/export@@ -23,6 +30,7 @@ import (// @Param output string query "file" to save to disk (optional)// @Param path string query Filename when output=file (optional, auto-generated if omitted)// @Param body string query "true" to include response bodies (can be slow)+// @Param redact string query "false" to include sensitive headers like cookies (default: redacted)// @Param filter string query URL pattern filter// @Param method string query HTTP method filter// @Param status string query Status code range filter (e.g. "4xx")@@ -32,6 +40,7 @@ import (// @Response 200 application/har+json|application/x-ndjson Exported data (streamed)// @Response 200 application/json File save result when output=file// @Response 400 application/json Invalid format or parameters+// @Response 423 application/json Tab is locked// @Response 500 application/json Export errorfunc (h *Handlers) HandleNetworkExport(w http.ResponseWriter, r *http.Request) {if err := h.ensureChrome(); err != nil {@@ -49,6 +58,16 @@ func (h *Handlers) HandleNetworkExport(w http.ResponseWriter, r *http.Request) {return}+ // Tab lease enforcement (#12)+ owner := resolveOwner(r, "")+ if err := h.enforceTabLease(resolvedTabID, owner); err != nil {+ httpx.ErrorCode(w, http.StatusLocked, "tab_locked", err.Error(), false, nil)+ return+ }++ // Activity recording (#13)+ h.recordReadRequest(r, "network-export", resolvedTabID)+// Resolve format from registryformatName := r.URL.Query().Get("format")if formatName == "" {@@ -67,10 +86,11 @@ func (h *Handlers) HandleNetworkExport(w http.ResponseWriter, r *http.Request) {// Get network entriesnm := h.Bridge.NetworkMonitor()if nm == nil {- // No monitor — export emptyenc := factory("PinchTab", h.version())w.Header().Set("Content-Type", enc.ContentType())- _ = enc.Start(w)+ if err := enc.Start(w); err != nil {+ return+ }_ = enc.Finish()return}@@ -92,17 +112,33 @@ func (h *Handlers) HandleNetworkExport(w http.ResponseWriter, r *http.Request) {}includeBody := r.URL.Query().Get("body") == "true"+ redactHeaders := r.URL.Query().Get("redact") != "false"output := r.URL.Query().Get("output")+ // Timeout + client disconnect for body fetches (#4, #5)+ fetchCtx, fetchCancel := context.WithTimeout(tabCtx, h.Config.ActionTimeout)+ defer fetchCancel()+ go httpx.CancelOnClientDone(r.Context(), fetchCancel)+// Convert entriesexportEntries := make([]observe.ExportEntry, 0, len(entries))for _, entry := range entries {var body stringvar b64 boolif includeBody && entry.Finished && !entry.Failed {- body, b64, _ = nm.GetResponseBody(tabCtx, entry.RequestID)+ body, b64, _ = nm.GetResponseBody(fetchCtx, entry.RequestID)+ // Cap body size (#3)+ if len(body) > maxExportBodyBytes {+ body = ""+ b64 = false+ }}- exportEntries = append(exportEntries, observe.NetworkEntryToExport(entry, body, b64))+ e := observe.NetworkEntryToExport(entry, body, b64)+ if redactHeaders {+ e.Request.Headers = observe.RedactSensitiveHeaders(e.Request.Headers)+ e.Response.Headers = observe.RedactSensitiveHeaders(e.Response.Headers)+ }+ exportEntries = append(exportEntries, e)}enc := factory("PinchTab", h.version())@@ -140,13 +176,24 @@ func (h *Handlers) writeExportFile(userPath = fmt.Sprintf("network-%s%s", ts, enc.FileExtension())}- dir := filepath.Join(h.Config.StateDir, "exports")- if err := os.MkdirAll(dir, 0750); err != nil {+ // Path safety: use SafeCreatePath + containment check (#1)+ exportDir := filepath.Join(h.Config.StateDir, "exports")+ if err := os.MkdirAll(exportDir, 0750); err != nil {return fmt.Errorf("create dir: %w", err)}- finalPath := filepath.Join(dir, filepath.Base(userPath))- tmpPath := finalPath + ".tmp"+ safeName := filepath.Base(userPath)+ finalPath, err := httpx.SafeCreatePath(exportDir, safeName)+ if err != nil {+ return fmt.Errorf("invalid path: %w", err)+ }+ absBase, _ := filepath.Abs(exportDir)+ absPath, err := filepath.Abs(finalPath)+ if err != nil || !strings.HasPrefix(absPath, absBase+string(filepath.Separator)) {+ return fmt.Errorf("path escapes export directory")+ }++ tmpPath := absPath + ".tmp"f, err := os.OpenFile(tmpPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)if err != nil {@@ -175,13 +222,13 @@ func (h *Handlers) writeExportFile(return err}- if err := os.Rename(tmpPath, finalPath); err != nil {+ if err := os.Rename(tmpPath, absPath); err != nil {os.Remove(tmpPath)return err}httpx.JSON(w, 200, map[string]any{- "path": finalPath,+ "path": absPath,"entries": len(entries),"format": formatName,})@@ -197,9 +244,11 @@ func (h *Handlers) writeExportFile(// @Param format string query Export format (default: har)// @Param path string query Output filename (required)// @Param body string query "true" to include response bodies+// @Param redact string query "false" to include sensitive headers (default: redacted)// @Param filter... (same as HandleNetworkExport)//// @Response 200 text/event-stream SSE progress events+// @Response 423 application/json Tab is lockedfunc (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Request) {if err := h.ensureChrome(); err != nil {httpx.Error(w, 500, fmt.Errorf("chrome initialization: %w", err))@@ -222,6 +271,14 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requreturn}+ owner := resolveOwner(r, "")+ if err := h.enforceTabLease(resolvedTabID, owner); err != nil {+ httpx.ErrorCode(w, http.StatusLocked, "tab_locked", err.Error(), false, nil)+ return+ }++ h.recordReadRequest(r, "network-export-stream", resolvedTabID)+formatName := r.URL.Query().Get("format")if formatName == "" {formatName = "har"@@ -253,16 +310,32 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requ}includeBody := r.URL.Query().Get("body") == "true"+ redactHeaders := r.URL.Query().Get("redact") != "false"filter := parseNetworkFilter(r)- // Open file- dir := filepath.Join(h.Config.StateDir, "exports")- if err := os.MkdirAll(dir, 0750); err != nil {+ // Path safety (#1)+ exportDir := filepath.Join(h.Config.StateDir, "exports")+ if err := os.MkdirAll(exportDir, 0750); err != nil {httpx.Error(w, 500, fmt.Errorf("create dir: %w", err))return}- finalPath := filepath.Join(dir, filepath.Base(userPath))- f, err := os.OpenFile(finalPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)++ safeName := filepath.Base(userPath)+ safePath, err := httpx.SafeCreatePath(exportDir, safeName)+ if err != nil {+ httpx.Error(w, 400, fmt.Errorf("invalid path: %w", err))+ return+ }+ absBase, _ := filepath.Abs(exportDir)+ absPath, err := filepath.Abs(safePath)+ if err != nil || !strings.HasPrefix(absPath, absBase+string(filepath.Separator)) {+ httpx.Error(w, 400, fmt.Errorf("path escapes export directory"))+ return+ }++ // Write to temp file, rename on finish (#8)+ tmpPath := absPath + ".tmp"+ f, err := os.OpenFile(tmpPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)if err != nil {httpx.Error(w, 500, fmt.Errorf("create file: %w", err))return@@ -271,6 +344,7 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requenc := factory("PinchTab", h.version())if err := enc.Start(f); err != nil {f.Close()+ os.Remove(tmpPath)httpx.Error(w, 500, fmt.Errorf("start encoder: %w", err))return}@@ -282,8 +356,9 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requ// SSE setupflusher, ok := w.(http.Flusher)if !ok {- enc.Finish()+ _ = enc.Finish()f.Close()+ os.Remove(tmpPath)httpx.Error(w, 500, fmt.Errorf("streaming not supported"))return}@@ -293,24 +368,36 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requw.Header().Set("Connection", "keep-alive")w.Header().Set("X-Accel-Buffering", "no")+ // Clear write deadline for long-lived SSE (#7)+ _ = http.NewResponseController(w).SetWriteDeadline(time.Time{})+count := 0keepalive := time.NewTicker(15 * time.Second)defer keepalive.Stop()+ finalize := func() {+ _ = enc.Finish()+ f.Close()+ // Atomic rename on success (#8)+ if count > 0 {+ os.Rename(tmpPath, absPath)+ } else {+ os.Remove(tmpPath)+ }+ }+for {select {case <-r.Context().Done():- _ = enc.Finish()- f.Close()- fmt.Fprintf(w, "event: done\ndata: {\"entries\":%d,\"path\":%q}\n\n", count, finalPath)- flusher.Flush()+ finalize()+ // Don't write to ResponseWriter after client disconnect (#6)returncase entry, ok := <-ch:if !ok {- _ = enc.Finish()- f.Close()- fmt.Fprintf(w, "event: done\ndata: {\"entries\":%d,\"path\":%q}\n\n", count, finalPath)+ finalize()+ data, _ := json.Marshal(map[string]any{"entries": count, "path": absPath})+ fmt.Fprintf(w, "event: done\ndata: %s\n\n", data)flusher.Flush()return}@@ -321,15 +408,23 @@ func (h *Handlers) HandleNetworkExportStream(w http.ResponseWriter, r *http.Requvar b64 boolif includeBody && entry.Finished && !entry.Failed {body, b64, _ = nm.GetResponseBody(tabCtx, entry.RequestID)+ if len(body) > maxExportBodyBytes {+ body = ""+ b64 = false+ }}export := observe.NetworkEntryToExport(entry, body, b64)+ if redactHeaders {+ export.Request.Headers = observe.RedactSensitiveHeaders(export.Request.Headers)+ export.Response.Headers = observe.RedactSensitiveHeaders(export.Response.Headers)+ }if err := enc.Encode(export); err != nil {- _ = enc.Finish()- f.Close()+ finalize()return}count++- fmt.Fprintf(w, "event: export\ndata: {\"entries\":%d,\"url\":%q}\n\n", count, truncateURL(entry.URL))+ data, _ := json.Marshal(map[string]any{"entries": count, "url": safetruncateURL(entry.URL)})+ fmt.Fprintf(w, "event: export\ndata: %s\n\n", data)flusher.Flush()case <-keepalive.C:@@ -394,9 +489,17 @@ func (h *Handlers) version() string {return "dev"}-func truncateURL(u string) string {- if len(u) > 120 {- return u[:120]+// safetruncateURL truncates at a valid UTF-8 boundary (#21).+func safetruncateURL(u string) string {+ const maxLen = 120+ if len(u) <= maxLen {+ return u}- return u+ for i := maxLen; i > 0; i-- {+ if utf8.RuneStart(u[i]) {+ return u[:i]+ }+ }+ return u[:maxLen]}+diff --git a/internal/strategy/explicit/explicit.go b/internal/strategy/explicit/explicit.goindex b50a8761..4e5db42c 100644--- a/internal/strategy/explicit/explicit.go+++ b/internal/strategy/explicit/explicit.go@@ -53,7 +53,7 @@ func (s *Strategy) RegisterRoutes(mux *http.ServeMux) {"POST /find","GET /solvers","POST /solve", "POST /solve/{name}",- "GET /network", "GET /network/stream", "GET /network/export", "GET /network/export/stream", "POST /network/clear",+ "GET /network", "GET /network/stream", "GET /network/export", "GET /network/export/stream", "GET /network/{requestId}", "POST /network/clear",}for _, route := range shorthandRoutes {mux.HandleFunc(route, s.proxyToFirst)diff --git a/internal/strategy/noinstance/noinstance.go b/internal/strategy/noinstance/noinstance.goindex 8d5e2c43..996c7da8 100644--- a/internal/strategy/noinstance/noinstance.go+++ b/internal/strategy/noinstance/noinstance.go@@ -49,6 +49,7 @@ func (s *Strategy) RegisterRoutes(mux *http.ServeMux) {"POST /find","GET /solvers","POST /solve", "POST /solve/{name}",+ "GET /network", "GET /network/stream", "GET /network/export", "GET /network/export/stream", "GET /network/{requestId}", "POST /network/clear",}for _, route := range shorthandRoutes {mux.HandleFunc(route, s.proxyToFirst)