mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-01-05 19:21:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

[server] Fix absolute path checks

Browse Source
This commit is contained in:
Abhishek Shroff
2025-07-08 21:51:50 +05:30
parent de42d942bb
commit 58dd057436
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/internal/storage/local_storage.go
View File

@@ -21,8 +21,8 @@ func createLocalBackend(name string, params map[string]string) (LocalBackend, er
}
root := params["root"]
if !strings.HasPrefix(params[root], string(os.PathSeparator)) {
root = filepath.Join(Cfg.Root, root)
if !filepath.IsAbs(params[root]) {
root = filepath.Join(storageRoot, root)
}
l := localStorage{
name: name,

28
server/internal/storage/storage.go
View File

@@ -5,7 +5,6 @@ import (
"errors"
"os"
"path/filepath"
"strings"
"codeberg.org/shroff/phylum/server/internal/db"
"codeberg.org/shroff/phylum/server/internal/pubsub"
@@ -17,6 +16,7 @@ const DefaultBackendName = "_"
var defaultBackend LocalBackend
var backends map[string]Backend
var storageRoot string
var tempDir string
type BackendConfig struct {
@@ -26,25 +26,27 @@ type BackendConfig struct {
}
func Initialize(db db.Handler, cfg Config) error {
if err := os.MkdirAll(cfg.Root, 0o700); err != nil {
return errors.New("failed to create storage root(" + cfg.Root + "): " + err.Error())
storageRoot = cfg.Root
if err := os.MkdirAll(storageRoot, 0o700); err != nil {
return errors.New("failed to create storage root(" + storageRoot + "): " + err.Error())
} else {
if stat, err := os.Stat(cfg.Root); err != nil {
return errors.New("failed to stat storage root(" + cfg.Root + "): " + err.Error())
if stat, err := os.Stat(storageRoot); err != nil {
return errors.New("failed to stat storage root(" + storageRoot + "): " + err.Error())
} else if stat.Mode()&0xfff != 0o700 {
os.Chmod(cfg.Root, 0o700)
}
}
tempDir = cfg.Temp
if !strings.HasPrefix(cfg.Temp, string(os.PathSeparator)) {
tempDir = filepath.Join(cfg.Root, tempDir)
}
if err := os.RemoveAll(tempDir); err != nil {
return errors.New("failed to clear temp directory: " + err.Error())
}
if err := os.MkdirAll(tempDir, 0700); err != nil {
return errors.New("failed to create temp directory: " + err.Error())
if !filepath.IsAbs(tempDir) {
tempDir = filepath.Join(storageRoot, tempDir)
if err := os.RemoveAll(tempDir); err != nil {
return errors.New("failed to clear temp directory: " + err.Error())
}
if err := os.MkdirAll(tempDir, 0700); err != nil {
return errors.New("failed to create temp directory: " + err.Error())
}
}
if restoredBackends, err := restoreBackends(db); err != nil {