Fix extensions with query vars

liamg · liamg · commit 92ea7fce9a05 · 2020-06-23T21:15:35.000+01:00
diff --git a/pkg/scan/url_scanner.go b/pkg/scan/url_scanner.go
@@ -305,7 +305,12 @@ func (scanner *URLScanner) checkURL(job URLJob) *URLResult {
 
 				if !job.BasicOnly && !strings.Contains(job.URL, "/.htpasswd") && !strings.Contains(job.URL, "/.htaccess") {
 					for _, ext := range scanner.backupExtensions {
-						scanner.queue(URLJob{URL: job.URL + ext, BasicOnly: true})
+						bUrl := job.URL + ext
+						if strings.Contains(job.URL, "?") {
+							bits := strings.SplitN(job.URL, "?", 2)
+							bUrl = strings.Join(bits, ext+"?")
+						}
+						scanner.queue(URLJob{URL: bUrl, BasicOnly: true})
 					}
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,12 @@ func (scanner URLScanner) checkURL(job URLJob) URLResult {`
`305`	`305`
`306`	`306`	`if !job.BasicOnly && !strings.Contains(job.URL, "/.htpasswd") && !strings.Contains(job.URL, "/.htaccess") {`
`307`	`307`	`for _, ext := range scanner.backupExtensions {`
`308`		`- scanner.queue(URLJob{URL: job.URL + ext, BasicOnly: true})`
	`308`	`+ bUrl := job.URL + ext`
	`309`	`+ if strings.Contains(job.URL, "?") {`
	`310`	`+ bits := strings.SplitN(job.URL, "?", 2)`
	`311`	`+ bUrl = strings.Join(bits, ext+"?")`
	`312`	`+ }`
	`313`	`+ scanner.queue(URLJob{URL: bUrl, BasicOnly: true})`
`309`	`314`	`}`
`310`	`315`	`}`
`311`	`316`