fix: do not change permissions on config directory symlinks
When running in docker, the 'config' directory can be a symlink, which causes issues during plugin installation. Refs #7308
This commit is contained in:
2 files changed
+22
-6
No files matched your search
@@ -108,6 +108,17 @@ func IsAbsPath(path string) bool {
|
|||||||
return strings.HasPrefix(path, "/")
|
return strings.HasPrefix(path, "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsSymlink returns true if the path is a symlink
|
||||||
|
// if lstat fails, it returns false
|
||||||
|
func IsSymlink(path string) bool {
|
||||||
|
info, err := os.Lstat(path)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return info.Mode()&os.ModeSymlink == os.ModeSymlink
|
||||||
|
}
|
||||||
|
|
||||||
// ListFilesWithPrefix lists files within a given path that have a given prefix
|
// ListFilesWithPrefix lists files within a given path that have a given prefix
|
||||||
func ListFilesWithPrefix(path string, prefix string) []string {
|
func ListFilesWithPrefix(path string, prefix string) []string {
|
||||||
names, err := os.ReadDir(path)
|
names, err := os.ReadDir(path)
|
||||||
|
|||||||
@@ -516,19 +516,24 @@ func PropertyWrite(pluginName string, appName string, property string, value str
|
|||||||
|
|
||||||
// PropertySetup creates the plugin config root
|
// PropertySetup creates the plugin config root
|
||||||
func PropertySetup(pluginName string) error {
|
func PropertySetup(pluginName string) error {
|
||||||
|
configRoot := filepath.Join(MustGetEnv("DOKKU_LIB_ROOT"), "config")
|
||||||
pluginConfigRoot := getPluginConfigPath(pluginName)
|
pluginConfigRoot := getPluginConfigPath(pluginName)
|
||||||
if err := os.MkdirAll(pluginConfigRoot, 0755); err != nil {
|
if err := os.MkdirAll(pluginConfigRoot, 0755); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
input := SetPermissionInput{
|
// check if configRoot is a symlink
|
||||||
Filename: filepath.Join(MustGetEnv("DOKKU_LIB_ROOT"), "config"),
|
if !IsSymlink(configRoot) {
|
||||||
Mode: os.FileMode(0755),
|
input := SetPermissionInput{
|
||||||
|
Filename: configRoot,
|
||||||
|
Mode: os.FileMode(0755),
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := SetPermissions(input); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := SetPermissions(input); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return SetPermissions(SetPermissionInput{
|
return SetPermissions(SetPermissionInput{
|
||||||
Filename: pluginConfigRoot,
|
Filename: pluginConfigRoot,
|
||||||
Mode: os.FileMode(0755),
|
Mode: os.FileMode(0755),
|
||||||
|
|||||||
Reference in new issue
Block a user