Merge pull request #4768 from projectdiscovery/use-params-from-utils

use pdtm params from utils

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/projectdiscovery/clistats v0.0.20
 	github.com/projectdiscovery/fastdialer v0.0.58
-	github.com/projectdiscovery/hmap v0.0.37
+	github.com/projectdiscovery/hmap v0.0.38
 	github.com/projectdiscovery/interactsh v1.1.8
 	github.com/projectdiscovery/rawhttp v0.1.35
 	github.com/projectdiscovery/retryabledns v1.0.55
@@ -90,7 +90,7 @@ require (
 	github.com/projectdiscovery/tlsx v1.1.6
 	github.com/projectdiscovery/uncover v1.0.7
 	github.com/projectdiscovery/useragent v0.0.35
-	github.com/projectdiscovery/utils v0.0.77
+	github.com/projectdiscovery/utils v0.0.79-0.20240216200330-eeee5a2031fc
 	github.com/projectdiscovery/wappalyzergo v0.0.109
 	github.com/redis/go-redis/v9 v9.1.0
 	github.com/sashabaranov/go-openai v1.15.3

go.sum

@@ -823,8 +823,8 @@ github.com/projectdiscovery/gostruct v0.0.2 h1:s8gP8ApugGM4go1pA+sVlPDXaWqNP5BBD
 github.com/projectdiscovery/gostruct v0.0.2/go.mod h1:H86peL4HKwMXcQQtEa6lmC8FuD9XFt6gkNR0B/Mu5PE=
 github.com/projectdiscovery/gozero v0.0.1 h1:f08ZnYlbDZV/TNGDvIXV9s/oB/sAI+HWaSbW4em4aKM=
 github.com/projectdiscovery/gozero v0.0.1/go.mod h1:/dHwbly+1lhOX9UreVure4lEe7K4hIHeu/c/wZGNTDo=
-github.com/projectdiscovery/hmap v0.0.37 h1:RNVEhdMcUIeG/oadJAs/cXU17Kcccc5kQU3PMzJWtkw=
+github.com/projectdiscovery/hmap v0.0.38 h1:H4eeVRC3Km4bN877V17RoYJe11Wa5M7U1o/FOu9p1TA=
-github.com/projectdiscovery/hmap v0.0.37/go.mod h1:zreVGG6K2JSFX3+9PZHYFPOxJBNNJ9NQt1T8aSrc5lw=
+github.com/projectdiscovery/hmap v0.0.38/go.mod h1:kTeo8Qo+eDxZUrCBPHOy8qvFRrDNWWrJddf5i1hJHe0=
 github.com/projectdiscovery/httpx v1.3.9 h1:jDdoGH+5VVU/jI6dnai1DKNw9USPyCcw+tDh4RCVQ2g=
 github.com/projectdiscovery/httpx v1.3.9/go.mod h1:a/a5X6e2NLnS/+b3buFadGUpZSolnVkMA7KZdpCdg58=
 github.com/projectdiscovery/interactsh v1.1.8 h1:mDD+f/oo2tV4Z1WyUync0tgYeJyuiS89Un64Gm6Pvgk=
@@ -855,8 +855,8 @@ github.com/projectdiscovery/uncover v1.0.7 h1:ut+2lTuvmftmveqF5RTjMWAgyLj8ltPQC7
 github.com/projectdiscovery/uncover v1.0.7/go.mod h1:HFXgm1sRPuoN0D4oATljPIdmbo/EEh1wVuxQqo/dwFE=
 github.com/projectdiscovery/useragent v0.0.35 h1:DeOOHoBSMLQdFD8mqb5oss+OHshCPx31cDlt2/uoc5k=
 github.com/projectdiscovery/useragent v0.0.35/go.mod h1:6SJxoll5xe9PFw2zw/dN2hpgE11nv41uUR6eKzmNUEU=
-github.com/projectdiscovery/utils v0.0.77 h1:HPLNY/WgVsLaHPBW1XA5XYMkTo9VRjhbOIZs+Lfww7s=
+github.com/projectdiscovery/utils v0.0.79-0.20240216200330-eeee5a2031fc h1:1ooIA1folgfS6lSpiDA7h08hnb+Aui1BYjIlHAfTjZk=
-github.com/projectdiscovery/utils v0.0.77/go.mod h1:XkHTUln/MJaWAgber2C0o1Mqacr2s9JMRhOVBjmII7w=
+github.com/projectdiscovery/utils v0.0.79-0.20240216200330-eeee5a2031fc/go.mod h1:tBFlI+1warN7y7hKpFf6pqqOszvufENofy9Md0qlZQo=
 github.com/projectdiscovery/wappalyzergo v0.0.109 h1:BERfwTRn1dvB1tbhyc5m67R8VkC9zbVuPsEq4VEm07k=
 github.com/projectdiscovery/wappalyzergo v0.0.109/go.mod h1:4Z3DKhi75zIPMuA+qSDDWxZvnhL4qTLmDx4dxNMu7MA=
 github.com/projectdiscovery/yamldoc-go v1.0.4 h1:eZoESapnMw6WAHiVgRwNqvbJEfNHEH148uthhFbG5jE=

pkg/installer/util.go

@@ -103,29 +103,3 @@ func isEmptyDir(dir string) bool {
 	})
 	return !hasFiles
 }
-
-// getUtmSource returns utm_source from environment variable
-func getUtmSource() string {
-	value := ""
-	switch {
-	case os.Getenv("GH_ACTION") != "":
-		value = "ghci"
-	case os.Getenv("TRAVIS") != "":
-		value = "travis"
-	case os.Getenv("CIRCLECI") != "":
-		value = "circleci"
-	case os.Getenv("CI") != "":
-		value = "gitlabci" // this also includes bitbucket
-	case os.Getenv("GITHUB_ACTIONS") != "":
-		value = "ghci"
-	case os.Getenv("AWS_EXECUTION_ENV") != "":
-		value = os.Getenv("AWS_EXECUTION_ENV")
-	case os.Getenv("JENKINS_URL") != "":
-		value = "jenkins"
-	case os.Getenv("FUNCTION_TARGET") != "":
-		value = "gcf"
-	default:
-		value = "unknown"
-	}
-	return value
-}

pkg/installer/versioncheck.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"net/url"
 	"os"
-	"runtime"
 	"sync"
 
+	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v3/pkg/catalog/config"
 	"github.com/projectdiscovery/retryablehttp-go"
 	updateutils "github.com/projectdiscovery/utils/update"
@@ -55,16 +55,15 @@ func NucleiSDKVersionCheck() {
 
 // getpdtmParams returns encoded query parameters sent to update check endpoint
 func getpdtmParams(isSDK bool) string {
-	params := &url.Values{}
+	values, err := url.ParseQuery(updateutils.GetpdtmParams(config.Version))
-	params.Add("os", runtime.GOOS)
+	if err != nil {
-	params.Add("arch", runtime.GOARCH)
+		gologger.Verbose().Msgf("error parsing update check params: %v", err)
-	params.Add("go_version", runtime.Version())
+		return updateutils.GetpdtmParams(config.Version)
-	params.Add("v", config.Version)
-	if isSDK {
-		params.Add("sdk", "true")
 	}
-	params.Add("utm_source", getUtmSource())
+	if isSDK {
-	return params.Encode()
+		values.Add("sdk", "true")
+	}
+	return values.Encode()
 }
 
 // UpdateIgnoreFile updates default ignore file by downloading latest ignore file