Fix loading script from file and evaluate as devtools for chromedp

sensepost · Jan 21, 2025 · b45513c · b45513c
1 parent db5d3fc
commit b45513c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 29 deletions.
diff --git a/cmd/scan.go b/cmd/scan.go
@@ -54,20 +54,6 @@ flags.`)),
 		logger := slog.New(log.Logger)
 
 		// Configure the driver
-		switch opts.Scan.Driver {
-		case "gorod":
-			scanDriver, err = driver.NewGorod(logger, *opts)
-			if err != nil {
-				return err
-			}
-		case "chromedp":
-			scanDriver, err = driver.NewChromedp(logger, *opts)
-			if err != nil {
-				return err
-			}
-		default:
-			return errors.New("invalid scan driver chosen")
-		}
 
 		log.Debug("scanning driver started", "driver", opts.Scan.Driver)
 
@@ -118,11 +104,28 @@ flags.`)),
 		}
 
 		// Get the runner up. Basically, all of the subcommands will use this.
-		scanRunner, err = runner.NewRunner(logger, scanDriver, *opts, scanWriters)
+		scanRunner, err = runner.NewRunner(logger, opts, scanWriters)
 		if err != nil {
 			return err
 		}
 
+		switch opts.Scan.Driver {
+		case "gorod":
+			scanDriver, err = driver.NewGorod(logger, *opts)
+			if err != nil {
+				return err
+			}
+		case "chromedp":
+			scanDriver, err = driver.NewChromedp(logger, *opts)
+			if err != nil {
+				return err
+			}
+		default:
+			return errors.New("invalid scan driver chosen")
+		}
+
+		scanRunner.Driver = scanDriver
+
 		return nil
 		// TODO: maybe add https://github.com/projectdiscovery/networkpolicy support?
 	},

diff --git a/pkg/runner/drivers/chromedp.go b/pkg/runner/drivers/chromedp.go
@@ -351,9 +351,12 @@ func (run *Chromedp) Witness(target string, thisRunner *runner.Runner) (*models.
 
 	// run any javascript we have
 	if run.options.Scan.JavaScript != "" {
-		if err := chromedp.Run(navigationCtx, chromedp.Evaluate(run.options.Scan.JavaScript, nil)); err != nil {
+		// maybe can be added to outputs?
+		var jsResult []byte
+		if err := chromedp.Run(navigationCtx, chromedp.EvaluateAsDevTools(run.options.Scan.JavaScript, &jsResult)); err != nil {
 			return nil, fmt.Errorf("failed to evaluate user-provided javascript: %w", err)
 		}
+		logger.Debug("ran user-provided javascript", "result", string(jsResult))
 	}
 
 	// get cookies

diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -20,7 +20,7 @@ type Runner struct {
 	Wappalyzer *wappalyzer.Wappalyze
 
 	// options for the Runner to consider
-	options Options
+	options *Options
 	// writers are the result writers to use
 	writers []writers.Writer
 	// log handler
@@ -37,7 +37,7 @@ type Runner struct {
 
 // New gets a new Runner ready for probing.
 // It's up to the caller to call Close() on the runner
-func NewRunner(logger *slog.Logger, driver Driver, opts Options, writers []writers.Writer) (*Runner, error) {
+func NewRunner(logger *slog.Logger, opts *Options, writers []writers.Writer) (*Runner, error) {
 	if !opts.Scan.ScreenshotSkipSave {
 		screenshotPath, err := islazy.CreateDir(opts.Scan.ScreenshotPath)
 		if err != nil {
@@ -74,7 +74,6 @@ func NewRunner(logger *slog.Logger, driver Driver, opts Options, writers []write
 	ctx, cancel := context.WithCancel(context.Background())
 
 	return &Runner{
-		Driver:     driver,
 		Wappalyzer: wap,
 		options:    opts,
 		writers:    writers,

diff --git a/web/api/submit.go b/web/api/submit.go
@@ -81,19 +81,21 @@ func (h *ApiHandler) SubmitHandler(w http.ResponseWriter, r *http.Request) {
 
 	logger := slog.New(log.Logger)
 
-	driver, err := driver.NewChromedp(logger, *options)
+	runner, err := runner.NewRunner(logger, options, []writers.Writer{writer})
 	if err != nil {
-		http.Error(w, "Error sarting driver", http.StatusInternalServerError)
+		log.Error("error starting runner", "err", err)
+		http.Error(w, "Error starting runner", http.StatusInternalServerError)
 		return
 	}
 
-	runner, err := runner.NewRunner(logger, driver, *options, []writers.Writer{writer})
+	driver, err := driver.NewChromedp(logger, *options)
 	if err != nil {
-		log.Error("error starting runner", "err", err)
-		http.Error(w, "Error starting runner", http.StatusInternalServerError)
+		http.Error(w, "Error sarting driver", http.StatusInternalServerError)
 		return
 	}
 
+	runner.Driver = driver
+
 	// have everything we need! start ther runner goroutine
 	go dispatchRunner(runner, request.URLs)
 

diff --git a/web/api/submit_single.go b/web/api/submit_single.go
@@ -73,19 +73,21 @@ func (h *ApiHandler) SubmitSingleHandler(w http.ResponseWriter, r *http.Request)
 
 	logger := slog.New(log.Logger)
 
-	driver, err := driver.NewChromedp(logger, *options)
+	runner, err := runner.NewRunner(logger, options, []writers.Writer{writer})
 	if err != nil {
-		http.Error(w, "Error sarting driver", http.StatusInternalServerError)
+		log.Error("error starting runner", "err", err)
+		http.Error(w, "Error starting runner", http.StatusInternalServerError)
 		return
 	}
 
-	runner, err := runner.NewRunner(logger, driver, *options, []writers.Writer{writer})
+	driver, err := driver.NewChromedp(logger, *options)
 	if err != nil {
-		log.Error("error starting runner", "err", err)
-		http.Error(w, "Error starting runner", http.StatusInternalServerError)
+		http.Error(w, "Error sarting driver", http.StatusInternalServerError)
 		return
 	}
 
+	runner.Driver = driver
+
 	go func() {
 		runner.Targets <- request.URL
 		close(runner.Targets)