IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 07:35:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Fix installing plugins on windows (#19061)

Browse Source 
Fixes #19022
This commit is contained in:
Marcus Efraimsson 2019-09-13 18:12:52 +02:00 committed by GitHub
parent 7b7b95341e
commit 2acffbeb10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cmd/grafana-cli/commands/install_command.go
View File

@ -199,14 +199,14 @@ func extractFiles(body []byte, pluginName string, filePath string, allowSymlinks
} }
for _, zf := range r.File { for _, zf := range r.File {
newFileName := RemoveGitBuildFromName(pluginName, zf.Name) newFileName := RemoveGitBuildFromName(pluginName, zf.Name)
if !isPathSafe(newFileName, path.Join(filePath, pluginName)) { if !isPathSafe(newFileName, filepath.Join(filePath, pluginName)) {
return xerrors.Errorf("filepath: %v tries to write outside of plugin directory: %v. This can be a security risk.", zf.Name, path.Join(filePath, pluginName)) return xerrors.Errorf("filepath: %v tries to write outside of plugin directory: %v. This can be a security risk.", zf.Name, path.Join(filePath, pluginName))
} }
newFile := path.Join(filePath, newFileName) newFile := path.Join(filePath, newFileName)
if zf.FileInfo().IsDir() { if zf.FileInfo().IsDir() {
err := os.Mkdir(newFile, 0755) err := os.Mkdir(newFile, 0755)
if permissionsError(err) { if os.IsPermission(err) {
return fmt.Errorf(permissionsDeniedMessage, newFile) return fmt.Errorf(permissionsDeniedMessage, newFile)
} }
} else { } else {
@ -234,10 +234,6 @@ func extractFiles(body []byte, pluginName string, filePath string, allowSymlinks
return nil return nil
} }
func permissionsError(err error) bool {
return err != nil && strings.Contains(err.Error(), "permission denied")
}
func isSymlink(file *zip.File) bool { func isSymlink(file *zip.File) bool {
return file.Mode()&os.ModeSymlink == os.ModeSymlink return file.Mode()&os.ModeSymlink == os.ModeSymlink
} }
@ -269,7 +265,7 @@ func extractFile(file *zip.File, filePath string) (err error) {
dst, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fileMode) dst, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fileMode)
if err != nil { if err != nil {
if permissionsError(err) { if os.IsPermission(err) {
return xerrors.Errorf(permissionsDeniedMessage, filePath) return xerrors.Errorf(permissionsDeniedMessage, filePath)
} }
return errutil.Wrap("Failed to open file", err) return errutil.Wrap("Failed to open file", err)

22
pkg/cmd/grafana-cli/commands/install_command_test.go
View File

@ -48,6 +48,7 @@ func TestFoldernameReplacement(t *testing.T) {
func TestExtractFiles(t *testing.T) { func TestExtractFiles(t *testing.T) {
t.Run("Should preserve file permissions for plugin backend binaries for linux and darwin", func(t *testing.T) { t.Run("Should preserve file permissions for plugin backend binaries for linux and darwin", func(t *testing.T) {
skipWindows(t)
pluginDir, del := setupFakePluginsDir(t) pluginDir, del := setupFakePluginsDir(t)
defer del() defer del()
@ -95,6 +96,7 @@ func TestExtractFiles(t *testing.T) {
}) })
t.Run("Should extract symlinks if allowed", func(t *testing.T) { t.Run("Should extract symlinks if allowed", func(t *testing.T) {
skipWindows(t)
pluginDir, del := setupFakePluginsDir(t) pluginDir, del := setupFakePluginsDir(t)
defer del() defer del()
@ -119,16 +121,18 @@ func TestInstallPluginCommand(t *testing.T) {
} }
func TestIsPathSafe(t *testing.T) { func TestIsPathSafe(t *testing.T) {
dest := fmt.Sprintf("%stest%spath", string(os.PathSeparator), string(os.PathSeparator))
t.Run("Should be true on nested destinations", func(t *testing.T) { t.Run("Should be true on nested destinations", func(t *testing.T) {
assert.True(t, isPathSafe("dest", "/test/path")) assert.True(t, isPathSafe("dest", dest))
assert.True(t, isPathSafe("dest/one", "/test/path")) assert.True(t, isPathSafe("dest/one", dest))
assert.True(t, isPathSafe("../path/dest/one", "/test/path")) assert.True(t, isPathSafe("../path/dest/one", dest))
}) })
t.Run("Should be false on destinations outside of path", func(t *testing.T) { t.Run("Should be false on destinations outside of path", func(t *testing.T) {
assert.False(t, isPathSafe("../dest", "/test/path")) assert.False(t, isPathSafe("../dest", dest))
assert.False(t, isPathSafe("../../", "/test/path")) assert.False(t, isPathSafe("../../", dest))
assert.False(t, isPathSafe("../../test", "/test/path")) assert.False(t, isPathSafe("../../test", dest))
}) })
} }
@ -189,3 +193,9 @@ func setupFakePluginsDir(t *testing.T) (string, func()) {
assert.Nil(t, err) assert.Nil(t, err)
} }
} }
func skipWindows(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("Skipping test on Windows")
}
}