IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix AdvancedLoggingConfig validation (#25304)

Browse Source 
Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Ben Schumacher 2023-11-16 21:22:01 +01:00 committed by GitHub
parent d8837fe313
commit b325c3a0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/model/config.go
View File

@ -1292,7 +1292,7 @@ func NewLogSettings() *LogSettings {
func (s *LogSettings) isValid() *AppError { func (s *LogSettings) isValid() *AppError {
cfg := make(mlog.LoggerConfiguration) cfg := make(mlog.LoggerConfiguration)
err := json.Unmarshal(s.GetAdvancedLoggingConfig(), &cfg) err := json.Unmarshal(s.AdvancedLoggingJSON, &cfg)
if err != nil { if err != nil {
return NewAppError("LogSettings.isValid", "model.config.is_valid.log.advanced_logging.json", map[string]any{"Error": err}, "", http.StatusBadRequest).Wrap(err) return NewAppError("LogSettings.isValid", "model.config.is_valid.log.advanced_logging.json", map[string]any{"Error": err}, "", http.StatusBadRequest).Wrap(err)
} }

6
server/public/model/config_test.go
View File

@ -1297,6 +1297,12 @@ func TestLogSettingsIsValid(t *testing.T) {
}, },
ExpectError: false, ExpectError: false,
}, },
"AdvancedLoggingConfig contains filepath": {
LogSettings: LogSettings{
AdvancedLoggingConfig: sToP("/some/Path"),
},
ExpectError: false,
},
} { } {
t.Run(name, func(t *testing.T) { t.Run(name, func(t *testing.T) {
test.LogSettings.SetDefaults() test.LogSettings.SetDefaults()