@@ -28,6 +28,8 @@ type DefaultCache struct {
2828 Headers []string `json:"headers"`
2929 // Configure the global key generation.
3030 Key configurationtypes.Key `json:"key"`
31+ // Mode defines if strict or bypass.
32+ Mode string `json:"mode"`
3133 // Olric provider configuration.
3234 Olric configurationtypes.CacheProvider `json:"olric"`
3335 // Redis provider configuration.
@@ -86,6 +88,11 @@ func (d *DefaultCache) GetEtcd() configurationtypes.CacheProvider {
8688 return d .Etcd
8789}
8890
91+ // GetMode returns mdoe configuration
92+ func (d * DefaultCache ) GetMode () string {
93+ return d .Mode
94+ }
95+
8996// GetNuts returns nuts configuration
9097func (d * DefaultCache ) GetNuts () configurationtypes.CacheProvider {
9198 return d .Nuts
@@ -274,6 +281,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
274281 switch directive {
275282 case "basepath" :
276283 apiConfiguration .Debug .BasePath = h .RemainingArgs ()[0 ]
284+ default :
285+ return h .Errf ("unsupported debug directive: %s" , directive )
277286 }
278287 }
279288 case "prometheus" :
@@ -284,6 +293,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
284293 switch directive {
285294 case "basepath" :
286295 apiConfiguration .Prometheus .BasePath = h .RemainingArgs ()[0 ]
296+ default :
297+ return h .Errf ("unsupported prometheus directive: %s" , directive )
287298 }
288299 }
289300 case "souin" :
@@ -294,8 +305,12 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
294305 switch directive {
295306 case "basepath" :
296307 apiConfiguration .Souin .BasePath = h .RemainingArgs ()[0 ]
308+ default :
309+ return h .Errf ("unsupported souin directive: %s" , directive )
297310 }
298311 }
312+ default :
313+ return h .Errf ("unsupported api directive: %s" , directive )
299314 }
300315 }
301316 cfg .API = apiConfiguration
@@ -310,6 +325,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
310325 case "configuration" :
311326 provider .Configuration = parseCaddyfileRecursively (h )
312327 provider .Configuration = parseBadgerConfiguration (provider .Configuration .(map [string ]interface {}))
328+ default :
329+ return h .Errf ("unsupported badger directive: %s" , directive )
313330 }
314331 }
315332 cfg .DefaultCache .Badger = provider
@@ -337,6 +354,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
337354 ck .Hide = true
338355 case "headers" :
339356 ck .Headers = h .RemainingArgs ()
357+ default :
358+ return h .Errf ("unsupported cache_keys (%s) directive: %s" , rg , directive )
340359 }
341360 }
342361
@@ -367,6 +386,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
367386 cdn .Provider = h .RemainingArgs ()[0 ]
368387 case "strategy" :
369388 cdn .Strategy = h .RemainingArgs ()[0 ]
389+ default :
390+ return h .Errf ("unsupported cdn directive: %s" , directive )
370391 }
371392 }
372393 cfg .DefaultCache .CDN = cdn
@@ -381,6 +402,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
381402 switch directive {
382403 case "configuration" :
383404 provider .Configuration = parseCaddyfileRecursively (h )
405+ default :
406+ return h .Errf ("unsupported etcd directive: %s" , directive )
384407 }
385408 }
386409 cfg .DefaultCache .Etcd = provider
@@ -403,12 +426,20 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
403426 config_key .Hide = true
404427 case "headers" :
405428 config_key .Headers = h .RemainingArgs ()
429+ default :
430+ return h .Errf ("unsupported key directive: %s" , directive )
406431 }
407432 }
408433 cfg .DefaultCache .Key = config_key
409434 case "log_level" :
410435 args := h .RemainingArgs ()
411436 cfg .LogLevel = args [0 ]
437+ case "mode" :
438+ args := h .RemainingArgs ()
439+ if len (args ) > 1 {
440+ return h .Errf ("mode must contains only one arg: %s given" , args )
441+ }
442+ cfg .DefaultCache .Mode = args [0 ]
412443 case "nuts" :
413444 provider := configurationtypes.CacheProvider {}
414445 for nesting := h .Nesting (); h .NextBlock (nesting ); {
@@ -422,6 +453,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
422453 provider .Path = urlArgs [0 ]
423454 case "configuration" :
424455 provider .Configuration = parseCaddyfileRecursively (h )
456+ default :
457+ return h .Errf ("unsupported nuts directive: %s" , directive )
425458 }
426459 }
427460 cfg .DefaultCache .Nuts = provider
@@ -439,6 +472,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
439472 provider .Path = urlArgs [0 ]
440473 case "configuration" :
441474 provider .Configuration = parseCaddyfileRecursively (h )
475+ default :
476+ return h .Errf ("unsupported olric directive: %s" , directive )
442477 }
443478 }
444479 cfg .DefaultCache .Olric = provider
@@ -457,6 +492,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
457492 case "configuration" :
458493 provider .Configuration = parseCaddyfileRecursively (h )
459494 provider .Configuration = parseRedisConfiguration (provider .Configuration .(map [string ]interface {}))
495+ default :
496+ return h .Errf ("unsupported redis directive: %s" , directive )
460497 }
461498 }
462499 cfg .DefaultCache .Redis = provider
@@ -466,6 +503,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
466503 switch directive {
467504 case "exclude" :
468505 cfg .DefaultCache .Regex .Exclude = h .RemainingArgs ()[0 ]
506+ default :
507+ return h .Errf ("unsupported regex directive: %s" , directive )
469508 }
470509 }
471510 case "stale" :
@@ -493,6 +532,8 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
493532 d .Duration = ttl
494533 }
495534 timeout .Cache = d
535+ default :
536+ return h .Errf ("unsupported timeout directive: %s" , directive )
496537 }
497538 }
498539 cfg .DefaultCache .Timeout = timeout
@@ -503,9 +544,7 @@ func parseConfiguration(cfg *Configuration, h *caddyfile.Dispenser, isBlocking b
503544 cfg .DefaultCache .TTL .Duration = ttl
504545 }
505546 default :
506- if isBlocking {
507- return h .Errf ("unsupported root directive: %s" , rootOption )
508- }
547+ return h .Errf ("unsupported root directive: %s" , rootOption )
509548 }
510549 }
511550 }
0 commit comments