sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-19 16:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass account manager in to proxy grpc server for setup key generation

Browse Source
This commit is contained in:
Alisdair MacLeod
2026-01-28 08:39:09 +00:00
parent 2c9decfa55
commit b611d4a751
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
management/internals/server/boot.go
View File

@@ -159,7 +159,7 @@ func (s *BaseServer) GRPCServer() *grpc.Server {
func (s *BaseServer) ReverseProxyGRPCServer() *nbgrpc.ProxyServiceServer { func (s *BaseServer) ReverseProxyGRPCServer() *nbgrpc.ProxyServiceServer {
return Create(s, func() *nbgrpc.ProxyServiceServer { return Create(s, func() *nbgrpc.ProxyServiceServer {
proxyService := nbgrpc.NewProxyServiceServer(s.Store()) proxyService := nbgrpc.NewProxyServiceServer(s.Store(), s.AccountManager())
return proxyService return proxyService
}) })
} }

17
management/internals/shared/grpc/proxy.go
View File

@@ -53,10 +53,11 @@ type proxyConnection struct {
} }
// NewProxyServiceServer creates a new proxy service server // NewProxyServiceServer creates a new proxy service server
func NewProxyServiceServer(store reverseProxyStore) *ProxyServiceServer { func NewProxyServiceServer(store reverseProxyStore, keys keyStore) *ProxyServiceServer {
return &ProxyServiceServer{ return &ProxyServiceServer{
updatesChan: make(chan *proto.ProxyMapping, 100), updatesChan: make(chan *proto.ProxyMapping, 100),
reverseProxyStore: store, reverseProxyStore: store,
keyStore: keys,
} }
} }
@@ -113,9 +114,9 @@ func (s *ProxyServiceServer) GetMappingUpdate(req *proto.GetMappingUpdateRequest
// sendSnapshot sends the initial snapshot of all reverse proxies to proxy // sendSnapshot sends the initial snapshot of all reverse proxies to proxy
func (s *ProxyServiceServer) sendSnapshot(ctx context.Context, conn *proxyConnection) error { func (s *ProxyServiceServer) sendSnapshot(ctx context.Context, conn *proxyConnection) error {
reverseProxies, err := s.reverseProxyStore.GetAccountReverseProxies(ctx, store.LockingStrengthNone, conn.proxyID) // TODO: check locking strength and accountID. reverseProxies, err := s.reverseProxyStore.GetAccountReverseProxies(ctx, store.LockingStrengthNone, "accountID") // TODO: check locking strength and accountID.
if err != nil { if err != nil {
// TODO: something // TODO: something?
return fmt.Errorf("get account reverse proxies from store: %w", err) return fmt.Errorf("get account reverse proxies from store: %w", err)
} }
@@ -161,15 +162,15 @@ func (s *ProxyServiceServer) sendSnapshot(ctx context.Context, conn *proxyConnec
// TODO: should this even be here? We're running in a loop, and on each proxy, this will create a LOT of setup key entries that we currently have no way to remove. // TODO: should this even be here? We're running in a loop, and on each proxy, this will create a LOT of setup key entries that we currently have no way to remove.
key, err := s.keyStore.CreateSetupKey(ctx, key, err := s.keyStore.CreateSetupKey(ctx,
"accountID", "accountID", // TODO: get an account ID from somewhere, likely needs to be passed in from higher up.
"keyname", "keyname", // TODO: define a sensible key name to make cleanup easier.
types.SetupKeyOneOff, // TODO: is this correct? Might make cleanup simpler and we're going to generate a new key every time the proxy connects. types.SetupKeyOneOff, // TODO: is this correct? Might make cleanup simpler and we're going to generate a new key every time the proxy connects.
time.Minute, // TODO: only provide just enough time for the proxy to make the connection before this key becomes invalid. Should help with cleanup as well as protection against these leaking in transit. time.Minute, // TODO: only provide just enough time for the proxy to make the connection before this key becomes invalid. Should help with cleanup as well as protection against these leaking in transit.
[]string{"auto", "groups"}, // TODO: join a group for proxy to simplify adding rules to proxies? []string{"auto", "groups"}, // TODO: join a group for proxy to simplify adding rules to proxies?
1, // TODO: usage limit, how is this different from the OneOff key type? 1, // TODO: usage limit, how is this different from the OneOff key type?
"userID", "userID", // TODO: use a set userID for proxy peers?
false, // TODO: ephemeral peers are different...right? false, // TODO: ephemeral peers are different...right?
false, // TODO: not sure but I think this should be false. false, // TODO: not sure but I think this should be false.
) )
if err != nil { if err != nil {
// TODO: how to handle this? // TODO: how to handle this?