scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-09 14:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change the way auth is instantiated, and send to handler

Browse source
This commit is contained in:
Samir Patel 2021-12-13 23:12:04 -06:00
parent 541132a176
commit 4eee8a4245
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
server/server.go
View file

@ -29,6 +29,7 @@ import (
"golang.org/x/sync/errgroup"
pilosa "github.com/molecula/featurebase/v2"
"github.com/molecula/featurebase/v2/auth"
"github.com/molecula/featurebase/v2/boltdb"
"github.com/molecula/featurebase/v2/encoding/proto"
petcd "github.com/molecula/featurebase/v2/etcd"
@ -81,6 +82,8 @@ type Command struct {
pgserver *PostgresServer
serverOptions []pilosa.ServerOption
auth *auth.Auth
}
type CommandOption func(c *Command) error
@ -222,10 +225,6 @@ func (m *Command) Start() (err error) {
return errors.Wrap(err, "setting resource limits")
}
if m.Config.Auth.Enable {
m.Config.MustValidateAuth()
}
// Initialize server.
if err = m.Server.Open(); err != nil {
return errors.Wrap(err, "opening server")
@ -523,6 +522,15 @@ func (m *Command) SetupServer() error {
return errors.Wrap(err, "new grpc server")
}
if m.Config.Auth.Enable {
m.Config.MustValidateAuth()
ac := m.Config.Auth
scopes := []string{"https://graph.microsoft.com/.default", "offline_access"}
m.auth, _ = auth.NewAuth(m.logger, m.listenURI.String(), scopes, ac.AuthorizeURL, ac.TokenURL, ac.GroupEndpointURL, ac.ClientId, ac.ClientSecret, ac.HashKey, ac.BlockKey)
}
m.logger.Infof("Before Handler %+v", m.auth)
m.Handler, err = http.NewHandler(
http.OptHandlerAllowedOrigins(m.Config.Handler.AllowedOrigins),
http.OptHandlerAPI(m.API),
@ -531,6 +539,7 @@ func (m *Command) SetupServer() error {
http.OptHandlerListener(m.ln, m.Config.Advertise),
http.OptHandlerCloseTimeout(m.closeTimeout),
http.OptHandlerMiddleware(m.grpcServer.middleware(m.Config.Handler.AllowedOrigins)),
http.OptHandlerAuth(m.auth),
)
return errors.Wrap(err, "new handler")
}