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

handle default ports

Browse Source
This commit is contained in:
pascal
2026-02-09 18:15:26 +01:00
parent 7c14056faf
commit 16d1b4a14a
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/internals/controllers/network_map/controller/controller.go
+4 -4
View File
@@ -174,7 +174,7 @@ func (c *Controller) sendUpdateAccountPeers(ctx context.Context, accountID strin
var wg sync.WaitGroup var wg sync.WaitGroup
semaphore := make(chan struct{}, 10) semaphore := make(chan struct{}, 10)
account.InjectProxyPolicies() account.InjectProxyPolicies(ctx)
dnsCache := &cache.DNSConfigCache{} dnsCache := &cache.DNSConfigCache{}
dnsDomain := c.GetDNSDomain(account.Settings) dnsDomain := c.GetDNSDomain(account.Settings)
peersCustomZone := account.GetPeersCustomZone(ctx, dnsDomain) peersCustomZone := account.GetPeersCustomZone(ctx, dnsDomain)
@@ -327,7 +327,7 @@ func (c *Controller) UpdateAccountPeer(ctx context.Context, accountId string, pe
return fmt.Errorf("failed to get validated peers: %v", err) return fmt.Errorf("failed to get validated peers: %v", err)
} }
account.InjectProxyPolicies() account.InjectProxyPolicies(ctx)
dnsCache := &cache.DNSConfigCache{} dnsCache := &cache.DNSConfigCache{}
dnsDomain := c.GetDNSDomain(account.Settings) dnsDomain := c.GetDNSDomain(account.Settings)
peersCustomZone := account.GetPeersCustomZone(ctx, dnsDomain) peersCustomZone := account.GetPeersCustomZone(ctx, dnsDomain)
@@ -443,7 +443,7 @@ func (c *Controller) GetValidatedPeerWithMap(ctx context.Context, isRequiresAppr
} }
} }
account.InjectProxyPolicies() account.InjectProxyPolicies(ctx)
approvedPeersMap, err := c.integratedPeerValidator.GetValidatedPeers(ctx, account.Id, maps.Values(account.Groups), maps.Values(account.Peers), account.Settings.Extra) approvedPeersMap, err := c.integratedPeerValidator.GetValidatedPeers(ctx, account.Id, maps.Values(account.Groups), maps.Values(account.Peers), account.Settings.Extra)
if err != nil { if err != nil {
@@ -851,7 +851,7 @@ func (c *Controller) GetNetworkMap(ctx context.Context, peerID string) (*types.N
if c.experimentalNetworkMap(peer.AccountID) { if c.experimentalNetworkMap(peer.AccountID) {
networkMap = c.getPeerNetworkMapExp(ctx, peer.AccountID, peerID, validatedPeers, peersCustomZone, accountZones, nil) networkMap = c.getPeerNetworkMapExp(ctx, peer.AccountID, peerID, validatedPeers, peersCustomZone, accountZones, nil)
} else { } else {
account.InjectProxyPolicies() account.InjectProxyPolicies(ctx)
resourcePolicies := account.GetResourcePoliciesMap() resourcePolicies := account.GetResourcePoliciesMap()
routers := account.GetResourceRoutersMap() routers := account.GetResourceRoutersMap()
networkMap = account.GetPeerNetworkMap(ctx, peer.ID, peersCustomZone, accountZones, validatedPeers, resourcePolicies, routers, nil, account.GetActiveGroupUsers()) networkMap = account.GetPeerNetworkMap(ctx, peer.ID, peersCustomZone, accountZones, validatedPeers, resourcePolicies, routers, nil, account.GetActiveGroupUsers())
management/server/types/account.go
+14 -1
View File
@@ -1923,7 +1923,7 @@ func (a *Account) GetResourcesMap() map[string]*resourceTypes.NetworkResource {
return resourcesMap return resourcesMap
} }
func (a *Account) InjectProxyPolicies() { func (a *Account) InjectProxyPolicies(ctx context.Context) {
if len(a.ReverseProxies) == 0 { if len(a.ReverseProxies) == 0 {
return return
} }
@@ -1943,6 +1943,19 @@ func (a *Account) InjectProxyPolicies() {
continue continue
} }
port := target.Port
if port == 0 {
switch target.Protocol {
case "https":
port = 443
case "http":
port = 80
default:
log.WithContext(ctx).Warnf("unsupported protocol %s for proxy target %s, skipping policy injection", target.Protocol, target.TargetId)
continue
}
}
policyID := fmt.Sprintf("proxy-access-%s-%s", service.ID, proxyPeer.ID) policyID := fmt.Sprintf("proxy-access-%s-%s", service.ID, proxyPeer.ID)
a.Policies = append(a.Policies, &Policy{ a.Policies = append(a.Policies, &Policy{
ID: policyID, ID: policyID,