-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Central Management blacklisting #9099
Changes from all commits
268dca4
8bc8b24
e91a844
0f802c3
0ac34dc
9254f79
7dd370e
b3dcca5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
// or more contributor license agreements. Licensed under the Elastic License; | ||
// you may not use this file except in compliance with the Elastic License. | ||
|
||
package management | ||
|
||
import ( | ||
"fmt" | ||
"regexp" | ||
"strings" | ||
|
||
"github.com/joeshaw/multierror" | ||
"github.com/pkg/errors" | ||
|
||
"github.com/elastic/beats/libbeat/common" | ||
"github.com/elastic/beats/x-pack/libbeat/management/api" | ||
) | ||
|
||
// ConfigBlacklist takes a ConfigBlocks object and filter it based on the given | ||
// blacklist settings | ||
type ConfigBlacklist struct { | ||
patterns map[string]*regexp.Regexp | ||
} | ||
|
||
// ConfigBlacklistSettings holds a list of fields and regular expressions to blacklist | ||
type ConfigBlacklistSettings struct { | ||
Patterns map[string]string `yaml:",inline"` | ||
} | ||
|
||
// Unpack unpacks nested fields set with dot notation like foo.bar into the proper nesting | ||
// in a nested map/slice structure. | ||
func (f *ConfigBlacklistSettings) Unpack(from interface{}) error { | ||
m, ok := from.(map[string]interface{}) | ||
if !ok { | ||
return fmt.Errorf("wrong type, map is expected") | ||
} | ||
|
||
f.Patterns = map[string]string{} | ||
for k, v := range common.MapStr(m).Flatten() { | ||
f.Patterns[k] = fmt.Sprintf("%s", v) | ||
} | ||
|
||
return nil | ||
} | ||
urso marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// NewConfigBlacklist filters configs from CM according to a given blacklist | ||
func NewConfigBlacklist(cfg ConfigBlacklistSettings) (*ConfigBlacklist, error) { | ||
list := ConfigBlacklist{ | ||
patterns: map[string]*regexp.Regexp{}, | ||
} | ||
|
||
for field, pattern := range cfg.Patterns { | ||
exp, err := regexp.Compile(pattern) | ||
if err != nil { | ||
return nil, errors.Wrap(err, fmt.Sprintf("Given expression is not a valid regexp: %s", pattern)) | ||
} | ||
|
||
list.patterns[field] = exp | ||
} | ||
|
||
return &list, nil | ||
} | ||
|
||
// Filter an error if any of the given config blocks is blacklisted | ||
func (c *ConfigBlacklist) Filter(configBlocks api.ConfigBlocks) error { | ||
var errs multierror.Errors | ||
|
||
for _, configs := range configBlocks { | ||
for _, block := range configs.Blocks { | ||
if c.isBlacklisted(configs.Type, block) { | ||
errs = append(errs, fmt.Errorf("Config for '%s' is blacklisted", configs.Type)) | ||
} | ||
} | ||
} | ||
|
||
return errs.Err() | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. From what I see, lets say that we receive a config block with a black listed option, we would log an error and still apply the other config blocks? I think to have least surprise as a user it would be better to refuse to apply all the blocks, my reasoning is if we instead apply blocks in part we have an inconsistent view of the configuration and this would be unexpected? Maybe I am wrong. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Or maybe we don't have the mechanism yet in place to communicate that problem to the user through the UI? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a fair question, I don't know what the user should expect in these cases. So your approach would be to "pause" the beat, and disable all modules & outputs until the configuration is not blacklisted? We currently have a way to report an error, it refers users to the log file when that happens. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, not sure either do we want a half working beats or do we want a consistent beat? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No matter what, we also to signal the UI that configs can not be applied due to the blacklist. Just logging the issue locally, makes it somewhat 'silent'. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, people could have access to management but don't have physical access to the machine. @urso I think it could be done in two PR, this one to detect errors and another one to improve the feedback loop of a beats since this would certainly require UI changes to support it. |
||
|
||
func (c *ConfigBlacklist) isBlacklisted(blockType string, block *api.ConfigBlock) bool { | ||
cfg, err := block.ConfigWithMeta() | ||
if err != nil { | ||
return false | ||
} | ||
|
||
for field, pattern := range c.patterns { | ||
prefix := blockType | ||
if strings.Contains(field, ".") { | ||
prefix += "." | ||
} | ||
|
||
if strings.HasPrefix(field, prefix) { | ||
// This pattern affects a field on this block type | ||
field = field[len(prefix):] | ||
var segments []string | ||
if len(field) > 0 { | ||
segments = strings.Split(field, ".") | ||
} | ||
if c.isBlacklistedBlock(pattern, segments, cfg.Config) { | ||
return true | ||
} | ||
} | ||
} | ||
|
||
return false | ||
} | ||
|
||
func (c *ConfigBlacklist) isBlacklistedBlock(pattern *regexp.Regexp, segments []string, current *common.Config) bool { | ||
if current.IsDict() { | ||
switch len(segments) { | ||
case 0: | ||
for _, field := range current.GetFields() { | ||
if pattern.MatchString(field) { | ||
return true | ||
} | ||
} | ||
|
||
case 1: | ||
// Check field in the dict | ||
val, err := current.String(segments[0], -1) | ||
if err == nil { | ||
return pattern.MatchString(val) | ||
} | ||
// not a string, traverse | ||
child, _ := current.Child(segments[0], -1) | ||
return child != nil && c.isBlacklistedBlock(pattern, segments[1:], child) | ||
|
||
default: | ||
// traverse the tree | ||
child, _ := current.Child(segments[0], -1) | ||
return child != nil && c.isBlacklistedBlock(pattern, segments[1:], child) | ||
|
||
} | ||
} | ||
|
||
if current.IsArray() { | ||
switch len(segments) { | ||
case 0: | ||
// List of elements, match strings | ||
for count, _ := current.CountField(""); count > 0; count-- { | ||
val, err := current.String("", count-1) | ||
if err == nil && pattern.MatchString(val) { | ||
return true | ||
} | ||
|
||
// not a string, traverse | ||
child, _ := current.Child("", count-1) | ||
if child != nil { | ||
if c.isBlacklistedBlock(pattern, segments, child) { | ||
return true | ||
} | ||
} | ||
} | ||
|
||
default: | ||
// List of elements, explode traversal to all of them | ||
for count, _ := current.CountField(""); count > 0; count-- { | ||
child, _ := current.Child("", count-1) | ||
if child != nil && c.isBlacklistedBlock(pattern, segments, child) { | ||
return true | ||
} | ||
} | ||
} | ||
} | ||
|
||
return false | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
better use
match.Matcher
here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will do the change in a followup PR that will include the changelog.