summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/httpcaddyfile/httptype.go8
-rw-r--r--caddyconfig/httpcaddyfile/httptype_test.go52
-rw-r--r--caddyconfig/httpcaddyfile/options.go38
3 files changed, 84 insertions, 14 deletions
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
index 3f37f02..130067d 100644
--- a/caddyconfig/httpcaddyfile/httptype.go
+++ b/caddyconfig/httpcaddyfile/httptype.go
@@ -261,12 +261,8 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock,
storageCvtr.(caddy.Module).CaddyModule().ID.Name(),
&warnings)
}
- if adminConfig, ok := options["admin"].(string); ok && adminConfig != "" {
- if adminConfig == "off" {
- cfg.Admin = &caddy.AdminConfig{Disabled: true}
- } else {
- cfg.Admin = &caddy.AdminConfig{Listen: adminConfig}
- }
+ if adminConfig, ok := options["admin"].(*caddy.AdminConfig); ok && adminConfig != nil {
+ cfg.Admin = adminConfig
}
if len(customLogs) > 0 {
if cfg.Logging == nil {
diff --git a/caddyconfig/httpcaddyfile/httptype_test.go b/caddyconfig/httpcaddyfile/httptype_test.go
index b0ee3ac..233e374 100644
--- a/caddyconfig/httpcaddyfile/httptype_test.go
+++ b/caddyconfig/httpcaddyfile/httptype_test.go
@@ -164,6 +164,58 @@ func TestGlobalOptions(t *testing.T) {
expectWarn: false,
expectError: true,
},
+ {
+ input: `
+ {
+ admin {
+ enforce_origin
+ origins 192.168.1.1:2020 127.0.0.1:2020
+ }
+ }
+ :80
+ `,
+ expectWarn: false,
+ expectError: false,
+ },
+ {
+ input: `
+ {
+ admin 127.0.0.1:2020 {
+ enforce_origin
+ origins 192.168.1.1:2020 127.0.0.1:2020
+ }
+ }
+ :80
+ `,
+ expectWarn: false,
+ expectError: false,
+ },
+ {
+ input: `
+ {
+ admin 192.168.1.1:2020 127.0.0.1:2020 {
+ enforce_origin
+ origins 192.168.1.1:2020 127.0.0.1:2020
+ }
+ }
+ :80
+ `,
+ expectWarn: false,
+ expectError: true,
+ },
+ {
+ input: `
+ {
+ admin off {
+ enforce_origin
+ origins 192.168.1.1:2020 127.0.0.1:2020
+ }
+ }
+ :80
+ `,
+ expectWarn: false,
+ expectError: true,
+ },
} {
adapter := caddyfile.Adapter{
diff --git a/caddyconfig/httpcaddyfile/options.go b/caddyconfig/httpcaddyfile/options.go
index f69ca3e..613bbc6 100644
--- a/caddyconfig/httpcaddyfile/options.go
+++ b/caddyconfig/httpcaddyfile/options.go
@@ -223,17 +223,39 @@ func parseOptSingleString(d *caddyfile.Dispenser) (interface{}, error) {
}
func parseOptAdmin(d *caddyfile.Dispenser) (interface{}, error) {
- if d.Next() {
- var listenAddress string
- if !d.AllArgs(&listenAddress) {
- return "", d.ArgErr()
+ adminCfg := new(caddy.AdminConfig)
+ for d.Next() {
+ if d.NextArg() {
+ listenAddress := d.Val()
+ if listenAddress == "off" {
+ adminCfg.Disabled = true
+ if d.Next() { // Do not accept any remaining options including block
+ return nil, d.Err("No more option is allowed after turning off admin config")
+ }
+ } else {
+ adminCfg.Listen = listenAddress
+ if d.NextArg() { // At most 1 arg is allowed
+ return nil, d.ArgErr()
+ }
+ }
}
- if listenAddress == "" {
- listenAddress = caddy.DefaultAdminListen
+ for nesting := d.Nesting(); d.NextBlock(nesting); {
+ switch d.Val() {
+ case "enforce_origin":
+ adminCfg.EnforceOrigin = true
+
+ case "origins":
+ adminCfg.Origins = d.RemainingArgs()
+
+ default:
+ return nil, d.Errf("unrecognized parameter '%s'", d.Val())
+ }
}
- return listenAddress, nil
}
- return "", nil
+ if adminCfg.Listen == "" && !adminCfg.Disabled {
+ adminCfg.Listen = caddy.DefaultAdminListen
+ }
+ return adminCfg, nil
}
func parseOptOnDemand(d *caddyfile.Dispenser) (interface{}, error) {