mirror of
https://github.com/drakkan/sftpgo.git
synced 2025-12-06 14:20:55 +03:00
virtual folders: fix path placeholder check
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
@@ -107,18 +107,24 @@ func (v *BaseVirtualFolder) HasRedactedSecret() bool {
|
|||||||
|
|
||||||
// hasPathPlaceholder returns true if the folder has a path placeholder
|
// hasPathPlaceholder returns true if the folder has a path placeholder
|
||||||
func (v *BaseVirtualFolder) hasPathPlaceholder() bool {
|
func (v *BaseVirtualFolder) hasPathPlaceholder() bool {
|
||||||
placeholder := "%username%"
|
placeholders := []string{"%username%", "%role%"}
|
||||||
|
var config string
|
||||||
switch v.FsConfig.Provider {
|
switch v.FsConfig.Provider {
|
||||||
case sdk.S3FilesystemProvider:
|
case sdk.S3FilesystemProvider:
|
||||||
return strings.Contains(v.FsConfig.S3Config.KeyPrefix, placeholder)
|
config = v.FsConfig.S3Config.KeyPrefix
|
||||||
case sdk.GCSFilesystemProvider:
|
case sdk.GCSFilesystemProvider:
|
||||||
return strings.Contains(v.FsConfig.GCSConfig.KeyPrefix, placeholder)
|
config = v.FsConfig.GCSConfig.KeyPrefix
|
||||||
case sdk.AzureBlobFilesystemProvider:
|
case sdk.AzureBlobFilesystemProvider:
|
||||||
return strings.Contains(v.FsConfig.AzBlobConfig.KeyPrefix, placeholder)
|
config = v.FsConfig.AzBlobConfig.KeyPrefix
|
||||||
case sdk.SFTPFilesystemProvider:
|
case sdk.SFTPFilesystemProvider:
|
||||||
return strings.Contains(v.FsConfig.SFTPConfig.Prefix, placeholder)
|
config = v.FsConfig.SFTPConfig.Prefix
|
||||||
case sdk.LocalFilesystemProvider, sdk.CryptedFilesystemProvider:
|
case sdk.LocalFilesystemProvider, sdk.CryptedFilesystemProvider:
|
||||||
return strings.Contains(v.MappedPath, placeholder)
|
config = v.MappedPath
|
||||||
|
}
|
||||||
|
for _, placeholder := range placeholders {
|
||||||
|
if strings.Contains(config, placeholder) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user