Skip to content

Commit 4545ab9

Browse files
[management] rewire account manager to permissions manager (#4673)
1 parent 7f08983 commit 4545ab9

File tree

6 files changed

+31
-5
lines changed

6 files changed

+31
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
github.com/miekg/dns v1.1.59
6363
github.com/mitchellh/hashstructure/v2 v2.0.2
6464
github.com/nadoo/ipset v0.5.0
65-
github.com/netbirdio/management-integrations/integrations v0.0.0-20251022080146-b1caade69396
65+
github.com/netbirdio/management-integrations/integrations v0.0.0-20251027212525-d751b79f5d48
6666
github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20250805121659-6b4ac470ca45
6767
github.com/okta/okta-sdk-golang/v2 v2.18.0
6868
github.com/oschwald/maxminddb-golang v1.12.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,8 @@ github.com/netbirdio/go-netroute v0.0.0-20240611143515-f59b0e1d3944 h1:TDtJKmM6S
503503
github.com/netbirdio/go-netroute v0.0.0-20240611143515-f59b0e1d3944/go.mod h1:sHA6TRxjQ6RLbnI+3R4DZo2Eseg/iKiPRfNmcuNySVQ=
504504
github.com/netbirdio/ice/v4 v4.0.0-20250908184934-6202be846b51 h1:Ov4qdafATOgGMB1wbSuh+0aAHcwz9hdvB6VZjh1mVMI=
505505
github.com/netbirdio/ice/v4 v4.0.0-20250908184934-6202be846b51/go.mod h1:ZSIbPdBn5hePO8CpF1PekH2SfpTxg1PDhEwtbqZS7R8=
506-
github.com/netbirdio/management-integrations/integrations v0.0.0-20251022080146-b1caade69396 h1:aXHS63QWf0Z5fDN19Swl6npdJjGMyXthAvvgW7rbKJQ=
507-
github.com/netbirdio/management-integrations/integrations v0.0.0-20251022080146-b1caade69396/go.mod h1:v0nUbbHbuQnqR7yKIYnKzsLBCswLtp2JctmKYmGgVhc=
506+
github.com/netbirdio/management-integrations/integrations v0.0.0-20251027212525-d751b79f5d48 h1:moJbL1uuaWR35yUgHZ6suijjqqW8/qGCuPPBXu5MeWQ=
507+
github.com/netbirdio/management-integrations/integrations v0.0.0-20251027212525-d751b79f5d48/go.mod h1:ifKa2jGPsOzZhJFo72v2AE5nMP3GYvlhoZ9JV6lHlJ8=
508508
github.com/netbirdio/service v0.0.0-20240911161631-f62744f42502 h1:3tHlFmhTdX9axERMVN63dqyFqnvuD+EMJHzM7mNGON8=
509509
github.com/netbirdio/service v0.0.0-20240911161631-f62744f42502/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
510510
github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20250805121659-6b4ac470ca45 h1:ujgviVYmx243Ksy7NdSwrdGPSRNE3pb8kEDSpH0QuAQ=

management/internals/server/modules.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ func (s *BaseServer) GeoLocationManager() geolocation.Geolocation {
3535

3636
func (s *BaseServer) PermissionsManager() permissions.Manager {
3737
return Create(s, func() permissions.Manager {
38-
return integrations.InitPermissionsManager(s.Store())
38+
manager := integrations.InitPermissionsManager(s.Store(), s.Metrics().GetMeter())
39+
40+
s.AfterInit(func(s *BaseServer) {
41+
manager.SetAccountManager(s.AccountManager())
42+
})
43+
44+
return manager
3945
})
4046
}
4147

management/server/http/testing/testing_tools/channel/channel.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import (
77
"time"
88

99
"github.com/golang-jwt/jwt/v5"
10-
"github.com/netbirdio/management-integrations/integrations"
1110
"github.com/stretchr/testify/assert"
1211

12+
"github.com/netbirdio/management-integrations/integrations"
13+
1314
"github.com/netbirdio/netbird/management/server"
1415
"github.com/netbirdio/netbird/management/server/account"
1516
"github.com/netbirdio/netbird/management/server/activity"

management/server/permissions/manager.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
log "github.com/sirupsen/logrus"
99

10+
"github.com/netbirdio/netbird/management/server/account"
1011
"github.com/netbirdio/netbird/management/server/activity"
1112
"github.com/netbirdio/netbird/management/server/permissions/modules"
1213
"github.com/netbirdio/netbird/management/server/permissions/operations"
@@ -22,6 +23,7 @@ type Manager interface {
2223
ValidateAccountAccess(ctx context.Context, accountID string, user *types.User, allowOwnerAndAdmin bool) error
2324

2425
GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error)
26+
SetAccountManager(accountManager account.Manager)
2527
}
2628

2729
type managerImpl struct {
@@ -121,3 +123,7 @@ func (m *managerImpl) GetPermissionsByRole(ctx context.Context, role types.UserR
121123

122124
return permissions, nil
123125
}
126+
127+
func (m *managerImpl) SetAccountManager(accountManager account.Manager) {
128+
// no-op
129+
}

management/server/permissions/manager_mock.go

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)