External/nuclei
1
0
Fork 0
mirror of https://github.com/projectdiscovery/nuclei.git synced 2025-12-22 17:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

urlencode key characters only (#3150)

Browse Source 
* only encode key characters

* improve test cases
This commit is contained in:
Tarun Koyalwar 2023-01-05 16:41:59 +05:30 committed by GitHub
parent c273cbc8cb
commit 4aa2002e72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2/go.mod
View File

@ -79,7 +79,7 @@ require (
github.com/projectdiscovery/sarif v0.0.1 github.com/projectdiscovery/sarif v0.0.1
github.com/projectdiscovery/tlsx v1.0.2 github.com/projectdiscovery/tlsx v1.0.2
github.com/projectdiscovery/uncover v1.0.2 github.com/projectdiscovery/uncover v1.0.2
github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 github.com/projectdiscovery/utils v0.0.4-0.20230104145529-50cace956b0a
github.com/projectdiscovery/wappalyzergo v0.0.76 github.com/projectdiscovery/wappalyzergo v0.0.76
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1
gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/src-d/go-git.v4 v4.13.1

4
v2/go.sum
View File

@ -591,6 +591,10 @@ github.com/projectdiscovery/uncover v1.0.2 h1:mRFzflYyvwKkHd3XKufMlDRrb6p1mjFZTS
github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY= github.com/projectdiscovery/uncover v1.0.2/go.mod h1:lz4QYfArSA6jJkXyB71kN2/Pc7IW7nJB8c95n7xtwqY=
github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 h1:/fZvw6gT1fzdmMLMBBw75OrJ0Z6g7dulQrxM9FRp1qU= github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54 h1:/fZvw6gT1fzdmMLMBBw75OrJ0Z6g7dulQrxM9FRp1qU=
github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ= github.com/projectdiscovery/utils v0.0.4-0.20221214110533-9f95ee986a54/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ=
github.com/projectdiscovery/utils v0.0.4-0.20230104141936-c1df9b3db3bb h1:D+qWSHUo1KPI1UUbjvzo8ffMYCNFF3bTm4ProaQjMDs=
github.com/projectdiscovery/utils v0.0.4-0.20230104141936-c1df9b3db3bb/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ=
github.com/projectdiscovery/utils v0.0.4-0.20230104145529-50cace956b0a h1:fHztw99lR4QO931no6Zsj8/RYGA4otFQH5BF8OqfTss=
github.com/projectdiscovery/utils v0.0.4-0.20230104145529-50cace956b0a/go.mod h1:PCwA5YuCYWPgHaGiZmr53/SA9iGQmAnw7DSHuhr8VPQ=
github.com/projectdiscovery/wappalyzergo v0.0.76 h1:aG15xPhVY5sK/o3GlGiHrGLpmIkDSUmpbLTGnjVpeAc= github.com/projectdiscovery/wappalyzergo v0.0.76 h1:aG15xPhVY5sK/o3GlGiHrGLpmIkDSUmpbLTGnjVpeAc=
github.com/projectdiscovery/wappalyzergo v0.0.76/go.mod h1:HvYuW0Be4JCjVds/+XAEaMSqRG9yrI97UmZq0TPk6A0= github.com/projectdiscovery/wappalyzergo v0.0.76/go.mod h1:HvYuW0Be4JCjVds/+XAEaMSqRG9yrI97UmZq0TPk6A0=
github.com/projectdiscovery/yamldoc-go v1.0.3-0.20211126104922-00d2c6bb43b6 h1:DvWRQpw7Ib2CRL3ogYm/BWM+X0UGPfz1n9Ix9YKgFM8= github.com/projectdiscovery/yamldoc-go v1.0.3-0.20211126104922-00d2c6bb43b6 h1:DvWRQpw7Ib2CRL3ogYm/BWM+X0UGPfz1n9Ix9YKgFM8=

5
v2/pkg/protocols/http/build_request.go
View File

@ -28,6 +28,7 @@ import (
"github.com/projectdiscovery/rawhttp" "github.com/projectdiscovery/rawhttp"
"github.com/projectdiscovery/retryablehttp-go" "github.com/projectdiscovery/retryablehttp-go"
stringsutil "github.com/projectdiscovery/utils/strings" stringsutil "github.com/projectdiscovery/utils/strings"
urlutil "github.com/projectdiscovery/utils/url"
) )
var ( var (
@ -202,7 +203,7 @@ func baseURLWithTemplatePrefs(data string, parsed *url.URL, isRaw bool) (string,
} }
// transfer any parmas from URL to data( i.e {{BaseURL}} ) // transfer any parmas from URL to data( i.e {{BaseURL}} )
params := parsed.Query() params := urlutil.GetParams(parsed.Query())
if len(params) == 0 { if len(params) == 0 {
return data, parsed return data, parsed
} }
@ -222,7 +223,7 @@ func baseURLWithTemplatePrefs(data string, parsed *url.URL, isRaw bool) (string,
// payload not possible to parse (edgecase) // payload not possible to parse (edgecase)
dataURLrelpath += "?" + params.Encode() dataURLrelpath += "?" + params.Encode()
} else { } else {
payloadparams := payloadpath.Query() payloadparams := urlutil.GetParams(payloadpath.Query())
if len(payloadparams) != 0 { if len(payloadparams) != 0 {
// ex: /?action=x // ex: /?action=x
for k := range payloadparams { for k := range payloadparams {

3
v2/pkg/protocols/http/fuzz/parts.go
View File

@ -11,6 +11,7 @@ import (
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/generators"
"github.com/projectdiscovery/retryablehttp-go" "github.com/projectdiscovery/retryablehttp-go"
urlutil "github.com/projectdiscovery/utils/url"
) )
// executePartRule executes part rules based on type // executePartRule executes part rules based on type
@ -25,7 +26,7 @@ func (rule *Rule) executePartRule(input *ExecuteRuleInput, payload string) error
// executeQueryPartRule executes query part rules // executeQueryPartRule executes query part rules
func (rule *Rule) executeQueryPartRule(input *ExecuteRuleInput, payload string) error { func (rule *Rule) executeQueryPartRule(input *ExecuteRuleInput, payload string) error {
requestURL := *input.URL requestURL := *input.URL
temp := url.Values{} temp := urlutil.NewParams()
for k, v := range input.URL.Query() { for k, v := range input.URL.Query() {
temp[k] = v temp[k] = v
} }

8
v2/pkg/protocols/http/fuzz/parts_test.go
View File

@ -31,9 +31,9 @@ func TestExecuteQueryPartRule(t *testing.T) {
}, "1337'") }, "1337'")
require.NoError(t, err, "could not execute part rule") require.NoError(t, err, "could not execute part rule")
require.ElementsMatch(t, []string{ require.ElementsMatch(t, []string{
"http://localhost:8080/?file=passwdfile&mode=multiple&url=localhost1337%27", "http://localhost:8080/?file=passwdfile&mode=multiple&url=localhost1337'",
"http://localhost:8080/?file=passwdfile&mode=multiple1337%27&url=localhost", "http://localhost:8080/?file=passwdfile&mode=multiple1337'&url=localhost",
"http://localhost:8080/?file=passwdfile1337%27&mode=multiple&url=localhost", "http://localhost:8080/?file=passwdfile1337'&mode=multiple&url=localhost",
}, generatedURL, "could not get generated url") }, generatedURL, "could not get generated url")
}) })
t.Run("multiple", func(t *testing.T) { t.Run("multiple", func(t *testing.T) {
@ -52,7 +52,7 @@ func TestExecuteQueryPartRule(t *testing.T) {
}, },
}, "1337'") }, "1337'")
require.NoError(t, err, "could not execute part rule") require.NoError(t, err, "could not execute part rule")
require.Equal(t, "http://localhost:8080/?file=passwdfile1337%27&mode=multiple1337%27&url=localhost1337%27", generatedURL, "could not get generated url") require.Equal(t, "http://localhost:8080/?file=passwdfile1337'&mode=multiple1337'&url=localhost1337'", generatedURL, "could not get generated url")
}) })
} }

5
v2/pkg/protocols/http/raw/raw.go
View File

@ -12,6 +12,7 @@ import (
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/utils" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/http/utils"
"github.com/projectdiscovery/rawhttp/client" "github.com/projectdiscovery/rawhttp/client"
stringsutil "github.com/projectdiscovery/utils/strings" stringsutil "github.com/projectdiscovery/utils/strings"
urlutil "github.com/projectdiscovery/utils/url"
) )
// Request defines a basic HTTP raw request // Request defines a basic HTTP raw request
@ -32,7 +33,7 @@ func Parse(request, baseURL string, unsafe bool) (*Request, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("could not parse request URL: %w", err) return nil, fmt.Errorf("could not parse request URL: %w", err)
} }
inputParams := inputURL.Query() inputParams := urlutil.GetParams(inputURL.Query())
// Joins input url and new url preserving query parameters // Joins input url and new url preserving query parameters
joinPath := func(relpath string) (string, error) { joinPath := func(relpath string) (string, error) {
@ -45,7 +46,7 @@ func Parse(request, baseURL string, unsafe bool) (*Request, error) {
} else { } else {
newpath = utils.JoinURLPath(inputURL.Path, relUrl.Path) newpath = utils.JoinURLPath(inputURL.Path, relUrl.Path)
if len(relUrl.Query()) > 0 { if len(relUrl.Query()) > 0 {
relParam := relUrl.Query() relParam := urlutil.GetParams(relUrl.Query())
for k := range relParam { for k := range relParam {
inputParams.Add(k, relParam.Get(k)) inputParams.Add(k, relParam.Get(k))
} }

3
v2/pkg/protocols/websocket/websocket.go
View File

@ -32,6 +32,7 @@ import (
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/network/networkclientpool" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/network/networkclientpool"
templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types" templateTypes "github.com/projectdiscovery/nuclei/v2/pkg/templates/types"
"github.com/projectdiscovery/nuclei/v2/pkg/types" "github.com/projectdiscovery/nuclei/v2/pkg/types"
urlutil "github.com/projectdiscovery/utils/url"
) )
// Request is a request for the Websocket protocol // Request is a request for the Websocket protocol
@ -179,7 +180,7 @@ func (request *Request) executeRequestWithPayloads(input, hostname string, dynam
payloadValues["Host"] = parsed.Hostname() payloadValues["Host"] = parsed.Hostname()
payloadValues["Scheme"] = parsed.Scheme payloadValues["Scheme"] = parsed.Scheme
requestPath := parsed.Path requestPath := parsed.Path
if values := parsed.Query(); len(values) > 0 { if values := urlutil.GetParams(parsed.Query()); len(values) > 0 {
requestPath = requestPath + "?" + values.Encode() requestPath = requestPath + "?" + values.Encode()
} }
payloadValues["Path"] = requestPath payloadValues["Path"] = requestPath