3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-20 12:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

databroker: add tracing for rego evaluation and databroker sync, fix bug in databroker config source (#1367)

Browse source
This commit is contained in:
Caleb Doxsey 2020-09-03 08:11:34 -06:00 • committed by GitHub
parent 5488e6d5fa
commit 49d1a71ff2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/databroker/config_source.go
View file

@ -12,6 +12,7 @@ import (
"github.com/pomerium/pomerium/config"
"github.com/pomerium/pomerium/internal/log"
"github.com/pomerium/pomerium/internal/telemetry/trace"
"github.com/pomerium/pomerium/pkg/grpc"
configpb "github.com/pomerium/pomerium/pkg/grpc/config"
"github.com/pomerium/pomerium/pkg/grpc/databroker"
@ -70,6 +71,9 @@ func (src *ConfigSource) GetConfig() *config.Config {
}
func (src *ConfigSource) rebuild(firstTime bool) {
_, span := trace.StartSpan(context.Background(), "databroker.config_source.rebuild")
defer span.End()
src.mu.Lock()
defer src.mu.Unlock()
@ -83,10 +87,18 @@ func (src *ConfigSource) rebuild(firstTime bool) {
seen[policy.RouteID()] = struct{}{}
}
var additionalPolicies []config.Policy
// add all the config policies to the list
for _, cfgpb := range src.dbConfigs {
cfg.Options.ApplySettings(cfgpb.Settings)
err := cfg.Options.Validate()
if err != nil {
log.Warn().Err(err).Msg("databroker: invalid config detected, ignoring")
return
}
for _, routepb := range cfgpb.GetRoutes() {
policy, err := config.NewPolicyFromProto(routepb)
if err != nil {
@ -112,16 +124,13 @@ func (src *ConfigSource) rebuild(firstTime bool) {
}
seen[routeID] = struct{}{}
cfg.Options.Policies = append(cfg.Options.Policies, *policy)
}
err := cfg.Options.Validate()
if err != nil {
log.Warn().Err(err).Msg("databroker: invalid config detected, ignoring")
return
additionalPolicies = append(additionalPolicies, *policy)
}
}
// add the additional policies here since calling `Validate` will reset them.
cfg.Options.Policies = append(cfg.Options.Policies, additionalPolicies...)
src.computedConfig = cfg
if !firstTime {
src.Trigger(cfg)