Skip to content

fix(headless): merge extra headers #6376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehsandeep merged 2 commits into from
Aug 15, 2025
Merged

fix(headless): merge extra headers #6376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fc2cc2
headless: fix extra headers overwrite
ysokolovsky Aug 11, 2025
ccc0e01
headless: set Accept-Language when no custom headers
ysokolovsky Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions pkg/protocols/headless/engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ import (

// Browser is a browser structure for nuclei headless module
type Browser struct {
customAgent string
tempDir string
previousPIDs map[int32]struct{} // track already running PIDs
engine *rod.Browser
options *types.Options
launcher *launcher.Launcher
customAgent string
defaultHeaders map[string]string
tempDir string
previousPIDs map[int32]struct{} // track already running PIDs
engine *rod.Browser
options *types.Options
launcher *launcher.Launcher

// use getHTTPClient to get the http client
httpClient *http.Client
Expand Down Expand Up @@ -95,6 +96,7 @@ func New(options *types.Options) (*Browser, error) {
if browserErr := browser.Connect(); browserErr != nil {
return nil, browserErr
}
defaultHeaders := make(map[string]string)
customAgent := ""
for _, option := range options.CustomHeaders {
parts := strings.SplitN(option, ":", 2)
Expand All @@ -103,12 +105,20 @@ func New(options *types.Options) (*Browser, error) {
}
if strings.EqualFold(parts[0], "User-Agent") {
customAgent = parts[1]
} else {
k := strings.TrimSpace(parts[0])
v := strings.TrimSpace(parts[1])
if k == "" || v == "" {
continue
}
defaultHeaders[k] = v
}
}

engine := &Browser{
tempDir: dataStore,
customAgent: customAgent,
defaultHeaders: defaultHeaders,
engine: browser,
options: options,
httpClientOnce: &sync.Once{},
Expand All @@ -135,6 +145,19 @@ func (b *Browser) UserAgent() string {
return b.customAgent
}

func (b *Browser) applyDefaultHeaders(p *rod.Page) error {
if len(b.defaultHeaders) == 0 {
return nil
}
pairs := make([]string, 0, len(b.defaultHeaders)*2)
pairs = append(pairs, "Accept-Language", "en, en-GB, en-us;")
for k, v := range b.defaultHeaders {
pairs = append(pairs, k, v)
}
_, err := p.SetExtraHeaders(pairs)
return err
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
coderabbitai[bot] marked this conversation as resolved.

func (b *Browser) getHTTPClient() (*http.Client, error) {
var err error
b.httpClientOnce.Do(func() {
Expand Down
8 changes: 4 additions & 4 deletions pkg/protocols/headless/engine/page.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ func (i *Instance) Run(ctx *contextargs.Context, actions []*Action, payloads map
}
page = page.Timeout(options.Timeout)

if err = i.browser.applyDefaultHeaders(page); err != nil {
return nil, nil, err
}

Comment on lines +64 to +67

@coderabbitai coderabbitai Bot Aug 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Good placement; ensure Accept-Language still applies with no custom headers.

Calling applyDefaultHeaders right after setting Timeout is correct. With the current engine implementation, Accept-Language won’t be set if defaultHeaders is empty (regression). Please merge the engine.go fix to always apply Accept-Language unless the user provided one.

To confirm coverage and avoid missed call sites:

🏁 Script executed:

#!/bin/bash
# Find all Page creations and check that default headers are applied.
rg -n 'Page\s*\(\s*proto\.TargetCreateTarget' -A2
rg -n 'SetExtraHeaders\s*\(' -A2

Length of output: 487

All page creation sites covered; merge Accept-Language fix

The placement of applyDefaultHeaders immediately after setting Timeout in page.go is correct and covers all page creation calls. However, until the engine patch is merged, Accept-Language won’t be applied when defaultHeaders is empty.

Key locations checked:

  • Page creation in pkg/protocols/headless/engine/page.go:58
  • SetExtraHeaders call in pkg/protocols/headless/engine/engine.go:157–159

Action required:

  • Merge the fix in engine.go to ensure Accept-Language is always set unless explicitly overridden by the user.
🤖 Prompt for AI Agents 
In pkg/protocols/headless/engine/page.go around lines 64 to 67,
applyDefaultHeaders is correctly placed but currently Accept-Language is not
applied when defaultHeaders is empty; merge the fix from
pkg/protocols/headless/engine/engine.go (around lines 157–159) into the codebase
so that SetExtraHeaders ensures Accept-Language is always added unless the user
explicitly sets it—update SetExtraHeaders logic to insert Accept-Language into
headers when missing (or when defaultHeaders is empty) before it’s passed to
applyDefaultHeaders and ensure the merged change is used by page creation paths.

if i.browser.customAgent != "" {
if userAgentErr := page.SetUserAgent(&proto.NetworkSetUserAgentOverride{UserAgent: i.browser.customAgent}); userAgentErr != nil {
return nil, nil, userAgentErr
Expand Down Expand Up @@ -130,10 +134,6 @@ func (i *Instance) Run(ctx *contextargs.Context, actions []*Action, payloads map
return nil, nil, err
}

if _, err := page.SetExtraHeaders([]string{"Accept-Language", "en, en-GB, en-us;"}); err != nil {
return nil, nil, err
}

// inject cookies
// each http request is performed via the native go http client
// we first inject the shared cookies
Expand Down