Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 0 additions & 7 deletions pkg/protocols/headless/engine/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ import (
"github.com/projectdiscovery/nuclei/v3/pkg/types"
fileutil "github.com/projectdiscovery/utils/file"
osutils "github.com/projectdiscovery/utils/os"
processutil "github.com/projectdiscovery/utils/process"
)

// Browser is a browser structure for nuclei headless module
type Browser struct {
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
Expand All @@ -36,14 +34,11 @@ type Browser struct {
// New creates a new nuclei headless browser module
func New(options *types.Options) (*Browser, error) {
var launcherURL, dataStore string
var previousPIDs map[int32]struct{}
var err error

chromeLauncher := launcher.New()

if options.CDPEndpoint == "" {
previousPIDs = processutil.FindProcesses(processutil.IsChromeProcess)

dataStore, err = os.MkdirTemp("", "nuclei-*")
if err != nil {
return nil, errors.Wrap(err, "could not create temporary directory")
Expand Down Expand Up @@ -135,7 +130,6 @@ func New(options *types.Options) (*Browser, error) {
httpClientOnce: &sync.Once{},
launcher: chromeLauncher,
}
engine.previousPIDs = previousPIDs
return engine, nil
}

Expand Down Expand Up @@ -199,5 +193,4 @@ func (b *Browser) Close() {
_ = b.engine.Close()
b.launcher.Kill()
_ = os.RemoveAll(b.tempDir)
processutil.CloseProcesses(processutil.IsChromeProcess, b.previousPIDs)
}
5 changes: 4 additions & 1 deletion pkg/protocols/headless/engine/page_actions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ func TestActionNavigate(t *testing.T) {

testHeadlessSimpleResponse(t, response, actions, 60*time.Second, func(page *Page, err error, out ActionData) {
require.Nilf(t, err, "could not run page actions")
require.Equal(t, "Nuclei Test Page", page.Page().MustInfo().Title, "could not navigate correctly")
require.NotNil(t, page, "page should not be nil")
info, infoErr := page.Page().Info()
require.NoError(t, infoErr, "could not fetch page info")
require.Equal(t, "Nuclei Test Page", info.Title, "could not navigate correctly")
})
}

Expand Down
Loading