sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-07 14:09:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix some conflicts regression

Browse Source
This commit is contained in:
mlsmaycon
2026-02-06 20:39:17 +01:00
parent adbd7ab4c3
commit f65f4fc280
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/internals/modules/reverseproxy/manager/manager.go
+2
View File
@@ -180,6 +180,8 @@ func (m *managerImpl) UpdateReverseProxy(ctx context.Context, accountID, userID
} }
reverseProxy.Meta = existingReverseProxy.Meta reverseProxy.Meta = existingReverseProxy.Meta
reverseProxy.SessionPrivateKey = existingReverseProxy.SessionPrivateKey
reverseProxy.SessionPublicKey = existingReverseProxy.SessionPublicKey
if err = transaction.UpdateReverseProxy(ctx, reverseProxy); err != nil { if err = transaction.UpdateReverseProxy(ctx, reverseProxy); err != nil {
return fmt.Errorf("update reverse proxy: %w", err) return fmt.Errorf("update reverse proxy: %w", err)
management/internals/modules/reverseproxy/reverseproxy.go
+10 -9
View File
@@ -82,15 +82,15 @@ type ReverseProxyMeta struct {
} }
type ReverseProxy struct { type ReverseProxy struct {
ID string `gorm:"primaryKey"` ID string `gorm:"primaryKey"`
AccountID string `gorm:"index"` AccountID string `gorm:"index"`
Name string Name string
Domain string `gorm:"index"` Domain string `gorm:"index"`
ProxyCluster string `gorm:"index"` ProxyCluster string `gorm:"index"`
Targets []Target `gorm:"serializer:json"` Targets []Target `gorm:"serializer:json"`
Enabled bool Enabled bool
Auth AuthConfig `gorm:"serializer:json"` Auth AuthConfig `gorm:"serializer:json"`
Meta ReverseProxyMeta `gorm:"embedded;embeddedPrefix:meta_"` Meta ReverseProxyMeta `gorm:"embedded;embeddedPrefix:meta_"`
SessionPrivateKey string `gorm:"column:session_private_key"` SessionPrivateKey string `gorm:"column:session_private_key"`
SessionPublicKey string `gorm:"column:session_public_key"` SessionPublicKey string `gorm:"column:session_public_key"`
} }
@@ -322,6 +322,7 @@ func (r *ReverseProxy) Copy() *ReverseProxy {
AccountID: r.AccountID, AccountID: r.AccountID,
Name: r.Name, Name: r.Name,
Domain: r.Domain, Domain: r.Domain,
ProxyCluster: r.ProxyCluster,
Targets: targets, Targets: targets,
Enabled: r.Enabled, Enabled: r.Enabled,
Auth: r.Auth, Auth: r.Auth,
management/internals/server/boot.go
+3 -2
View File
@@ -180,8 +180,9 @@ func (s *BaseServer) proxyOIDCConfig() nbgrpc.ProxyOIDCConfig {
callbackURL = callbackURL + "/api/oauth/callback" callbackURL = callbackURL + "/api/oauth/callback"
return nbgrpc.ProxyOIDCConfig{ return nbgrpc.ProxyOIDCConfig{
Issuer: s.Config.HttpConfig.AuthIssuer, Issuer: s.Config.HttpConfig.AuthIssuer,
ClientID: "netbird-dashboard", // Reuse dashboard client // todo: double check auth clientID value
ClientID: s.Config.HttpConfig.AuthAudience, // Reuse dashboard client
Scopes: []string{"openid", "profile", "email"}, Scopes: []string{"openid", "profile", "email"},
CallbackURL: callbackURL, CallbackURL: callbackURL,
HMACKey: []byte(s.Config.DataStoreEncryptionKey), // Use the datastore encryption key for OIDC state HMACs, this should ensure all management instances are using the same key. HMACKey: []byte(s.Config.DataStoreEncryptionKey), // Use the datastore encryption key for OIDC state HMACs, this should ensure all management instances are using the same key.
management/server/http/testing/testing_tools/channel/channel.go
+1 -9
View File
@@ -11,9 +11,6 @@ import (
"github.com/netbirdio/management-integrations/integrations" "github.com/netbirdio/management-integrations/integrations"
"github.com/netbirdio/netbird/management/internals/modules/reverseproxy"
"github.com/netbirdio/netbird/management/internals/modules/reverseproxy/accesslogs"
"github.com/netbirdio/netbird/management/internals/modules/reverseproxy/domain"
zonesManager "github.com/netbirdio/netbird/management/internals/modules/zones/manager" zonesManager "github.com/netbirdio/netbird/management/internals/modules/zones/manager"
recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager" recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager"
"github.com/netbirdio/netbird/management/internals/server/config" "github.com/netbirdio/netbird/management/internals/server/config"
@@ -105,12 +102,7 @@ func BuildApiBlackBoxWithDBState(t testing_tools.TB, sqlFile string, expectedPee
customZonesManager := zonesManager.NewManager(store, am, permissionsManager, "") customZonesManager := zonesManager.NewManager(store, am, permissionsManager, "")
zoneRecordsManager := recordsManager.NewManager(store, am, permissionsManager) zoneRecordsManager := recordsManager.NewManager(store, am, permissionsManager)
// Create empty managers for reverse proxy functionality (not used in channel tests) apiHandler, err := http2.NewAPIHandler(context.Background(), am, networksManagerMock, resourcesManagerMock, routersManagerMock, groupsManagerMock, geoMock, authManagerMock, metrics, validatorMock, proxyController, permissionsManager, peersManager, settingsManager, customZonesManager, zoneRecordsManager, networkMapController, nil, nil, nil, nil, nil)
var reverseProxyManager reverseproxy.Manager
reverseProxyDomainManager := domain.NewManager(store, nil)
var accessLogsManager accesslogs.Manager
apiHandler, err := http2.NewAPIHandler(context.Background(), am, networksManagerMock, resourcesManagerMock, routersManagerMock, groupsManagerMock, geoMock, authManagerMock, metrics, validatorMock, proxyController, permissionsManager, peersManager, settingsManager, customZonesManager, zoneRecordsManager, networkMapController, nil, reverseProxyManager, reverseProxyDomainManager, accessLogsManager, nil)
if err != nil { if err != nil {
t.Fatalf("Failed to create API handler: %v", err) t.Fatalf("Failed to create API handler: %v", err)
} }