Fix a recursion bug when redirected to the same domain and a port was specified (#377) (#522)

This fixes the situation where the URL port is specified from the
command line and the "Location" redirection header contains an
absolute URL path.
This commit is contained in:
h1x 2022-03-06 17:14:52 +01:00 committed by GitHub
parent 4c1a75498b
commit 571b3397db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 1 deletions

View file

@ -11,6 +11,7 @@
- Fixed an issue where output (often a lot of it) would be printed after entering interactive mode - Fixed an issue where output (often a lot of it) would be printed after entering interactive mode
- Fixed an issue when reading wordlist files from ffufrc - Fixed an issue when reading wordlist files from ffufrc
- Fixed an issue where `-of all` option only creates one output file (instead of all formats) - Fixed an issue where `-of all` option only creates one output file (instead of all formats)
- Fixed an issue where redirection to the same domain in recursive mode dropped port info from URL
- Added HTTP2 support - Added HTTP2 support
- v1.3.1 - v1.3.1

View file

@ -20,6 +20,7 @@
* [fang0654](https://github.com/fang0654) * [fang0654](https://github.com/fang0654)
* [Hazegard](https://github.com/Hazegard) * [Hazegard](https://github.com/Hazegard)
* [helpermika](https://github.com/helpermika) * [helpermika](https://github.com/helpermika)
* [h1x](https://github.com/h1x-lnx)
* [Ice3man543](https://github.com/Ice3man543) * [Ice3man543](https://github.com/Ice3man543)
* [JamTookTheBait](https://github.com/JamTookTheBait) * [JamTookTheBait](https://github.com/JamTookTheBait)
* [jimen0](https://github.com/jimen0) * [jimen0](https://github.com/jimen0)

View file

@ -43,12 +43,40 @@ func (resp *Response) GetRedirectLocation(absolute bool) string {
if err != nil { if err != nil {
return redirectLocation return redirectLocation
} }
if redirectUrl.IsAbs() && UrlEqual(redirectUrl, baseUrl) {
redirectLocation = redirectUrl.Scheme + "://" +
baseUrl.Host + redirectUrl.Path
} else {
redirectLocation = baseUrl.ResolveReference(redirectUrl).String() redirectLocation = baseUrl.ResolveReference(redirectUrl).String()
} }
}
return redirectLocation return redirectLocation
} }
func UrlEqual(url1, url2 *url.URL) bool {
if url1.Hostname() != url2.Hostname() {
return false
}
if url1.Scheme != url2.Scheme {
return false
}
p1, p2 := getUrlPort(url1), getUrlPort(url2)
return p1 == p2
}
func getUrlPort(url *url.URL) string {
var portMap = map[string]string{
"http": "80",
"https": "443",
}
p := url.Port()
if p == "" {
p = portMap[url.Scheme]
}
return p
}
func NewResponse(httpresp *http.Response, req *Request) Response { func NewResponse(httpresp *http.Response, req *Request) Response {
var resp Response var resp Response
resp.Request = req resp.Request = req