core: block CH queries earlier (#973)

block chaos queries, unless the chaos or proxy middleware is loaded. We
respond with REFUSED.

This removes the need for each middleware to do this class != ClassINET
if-then.

Also make config.Registry non-public.
This commit is contained in:
Miek Gieben
2017-08-25 08:55:53 +01:00
committed by GitHub
parent 932639ac99
commit 55dafe6f59
8 changed files with 18 additions and 29 deletions

View File

@@ -127,12 +127,12 @@ func (c *Config) AddMiddleware(m middleware.Middleware) {
// registerHandler adds a handler to a site's handler registration. Handlers
// use this to announce that they exist to other middleware.
func (c *Config) registerHandler(h middleware.Handler) {
if c.Registry == nil {
c.Registry = make(map[string]middleware.Handler)
if c.registry == nil {
c.registry = make(map[string]middleware.Handler)
}
// Just overwrite...
c.Registry[h.Name()] = h
c.registry[h.Name()] = h
}
// Handler returns the middleware handler that has been added to the config under its name.
@@ -140,10 +140,10 @@ func (c *Config) registerHandler(h middleware.Handler) {
// Note that this is order dependent and the order is defined in directives.go, i.e. if your middleware
// comes before the middleware you are checking; it will not be there (yet).
func (c *Config) Handler(name string) middleware.Handler {
if c.Registry == nil {
if c.registry == nil {
return nil
}
if h, ok := c.Registry[name]; ok {
if h, ok := c.registry[name]; ok {
return h
}
return nil