Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Dont fail config if agent opts is nil (#1898)

Browse source 
* Handle agentopts nil better

* Add changes file
This commit is contained in:
Tomas Touceda 2021-09-01 19:17:41 -03:00 committed by GitHub
parent 36971b4cb8
commit 15ce06263d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/dont-fail-config-agent-opts-nil Normal file
View file

@ -0,0 +1 @@
* Handle properly the case where the agent opts is nil in the app config.

11
server/service/service_osquery.go
View file

@ -224,10 +224,13 @@ func (svc *Service) GetClientConfig(ctx context.Context) (map[string]interface{}
return nil, osqueryError{message: "internal error: fetch base config: " + err.Error()}
}
var config map[string]interface{}
err = json.Unmarshal(baseConfig, &config)
if err != nil {
return nil, osqueryError{message: "internal error: parse base configuration: " + err.Error()}
config := make(map[string]interface{})
if baseConfig != nil {
err = json.Unmarshal(baseConfig, &config)
if err != nil {
return nil, osqueryError{message: "internal error: parse base configuration: " + err.Error()}
}
}
packs, err := svc.ds.ListPacksForHost(host.ID)