mirror of
https://github.com/0rangebananaspy/authelia.git
synced 2024-09-14 22:47:21 +07:00
f55082d4db
This fixes an issue with the URL matching machinery which ignores the final slash of a URL. Introduced in 664d65d7fb.
Fixes #3692
30 lines
789 B
Go
30 lines
789 B
Go
package utils
|
|
|
|
import (
|
|
"net/url"
|
|
"path"
|
|
)
|
|
|
|
// URLPathFullClean returns a URL path with the query parameters appended (full path) with the path portion parsed
|
|
// through path.Clean given a *url.URL.
|
|
func URLPathFullClean(u *url.URL) (output string) {
|
|
lengthPath := len(u.Path)
|
|
lengthQuery := len(u.RawQuery)
|
|
appendForwardSlash := lengthPath > 1 && u.Path[lengthPath-1] == '/'
|
|
|
|
switch {
|
|
case lengthPath == 1 && lengthQuery == 0:
|
|
return u.Path
|
|
case lengthPath == 1:
|
|
return path.Clean(u.Path) + "?" + u.RawQuery
|
|
case lengthQuery != 0 && appendForwardSlash:
|
|
return path.Clean(u.Path) + "/?" + u.RawQuery
|
|
case lengthQuery != 0:
|
|
return path.Clean(u.Path) + "?" + u.RawQuery
|
|
case appendForwardSlash:
|
|
return path.Clean(u.Path) + "/"
|
|
default:
|
|
return path.Clean(u.Path)
|
|
}
|
|
}
|