Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

switch references #1721

Merged
merged 11 commits into from
Jun 17, 2021
Merged

switch references #1721

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2f28fbf
switch references
butonic May 20, 2021
9aa86a2
start updating references
refs Jun 14, 2021
4873399
continue update
butonic Jun 15, 2021
22ecda8
rebase
butonic Jun 15, 2021
fb291f1
fix nil
butonic Jun 15, 2021
bc66e39
fix trash
butonic Jun 15, 2021
9f231fe
update changelog
butonic Jun 15, 2021
1701ed5
introduce util methods for references
Jun 17, 2021
07a4d39
clean critical paths before doing filesystem operations
Jun 17, 2021
ea4cf92
address review comments
Jun 17, 2021
b61df27
remove duplicate method
Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkg/storage/fs/owncloud/owncloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ func (fs *ocfs) toInternalPath(ctx context.Context, sp string) (ip string) {
if fs.c.EnableHome {
u := user.ContextMustGetUser(ctx)
layout := templates.WithUser(u, fs.c.UserLayout)
ip = filepath.Join(fs.c.DataDirectory, layout, "files", sp)
// The inner filepath.Join prevents the path from breaking out of
// <fs.c.DataDirectory>/<layout>/files/
ip = filepath.Join(fs.c.DataDirectory, layout, "files", filepath.Join("/", sp))
ishank011 marked this conversation as resolved.
Show resolved Hide resolved
} else {
// trim all /
sp = strings.Trim(sp, "/")
Expand All @@ -290,7 +292,7 @@ func (fs *ocfs) toInternalPath(ctx context.Context, sp string) (ip string) {
ip = filepath.Join(fs.c.DataDirectory, layout, "files")
} else {
// parts = "<username>", "foo/bar.txt"
ip = filepath.Join(fs.c.DataDirectory, layout, "files", segments[1])
ip = filepath.Join(fs.c.DataDirectory, layout, "files", filepath.Join(segments[1]))
}

}
Expand Down Expand Up @@ -362,7 +364,7 @@ func (fs *ocfs) getVersionsPath(ctx context.Context, ip string) string {
return filepath.Join(fs.c.DataDirectory, layout, "files_versions")
case 4:
// parts = "", "<username>", "foo/bar.txt"
return filepath.Join(fs.c.DataDirectory, layout, "files_versions", parts[3])
return filepath.Join(fs.c.DataDirectory, layout, "files_versions", filepath.Join("/", parts[3]))
default:
return "" // TODO Must not happen?
}
Expand Down Expand Up @@ -799,7 +801,7 @@ func (fs *ocfs) resolve(ctx context.Context, ref *provider.Reference) (string, e
if err != nil {
return "", err
}
filepath.Join("/", ip, ref.Path)
filepath.Join("/", ip, filepath.Join("/", ref.Path))
return ip, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/fs/owncloud/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func (fs *ocfs) getUploadPath(ctx context.Context, uploadID string) (string, err

// GetUpload returns the Upload for the given upload id
func (fs *ocfs) GetUpload(ctx context.Context, id string) (tusd.Upload, error) {
infoPath := filepath.Join(fs.c.UploadInfoDir, id+".info")
infoPath := filepath.Join(fs.c.UploadInfoDir, filepath.Join("/", id+".info"))

info := tusd.FileInfo{}
data, err := ioutil.ReadFile(infoPath)
Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/utils/chunking/chunking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (c *ChunkHandler) createChunkTempFile() (string, *os.File, error) {
}

func (c *ChunkHandler) getChunkFolderName(i *ChunkBLOBInfo) (string, error) {
path := "/" + c.ChunkFolder + filepath.Clean("/"+i.uploadID())
path := filepath.Join("/", c.ChunkFolder, filepath.Join("/", i.uploadID()))
if err := os.MkdirAll(path, 0755); err != nil {
return "", err
}
Expand Down Expand Up @@ -132,7 +132,7 @@ func (c *ChunkHandler) saveChunk(path string, r io.ReadCloser) (bool, string, er
}
// c.logger.Info().Log("chunkfolder", chunksFolderName)

chunkTarget := chunksFolderName + "/" + fmt.Sprintf("%d", chunkInfo.CurrentChunk)
chunkTarget := filepath.Join(chunksFolderName, strconv.Itoa(chunkInfo.CurrentChunk))
if err = os.Rename(chunkTempFilename, chunkTarget); err != nil {
return false, "", err
}
Expand Down Expand Up @@ -171,7 +171,7 @@ func (c *ChunkHandler) saveChunk(path string, r io.ReadCloser) (bool, string, er

// walk all chunks and append to assembled file
for i := range chunks {
target := chunksFolderName + "/" + fmt.Sprintf("%d", i)
target := filepath.Join(chunksFolderName, strconv.Itoa(i))

chunk, err := os.Open(target)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/utils/decomposedfs/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func isNotDir(err error) bool {

// Child returns the child node with the given name
func (n *Node) Child(ctx context.Context, name string) (*Node, error) {
link, err := os.Readlink(filepath.Join(n.InternalPath(), name))
link, err := os.Readlink(filepath.Join(n.InternalPath(), filepath.Join("/", name)))
if err != nil {
if os.IsNotExist(err) || isNotDir(err) {
c := &Node{
Expand Down
8 changes: 6 additions & 2 deletions pkg/storage/utils/localfs/localfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ func (fs *localfs) resolve(ctx context.Context, ref *provider.Reference) (p stri
if p, err = fs.GetPathByID(ctx, ref.ResourceId); err != nil {
return "", err
}
return path.Join(p, ref.Path), nil
return path.Join(p, path.Join("/", ref.Path)), nil
}

if ref.Path != "" {
return ref.Path, nil
return path.Join("/", ref.Path), nil
}

// reference is invalid
Expand All @@ -161,6 +161,9 @@ func getUser(ctx context.Context) (*userpb.User, error) {
}

func (fs *localfs) wrap(ctx context.Context, p string) string {
// This is to prevent path traversal.
// With this p can't break out of its parent folder
p = path.Join("/", p)
var internal string
if !fs.conf.DisableHome {
layout, err := fs.GetHome(ctx)
Expand Down Expand Up @@ -203,6 +206,7 @@ func (fs *localfs) wrapRecycleBin(ctx context.Context, p string) string {
}

func (fs *localfs) wrapVersions(ctx context.Context, p string) string {
p = path.Join("/", p)
var internal string
if !fs.conf.DisableHome {
layout, err := fs.GetHome(ctx)
Expand Down