3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-21 04:57:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

authenticate: support hot reloaded config (#984)

Browse source 
By implementinng OptionsUpdater interface.

Fixes #982
This commit is contained in:
Cuong Manh Le 2020-06-24 00:18:20 +07:00 • committed by GitHub
parent eaa0c980d2
commit 17ba595ced
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
authenticate/authenticate.go
View file

@ -9,6 +9,7 @@ import (
"fmt"
"html/template"
"net/url"
"sync"
"gopkg.in/square/go-jose.v2"
@ -25,6 +26,7 @@ import (
"github.com/pomerium/pomerium/internal/httputil"
"github.com/pomerium/pomerium/internal/identity"
"github.com/pomerium/pomerium/internal/identity/oauth"
"github.com/pomerium/pomerium/internal/log"
"github.com/pomerium/pomerium/internal/sessions"
"github.com/pomerium/pomerium/internal/sessions/cookie"
"github.com/pomerium/pomerium/internal/sessions/header"
@ -105,6 +107,8 @@ type Authenticate struct {
// userClient is used to update users
userClient user.UserServiceClient
// guard administrator below.
administratorMu sync.Mutex
// administrators keeps track of administrator users.
administrator map[string]struct{}
@ -184,10 +188,6 @@ func New(opts config.Options) (*Authenticate, error) {
return nil, err
}
administrator := make(map[string]struct{}, len(opts.Administrators))
for _, admin := range opts.Administrators {
administrator[admin] = struct{}{}
}
a := &Authenticate{
RedirectURL: redirectURL,
// shared state
@ -208,7 +208,6 @@ func New(opts config.Options) (*Authenticate, error) {
dataBrokerClient: dataBrokerClient,
sessionClient: sessionClient,
userClient: userClient,
administrator: administrator,
jwk: &jose.JSONWebKeySet{},
templates: template.Must(frontend.NewTemplates()),
}
@ -227,3 +226,26 @@ func New(opts config.Options) (*Authenticate, error) {
return a, nil
}
func (a *Authenticate) setAdminUsers(opts *config.Options) {
a.administratorMu.Lock()
defer a.administratorMu.Unlock()
a.administrator = make(map[string]struct{}, len(opts.Administrators))
for _, admin := range opts.Administrators {
a.administrator[admin] = struct{}{}
}
}
// UpdateOptions implements the OptionsUpdater interface and updates internal
// structures based on config.Options
func (a *Authenticate) UpdateOptions(opts config.Options) error {
if a == nil {
return nil
}
log.Info().Str("checksum", fmt.Sprintf("%x", opts.Checksum())).Msg("authenticate: updating options")
a.setAdminUsers(&opts)
return nil
}