Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
24 changes: 23 additions & 1 deletion runner/headless.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func NewBrowser(proxy string, useLocal bool, optionalArgs map[string]string) (*B
return engine, nil
}

func (b *Browser) ScreenshotWithBody(url string, timeout time.Duration, idle time.Duration, headers []string, fullPage bool) ([]byte, string, []NetworkRequest, error) {
func (b *Browser) ScreenshotWithBody(url string, timeout time.Duration, idle time.Duration, headers []string, fullPage bool, jsCodes []string) ([]byte, string, []NetworkRequest, error) {
page, err := b.engine.Page(proto.TargetCreateTarget{})
if err != nil {
return nil, "", []NetworkRequest{}, err
Expand Down Expand Up @@ -192,6 +192,13 @@ func (b *Browser) ScreenshotWithBody(url string, timeout time.Duration, idle tim
return nil, "", networkRequests.Slice, err
}

if len(jsCodes) > 0 {
_, err := b.ExecuteJavascriptCodesWithPage(page, jsCodes)
if err != nil {
return nil, "", networkRequests.Slice, err
}
}

page.Timeout(5 * time.Second).WaitNavigation(proto.PageLifecycleEventNameFirstMeaningfulPaint)()

if err := page.WaitLoad(); err != nil {
Expand Down Expand Up @@ -268,3 +275,18 @@ func getSimpleErrorType(errorText, errorType, blockedReason string) string {
}
return "UNKNOWN"
}

func (b *Browser) ExecuteJavascriptCodesWithPage(page *rod.Page, jsc []string) ([]*proto.RuntimeRemoteObject, error) {
outputs := make([]*proto.RuntimeRemoteObject, 0, len(jsc))
for _, js := range jsc {
if js == "" {
continue
}
output, err := page.Eval(js)
if err != nil {
return nil, err
}
outputs = append(outputs, output)
}
return outputs, nil
}
4 changes: 4 additions & 0 deletions runner/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ type Options struct {
Protocol string
OutputFilterErrorPagePath string
DisableStdout bool

JavascriptCodes goflags.StringSlice

// AssetUpload
AssetUpload bool
// AssetName
Expand Down Expand Up @@ -404,6 +407,7 @@ func ParseOptions() *Options {
flagSet.BoolVar(&options.NoScreenshotFullPage, "no-screenshot-full-page", false, "disable saving full page screenshot"),
flagSet.DurationVarP(&options.ScreenshotTimeout, "screenshot-timeout", "st", 10*time.Second, "set timeout for screenshot in seconds"),
flagSet.DurationVarP(&options.ScreenshotIdle, "screenshot-idle", "sid", 1*time.Second, "set idle time before taking screenshot in seconds"),
flagSet.StringSliceVarP(&options.JavascriptCodes, "javascript-code", "jsc", nil, "execute JavaScript code after navigation", goflags.StringSliceOptions),
)

flagSet.CreateGroup("matchers", "Matchers",
Expand Down
13 changes: 10 additions & 3 deletions runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/projectdiscovery/httpx/static"
"github.com/projectdiscovery/mapcidr/asn"
"github.com/projectdiscovery/networkpolicy"
errorutil "github.com/projectdiscovery/utils/errors" //nolint
osutil "github.com/projectdiscovery/utils/os"
"github.com/projectdiscovery/utils/structs"

Expand Down Expand Up @@ -69,6 +68,7 @@ import (
"github.com/projectdiscovery/mapcidr"
"github.com/projectdiscovery/rawhttp"
converstionutil "github.com/projectdiscovery/utils/conversion"
errkit "github.com/projectdiscovery/utils/errkit"
fileutil "github.com/projectdiscovery/utils/file"
pdhttputil "github.com/projectdiscovery/utils/http"
iputil "github.com/projectdiscovery/utils/ip"
Expand Down Expand Up @@ -2243,7 +2243,14 @@ retry:
var pHash uint64
if scanopts.Screenshot {
var err error
screenshotBytes, headlessBody, linkRequest, err = r.browser.ScreenshotWithBody(fullURL, scanopts.ScreenshotTimeout, scanopts.ScreenshotIdle, r.options.CustomHeaders, scanopts.IsScreenshotFullPage())
screenshotBytes, headlessBody, linkRequest, err = r.browser.ScreenshotWithBody(
fullURL,
scanopts.ScreenshotTimeout,
scanopts.ScreenshotIdle,
r.options.CustomHeaders,
scanopts.IsScreenshotFullPage(),
r.options.CustomHeaders,
)
if err != nil {
gologger.Warning().Msgf("Could not take screenshot '%s': %s", fullURL, err)
} else {
Expand Down Expand Up @@ -2507,7 +2514,7 @@ func (r *Runner) HandleFaviconHash(hp *httpx.HTTPX, req *retryablehttp.Request,
func (r *Runner) calculateFaviconHashWithRaw(data []byte) (string, string, error) {
hashNum, md5Hash, err := stringz.FaviconHash(data)
if err != nil {
return "", "", errorutil.NewWithTag("favicon", "could not calculate favicon hash").Wrap(err) //nolint
return "", "", errkit.Wrapf(err, "could not calculate favicon hash")
}
return fmt.Sprintf("%d", hashNum), md5Hash, nil
}
Expand Down
Loading