Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-18 18:37:05 +00:00
Code Releases Activity

minor

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos
2024-04-24 18:25:24 +03:00
parent 6167d3ed6b
commit d88273ab55
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
context/fs.go
View File

@@ -134,7 +134,15 @@ var ResolveHTTPFS = func(fsOrDir interface{}) http.FileSystem {
// FindNames accepts a "http.FileSystem" and a root name and returns
// the list containing its file names.
func FindNames(fileSystem http.FileSystem, name string) ([]string, error) {
f, err := fileSystem.Open(name)
_, filename, ok, err := SafeFilename("", name)
if err != nil {
return nil, err
}
if !ok {
return nil, fmt.Errorf("invalid file name: %s", name)
}
f, err := fileSystem.Open(filename)
if err != nil {
return nil, err
}
@@ -160,8 +168,8 @@ func FindNames(fileSystem http.FileSystem, name string) ([]string, error) {
// Note:
// go-bindata has absolute names with os.Separator,
// http.Dir the basename.
filename := toBaseName(info.Name())
fullname := path.Join(name, filename)
baseFilename := toBaseName(info.Name())
fullname := path.Join(name, baseFilename)
if fullname == name { // prevent looping through itself.
continue
}