From dfdad6917b71ebf4e843aabb48eb0c3afb0c7927 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 19 Apr 2021 21:12:29 +0530 Subject: [PATCH] fix as per the code review comments --- service/windns/windns.go | 6 +++--- service/ziti-tunnel/service/state.go | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/service/windns/windns.go b/service/windns/windns.go index 5f6124a5..23e63f74 100644 --- a/service/windns/windns.go +++ b/service/windns/windns.go @@ -239,9 +239,9 @@ ForEach ($ns in $toRemove){ } } -func IsNrptPoliciesEffective() bool { - script := fmt.Sprintf(`Add-DnsClientNrptRule -Namespace ".ziti.test" -NameServers "100.64.0.1" -Comment "Added by ziti-tunnel" -DisplayName "ziti-tunnel:.ziti.test" - Get-DnsClientNrptPolicy -Effective | Select-Object Namespace -Unique | Where-Object Namespace -Eq ".ziti.test"`) +func IsNrptPoliciesEffective(dnsserver string) bool { + script := fmt.Sprintf(`Add-DnsClientNrptRule -Namespace ".ziti.test" -NameServers "%s" -Comment "Added by ziti-tunnel" -DisplayName "ziti-tunnel:.ziti.test" + Get-DnsClientNrptPolicy -Effective | Select-Object Namespace -Unique | Where-Object Namespace -Eq ".ziti.test"`, dnsserver) log.Debugf("checking the nrpt policies with: %s", script) cmd := exec.Command("powershell", "-Command", script) diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index 408e5416..7d667cfd 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -223,9 +223,14 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int, applyDns bool) (net. } log.Info("routing applied") - zitiPoliciesEffective := windns.IsNrptPoliciesEffective() + zitiPoliciesEffective := windns.IsNrptPoliciesEffective(ipv4) if applyDns || !zitiPoliciesEffective { - log.Info("DNS is applied to the TUN interface, because apply Dns flag in the config file: %t and ziti policies test result in this client: %t ", applyDns, zitiPoliciesEffective) + if applyDns { + log.Infof("DNS is applied to the TUN interface, because apply Dns flag in the config file is %t ", applyDns) + } + if !applyDns && !zitiPoliciesEffective { + log.Infof("DNS is applied to the TUN interface, because Ziti policies test result in this client is %t", zitiPoliciesEffective) + } //for windows 10+, could 'domains' be able to replace NRPT? dunno - didn't test it luid.SetDNS(windows.AF_INET, []net.IP{ip}, nil) }