github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-26 04:59:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: Fix validate command when JSON contains "@id" fields

Browse Source 
Also, don't run admin server when validating...
This commit is contained in:
Matthew Holt
2019-12-12 14:30:22 -07:00
parent 2e0615270d
commit f935458e3e
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
caddy.go
View File

@ -153,16 +153,7 @@ func changeConfig(method, path string, input []byte, forceReload bool) error {
// (an alternate way to do this would be to delete them from
// rawCfg as they are indexed, then iterate the index we made
// and add them back after encoding as JSON)
newCfg = idRegexp.ReplaceAllFunc(newCfg, func(in []byte) []byte {
// matches with a comma on both sides (when "@id" property is
// not the first or last in the object) need to keep exactly
// one comma for correct JSON syntax
comma := []byte{','}
if bytes.HasPrefix(in, comma) && bytes.HasSuffix(in, comma) {
return comma
}
return []byte{}
})
newCfg = RemoveMetaFields(newCfg)
// load this new config; if it fails, we need to revert to
// our old representation of caddy's actual config
@ -295,9 +286,11 @@ func run(newCfg *Config, start bool) error {
var err error
// start the admin endpoint (and stop any prior one)
err = replaceAdmin(newCfg)
if err != nil {
return fmt.Errorf("starting caddy administration endpoint: %v", err)
if start {
err = replaceAdmin(newCfg)
if err != nil {
return fmt.Errorf("starting caddy administration endpoint: %v", err)
}
}
if newCfg == nil {