use peers accountID

netbirdio · Dec 19, 2024 · 8e54776 · 8e54776
1 parent 565a77c
commit 8e54776
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go
@@ -485,21 +485,20 @@ func (s *GRPCServer) Login(ctx context.Context, req *proto.EncryptedMessage) (*p
 		}
 	}
 
-	// settings, err := s.settingsManager.GetSettings(ctx, accountID, userID)
-	// if err != nil {
-	// 	log.WithContext(ctx).Errorf("failed to get settings for account %s and user %s: %v", accountID, userID, err)
-	// }
+	settings, err := s.settingsManager.GetSettings(ctx, peer.AccountID, userID)
+	if err != nil {
+		log.WithContext(ctx).Errorf("failed to get settings for account %s and user %s: %v", peer.AccountID, userID, err)
+	}
 
-	// routingPeerDNSResolutionEnabled := false
-	// if settings != nil {
-	// 	routingPeerDNSResolutionEnabled = settings.RoutingPeerDNSResolutionEnabled
-	// }
-	// log.WithContext(ctx).Debugf("dns resolution on routing peer is enabled: %v", routingPeerDNSResolutionEnabled)
+	routingPeerDNSResolutionEnabled := false
+	if settings != nil {
+		routingPeerDNSResolutionEnabled = settings.RoutingPeerDNSResolutionEnabled
+	}
 
 	// if peer has reached this point then it has logged in
 	loginResp := &proto.LoginResponse{
 		WiretrusteeConfig: toWiretrusteeConfig(s.config, nil, relayToken),
-		PeerConfig:        toPeerConfig(peer, netMap.Network, s.accountManager.GetDNSDomain(), false),
+		PeerConfig:        toPeerConfig(peer, netMap.Network, s.accountManager.GetDNSDomain(), routingPeerDNSResolutionEnabled),
 		Checks:            toProtocolChecks(ctx, postureChecks),
 	}
 	encryptedResp, err := encryption.EncryptMessage(peerKey, s.wgKey, loginResp)