Merge pull request #2269 from router-for-me/auth-fix
fix(auth): ensure absolute paths for auth file handling
This commit is contained in:
@@ -739,10 +739,25 @@ func (h *Handler) authIDForPath(path string) string {
|
|||||||
if path == "" {
|
if path == "" {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
path = filepath.Clean(path)
|
||||||
|
if !filepath.IsAbs(path) {
|
||||||
|
if abs, errAbs := filepath.Abs(path); errAbs == nil {
|
||||||
|
path = abs
|
||||||
|
}
|
||||||
|
}
|
||||||
id := path
|
id := path
|
||||||
if h != nil && h.cfg != nil {
|
if h != nil && h.cfg != nil {
|
||||||
authDir := strings.TrimSpace(h.cfg.AuthDir)
|
authDir := strings.TrimSpace(h.cfg.AuthDir)
|
||||||
|
if resolvedAuthDir, errResolve := util.ResolveAuthDir(authDir); errResolve == nil && resolvedAuthDir != "" {
|
||||||
|
authDir = resolvedAuthDir
|
||||||
|
}
|
||||||
if authDir != "" {
|
if authDir != "" {
|
||||||
|
authDir = filepath.Clean(authDir)
|
||||||
|
if !filepath.IsAbs(authDir) {
|
||||||
|
if abs, errAbs := filepath.Abs(authDir); errAbs == nil {
|
||||||
|
authDir = abs
|
||||||
|
}
|
||||||
|
}
|
||||||
if rel, errRel := filepath.Rel(authDir, path); errRel == nil && rel != "" {
|
if rel, errRel := filepath.Rel(authDir, path); errRel == nil && rel != "" {
|
||||||
id = rel
|
id = rel
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user