Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2021-04-14 05:00:34 +0300
committerJaime Martinez <jmartinez@gitlab.com>2021-04-14 05:00:34 +0300
commitd7385218659e2eb3d3948fafab5c46782809bb17 (patch)
treeb3f314ee320b6bc1732430b0637337f1d6d9a7b7
parent868dab812f2ef6e23edbfa2dc86862ccc909d893 (diff)
Return early if allowedPath is the root dir
-rw-r--r--internal/httpfs/http_fs.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/internal/httpfs/http_fs.go b/internal/httpfs/http_fs.go
index 1e9dff1c..17518301 100644
--- a/internal/httpfs/http_fs.go
+++ b/internal/httpfs/http_fs.go
@@ -83,6 +83,13 @@ func (p *fileSystemPaths) Open(name string) (http.File, error) {
return nil, err
}
for _, allowedPath := range p.allowedPaths {
+ // filepath.Abs(allowedPath) in NewFileSystemPath resolves an allowedPath to be `/` when
+ // chrootPath == allowedPath, so we need to return early if in chroot
+ //and we have stripped p.chrootPath from absPath && allowedPath
+ if p.chrootPath != "" && allowedPath == "/" {
+ return os.Open(absPath)
+ }
+
if strings.HasPrefix(absPath, allowedPath+"/") {
return os.Open(absPath)
}