dearwolf/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2025-06-01 00:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 28

fix: config_file_watcher.go - root all file reads for safety (#2144)

Browse source 
callHandler() now has all file access rooted within DynamicConfigDir

Signed-off-by: Dave Lee <dave@gray101.com>
This commit is contained in:
Dave 2024-04-26 12:46:35 -04:00 • committed by GitHub
parent c9451cb604
commit 2dc1fa2474
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/startup/config_file_watcher.go
View file

@ -21,7 +21,6 @@ type configFileHandler struct {
watcher *fsnotify.Watcher watcher *fsnotify.Watcher
configDir string
appConfig *config.ApplicationConfig appConfig *config.ApplicationConfig
} }
@ -30,7 +29,6 @@ type configFileHandler struct {
func newConfigFileHandler(appConfig *config.ApplicationConfig) configFileHandler { func newConfigFileHandler(appConfig *config.ApplicationConfig) configFileHandler {
c := configFileHandler{ c := configFileHandler{
handlers: make(map[string]fileHandler), handlers: make(map[string]fileHandler),
configDir: appConfig.DynamicConfigsDir,
appConfig: appConfig, appConfig: appConfig,
} }
c.Register("api_keys.json", readApiKeysJson(*appConfig), true) c.Register("api_keys.json", readApiKeysJson(*appConfig), true)
@ -45,16 +43,17 @@ func (c *configFileHandler) Register(filename string, handler fileHandler, runNo
} }
c.handlers[filename] = handler c.handlers[filename] = handler
if runNow { if runNow {
c.callHandler(path.Join(c.appConfig.DynamicConfigsDir, filename), handler) c.callHandler(filename, handler)
} }
return nil return nil
} }
func (c *configFileHandler) callHandler(filename string, handler fileHandler) { func (c *configFileHandler) callHandler(filename string, handler fileHandler) {
log.Trace().Str("filename", filename).Msg("reading file for dynamic config update") rootedFilePath := filepath.Join(c.appConfig.DynamicConfigsDir, filepath.Clean(filename))
fileContent, err := os.ReadFile(filename) log.Trace().Str("filename", rootedFilePath).Msg("reading file for dynamic config update")
fileContent, err := os.ReadFile(rootedFilePath)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
log.Error().Err(err).Str("filename", filename).Msg("could not read file") log.Error().Err(err).Str("filename", rootedFilePath).Msg("could not read file")
} }
if err = handler(fileContent, c.appConfig); err != nil { if err = handler(fileContent, c.appConfig); err != nil {
@ -66,7 +65,8 @@ func (c *configFileHandler) Watch() error {
configWatcher, err := fsnotify.NewWatcher() configWatcher, err := fsnotify.NewWatcher()
c.watcher = configWatcher c.watcher = configWatcher
if err != nil { if err != nil {
log.Fatal().Err(err).Str("configdir", c.configDir).Msg("wnable to create a watcher for configuration directory") log.Fatal().Err(err).Str("configdir", c.appConfig.DynamicConfigsDir).Msg("unable to create a watcher for configuration directory")
} }
if c.appConfig.DynamicConfigsDirPollInterval > 0 { if c.appConfig.DynamicConfigsDirPollInterval > 0 {
@ -77,7 +77,7 @@ func (c *configFileHandler) Watch() error {
<-ticker.C <-ticker.C
for file, handler := range c.handlers { for file, handler := range c.handlers {
log.Debug().Str("file", file).Msg("polling config file") log.Debug().Str("file", file).Msg("polling config file")
c.callHandler(filepath.Join(c.appConfig.DynamicConfigsDir, file), handler) c.callHandler(file, handler)
} }
} }
}() }()
@ -97,7 +97,7 @@ func (c *configFileHandler) Watch() error {
continue continue
} }
c.callHandler(event.Name, handler) c.callHandler(filepath.Base(event.Name), handler)
} }
case err, ok := <-c.watcher.Errors: case err, ok := <-c.watcher.Errors:
log.Error().Err(err).Msg("config watcher error received") log.Error().Err(err).Msg("config watcher error received")