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

Merge remote-tracking branch 'origin/prototype/reverse-proxy' into prototype/reverse-proxy

Browse Source
This commit is contained in:
Eduard Gert
2026-02-10 14:39:48 +01:00
parent ba9158d159 ca9a7e11ef
commit 940d01bdea
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
management/internals/modules/reverseproxy/manager/manager.go
View File

@@ -19,6 +19,8 @@ import (
"github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/shared/management/status"
) )
const unknownHostPlaceholder = "unknown"
// ClusterDeriver derives the proxy cluster from a domain. // ClusterDeriver derives the proxy cluster from a domain.
type ClusterDeriver interface { type ClusterDeriver interface {
DeriveClusterFromDomain(ctx context.Context, domain string) (string, error) DeriveClusterFromDomain(ctx context.Context, domain string) (string, error)
@@ -75,19 +77,25 @@ func (m *managerImpl) replaceHostByLookup(ctx context.Context, accountID string,
case reverseproxy.TargetTypePeer: case reverseproxy.TargetTypePeer:
peer, err := m.store.GetPeerByID(ctx, store.LockingStrengthNone, accountID, target.TargetId) peer, err := m.store.GetPeerByID(ctx, store.LockingStrengthNone, accountID, target.TargetId)
if err != nil { if err != nil {
return fmt.Errorf("failed to get peer by id: %w", err) log.WithContext(ctx).Warnf("failed to get peer by id %s for reverse proxy %s: %v", target.TargetId, proxy.ID, err)
target.Host = unknownHostPlaceholder
continue
} }
target.Host = peer.IP.String() target.Host = peer.IP.String()
case reverseproxy.TargetTypeHost: case reverseproxy.TargetTypeHost:
resource, err := m.store.GetNetworkResourceByID(ctx, store.LockingStrengthNone, accountID, target.TargetId) resource, err := m.store.GetNetworkResourceByID(ctx, store.LockingStrengthNone, accountID, target.TargetId)
if err != nil { if err != nil {
return fmt.Errorf("failed to get resource by id: %w", err) log.WithContext(ctx).Warnf("failed to get resource by id %s for reverse proxy %s: %v", target.TargetId, proxy.ID, err)
target.Host = unknownHostPlaceholder
continue
} }
target.Host = resource.Prefix.Addr().String() target.Host = resource.Prefix.Addr().String()
case reverseproxy.TargetTypeDomain: case reverseproxy.TargetTypeDomain:
resource, err := m.store.GetNetworkResourceByID(ctx, store.LockingStrengthNone, accountID, target.TargetId) resource, err := m.store.GetNetworkResourceByID(ctx, store.LockingStrengthNone, accountID, target.TargetId)
if err != nil { if err != nil {
return fmt.Errorf("failed to get resource by id: %w", err) log.WithContext(ctx).Warnf("failed to get resource by id %s for reverse proxy %s: %v", target.TargetId, proxy.ID, err)
target.Host = unknownHostPlaceholder
continue
} }
target.Host = resource.Domain target.Host = resource.Domain
case reverseproxy.TargetTypeSubnet: case reverseproxy.TargetTypeSubnet: