diff --git a/v2/cmd/nuclei/main.go b/v2/cmd/nuclei/main.go index 4f7c4316a..5c3e4913e 100644 --- a/v2/cmd/nuclei/main.go +++ b/v2/cmd/nuclei/main.go @@ -25,6 +25,7 @@ import ( "github.com/projectdiscovery/nuclei/v2/pkg/utils/monitor" errorutil "github.com/projectdiscovery/utils/errors" fileutil "github.com/projectdiscovery/utils/file" + osutils "github.com/projectdiscovery/utils/os" ) var ( @@ -357,9 +358,9 @@ on extensive configurability, massive extensibility and ease of use.`) return flagSet } -// isColorNotAvailable returns true if ascii collored output is not available. +// isColorNotAvailable returns true if ascii colored output is not available. func isColorNotAvailable() bool { - return runtime.GOOS == "windows" + return osutils.IsWindows() } // cleanupOldResumeFiles cleans up resume files older than 10 days. diff --git a/v2/pkg/protocols/common/generators/load_test.go b/v2/pkg/protocols/common/generators/load_test.go index 9aeaf0226..cecdde9b5 100644 --- a/v2/pkg/protocols/common/generators/load_test.go +++ b/v2/pkg/protocols/common/generators/load_test.go @@ -3,10 +3,10 @@ package generators import ( "os" "path/filepath" - "runtime" "testing" "github.com/projectdiscovery/nuclei/v2/pkg/catalog/disk" + osutils "github.com/projectdiscovery/utils/os" "github.com/stretchr/testify/require" ) @@ -37,7 +37,7 @@ func TestLoadPayloads(t *testing.T) { require.Equal(t, map[string][]string{"new": {"test", "another"}}, values, "could not get values") }) t.Run("no-sandbox-unix", func(t *testing.T) { - if runtime.GOOS == "windows" { + if osutils.IsWindows() { return } _, err := generator.loadPayloads(map[string]interface{}{ diff --git a/v2/pkg/protocols/headless/engine/engine.go b/v2/pkg/protocols/headless/engine/engine.go index 41c6f5c70..a547f2a77 100644 --- a/v2/pkg/protocols/headless/engine/engine.go +++ b/v2/pkg/protocols/headless/engine/engine.go @@ -4,7 +4,6 @@ import ( "fmt" "net/http" "os" - "runtime" "strings" "github.com/go-rod/rod" @@ -14,6 +13,7 @@ import ( "github.com/projectdiscovery/nuclei/v2/pkg/types" fileutil "github.com/projectdiscovery/utils/file" + osutils "github.com/projectdiscovery/utils/os" reflectutil "github.com/projectdiscovery/utils/reflect" stringsutil "github.com/projectdiscovery/utils/strings" ) @@ -123,7 +123,7 @@ func New(options *types.Options) (*Browser, error) { func MustDisableSandbox() bool { // linux with root user needs "--no-sandbox" option // https://github.com/chromium/chromium/blob/c4d3c31083a2e1481253ff2d24298a1dfe19c754/chrome/test/chromedriver/client/chromedriver.py#L209 - return runtime.GOOS == "linux" && os.Geteuid() == 0 + return osutils.IsWindows() && os.Geteuid() == 0 } // SetUserAgent sets custom user agent to the browser