Merge pull request #420 from databacker/smb-single-double-slash

deitch · web-flow · commit 434e77f83b12 · 2025-04-01T18:56:59.000+03:00
ensure filename in SMB does not start with slash
diff --git a/pkg/storage/smb/smb.go b/pkg/storage/smb/smb.go
@@ -82,6 +82,7 @@ func (s *SMB) Push(ctx context.Context, target, source string, logger *log.Entry
 	)
 	err = s.exec(s.url, func(fs *smb2.Share, sharepath string) error {
 		smbFilename := fmt.Sprintf("%s%c%s", sharepath, smb2.PathSeparator, target)
+		smbFilename = strings.TrimPrefix(smbFilename, fmt.Sprintf("%c", smb2.PathSeparator))
 		from, err := os.Open(source)
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ func (s SMB) Push(ctx context.Context, target, source string, logger log.Entry`
`82`	`82`	`)`
`83`	`83`	`err = s.exec(s.url, func(fs *smb2.Share, sharepath string) error {`
`84`	`84`	`smbFilename := fmt.Sprintf("%s%c%s", sharepath, smb2.PathSeparator, target)`
	`85`	`+ smbFilename = strings.TrimPrefix(smbFilename, fmt.Sprintf("%c", smb2.PathSeparator))`
`85`	`86`	`from, err := os.Open(source)`
`86`	`87`	`if err != nil {`
`87`	`88`	`return err`