mirror of
https://github.com/schollz/croc.git
synced 2025-10-11 05:11:06 +02:00
fix: client quits when discovering dangerous paths
This commit is contained in:
parent
13bc190f8b
commit
b05c3c8c42
2 changed files with 18 additions and 0 deletions
|
@ -1092,6 +1092,18 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error
|
||||||
c.EmptyFoldersToTransfer = senderInfo.EmptyFoldersToTransfer
|
c.EmptyFoldersToTransfer = senderInfo.EmptyFoldersToTransfer
|
||||||
c.TotalNumberFolders = senderInfo.TotalNumberFolders
|
c.TotalNumberFolders = senderInfo.TotalNumberFolders
|
||||||
c.FilesToTransfer = senderInfo.FilesToTransfer
|
c.FilesToTransfer = senderInfo.FilesToTransfer
|
||||||
|
for i, fi := range c.FilesToTransfer {
|
||||||
|
// Issues #593 - sanitize the sender paths and prevent ".." from being used
|
||||||
|
c.FilesToTransfer[i].FolderRemote = filepath.Clean(fi.FolderRemote)
|
||||||
|
if strings.Contains(c.FilesToTransfer[i].FolderRemote, "..") {
|
||||||
|
return true, fmt.Errorf("invalid path detected: '%s'", fi.FolderRemote)
|
||||||
|
}
|
||||||
|
// Issues #593 - disallow specific folders like .ssh
|
||||||
|
if strings.Contains(c.FilesToTransfer[i].FolderRemote, ".ssh") {
|
||||||
|
return true, fmt.Errorf("invalid path detected: '%s'", fi.FolderRemote)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
c.TotalNumberOfContents = 0
|
c.TotalNumberOfContents = 0
|
||||||
if c.FilesToTransfer != nil {
|
if c.FilesToTransfer != nil {
|
||||||
c.TotalNumberOfContents += len(c.FilesToTransfer)
|
c.TotalNumberOfContents += len(c.FilesToTransfer)
|
||||||
|
|
|
@ -438,6 +438,12 @@ func UnzipDirectory(destination string, source string) error {
|
||||||
filePath := filepath.Join(destination, f.Name)
|
filePath := filepath.Join(destination, f.Name)
|
||||||
fmt.Fprintf(os.Stderr, "\r\033[2K")
|
fmt.Fprintf(os.Stderr, "\r\033[2K")
|
||||||
fmt.Fprintf(os.Stderr, "\rUnzipping file %s", filePath)
|
fmt.Fprintf(os.Stderr, "\rUnzipping file %s", filePath)
|
||||||
|
// Issue #593 conceal path traversal vulnerability
|
||||||
|
// make sure the filepath does not have ".."
|
||||||
|
filePath = filepath.Clean(filePath)
|
||||||
|
if strings.Contains(filePath, "..") {
|
||||||
|
log.Fatalf("Invalid file path %s\n", filePath)
|
||||||
|
}
|
||||||
if f.FileInfo().IsDir() {
|
if f.FileInfo().IsDir() {
|
||||||
os.MkdirAll(filePath, os.ModePerm)
|
os.MkdirAll(filePath, os.ModePerm)
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue