Merge pull request #394 from openziti/release-next

Release next
2026-10-15 17:11:19 +00:00 · 2021-06-22 21:11:41 +05:30
parent df3de1f0ee 7e5b319b31
commit cf30c742a3
8 changed files with 150 additions and 75 deletions
@@ -50,6 +50,6 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.9.8.0")]
-[assembly: AssemblyVersion("1.9.8.0")]
-[assembly: AssemblyFileVersion("1.9.8.0")]
+// [assembly: AssemblyVersion("1.9.9.0")]
+[assembly: AssemblyVersion("1.9.9.0")]
+[assembly: AssemblyFileVersion("1.9.9.0")]
@@ -23,10 +23,10 @@
    <ROW Property="CTRLS" Value="2"/>
    <ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
    <ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
-    <ROW Property="ProductCode" Value="1033:{AE5F8F1C-44E1-4BA6-8F72-BA58D2641742} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{7C6269AD-D8A5-4B9F-8C73-A8EECAD26919} " Type="16"/>
    <ROW Property="ProductLanguage" Value="1033"/>
    <ROW Property="ProductName" Value="Ziti Desktop Edge"/>
-    <ROW Property="ProductVersion" Value="1.9.8" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.9.9" Type="32"/>
    <ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
    <ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>
@@ -30,6 +30,6 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.9.8.0")]
-[assembly: AssemblyVersion("1.9.8.0")]
-[assembly: AssemblyFileVersion("1.9.8.0")]
+// [assembly: AssemblyVersion("1.9.9.0")]
+[assembly: AssemblyVersion("1.9.9.0")]
+[assembly: AssemblyFileVersion("1.9.9.0")]
@@ -1,3 +1,32 @@
+# Release 1.9.9
+
+## What's New
+* none
+
+## Other changes:
+* [#387](https://github.com/openziti/desktop-edge-win/issues/387) DNS clean up and dns responses are delayed
+* old signing certificate is removed, here forward 'old' clients cannot auto-update. they must uninstall/reinstall
+
+## Bugs fixed:
+* none
+
+## Dependency Updates
+* none
+
+# Release 1.9.8
+
+## What's New
+* none
+
+## Other changes:
+* Singing process updates
+
+## Bugs fixed:
+* none
+
+## Dependency Updates
+* none
+
 # Release 1.9.7

 ## What's New
@@ -117,7 +117,7 @@ type dnsreq struct {
 }

 func RunDNSserver(dnsBind []net.IP, ready chan bool) {
-	go runDNSproxy(windns.GetUpstreamDNS(), dnsBind)
+	go runDNSproxy(dnsBind)

 	for _, bindAddr := range dnsBind {
 		go runListener(&bindAddr, 53, reqch)
@@ -241,7 +241,7 @@ func dnsPanicRecover(localDnsServers []net.IP, now time.Time) {
 	log.Infof("dnsPanicRecovery set time to: %s", lastDnsRecover.String())

 	// get dns again and reconfigure
-	go runDNSproxy(windns.GetUpstreamDNS(), localDnsServers)
+	go runDNSproxy(localDnsServers)
 }

 func trimSuffix(source string, suffix string) string {
@@ -260,24 +260,27 @@ func cleanDomainsForNrpt() map[string]bool {
 	return domainMap
 }

-func runDNSproxy(upstreamDnsServers []string, localDnsServers []net.IP) {
-	windns.FlushDNS() //do this in case the services come back in different order and the ip returned is no longer the same
-	log.Infof("starting DNS proxy upstream: %v, local: %v", upstreamDnsServers, localDnsServers)
-	domains = windns.GetConnectionSpecificDomains()
-	log.Infof("ConnectionSpecificDomains detected: %v", domains)
+func runDNSproxy(localDnsServers []net.IP) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Errorf("Recovering from panic due to DNS-related issue. %v", err)
 			dnsPanicRecover(localDnsServers, time.Now())
 		}
 	}()
+	windns.FlushDNS() //do this in case the services come back in different order and the ip returned is no longer the same
+	dnsRetryInterval := 500
+
+GetUpstream:
+	upstreamDnsServers := windns.GetUpstreamDNS()
+	log.Infof("starting DNS proxy upstream: %v, local: %v", upstreamDnsServers, localDnsServers)
+
+	domains = windns.GetConnectionSpecificDomains()
+	log.Infof("ConnectionSpecificDomains detected: %v", domains)

 	domainMap := cleanDomainsForNrpt()
 	windns.AddNrptRules(domainMap, dnsip.String())
 	log.Infof("Added connection specific domains to NRPT: %v", domainMap)

-	dnsRetryInterval := 500
-
 	log.Infof("establishing links to all upstream DNS. total detected upstream DNS: %d", len(upstreamDnsServers))
 outer:
 	for _, s := range upstreamDnsServers {
@@ -320,7 +323,7 @@ outer:
 		if dnsRetryInterval >= 10000 {
 			dnsRetryInterval = 10000
 		}
-		goto outer
+		goto GetUpstream
 	}

 	log.Infof("starting goroutines for all connected DNS proxies. Total goroutines to spawn: %d of %d detected DNS", len(dnsUpstreams), len(upstreamDnsServers))
@@ -341,7 +344,10 @@ outer:
 				} else {
 					if len(respChan) == cap(respChan) {
 						log.Warn("respChan will be blocked. If this warning is continuously displayed please report")
+					} else {
+						log.Tracef("Response received, respChan len: %d, cap: %d ", len(respChan), cap(respChan))
 					}
+
 					respChan <- resp[:n]
 				}
 			}
@@ -349,61 +355,101 @@ outer:
 	}

 	reqs := make(map[uint32]*proxiedReq)
+	var dnsReqMutex = &sync.Mutex{}
+
+	dnsReqChannel := make(chan struct{})
+	ticker := time.NewTicker(5 * time.Second)
+	defer func() {
+		close(dnsReqChannel)
+		log.Tracef("Exiting dns request handling routines.")
+	}()
+	go func() {
+	CleanUpIteration:
+		for {
+			select {
+			case <-ticker.C:
+				if len(reqs) == 0 {
+					continue CleanUpIteration
+				}
+				// cleanup requests we didn't get answers for
+				now := time.Now()
+				log.Tracef("Attempting to lock mutex for the dns requests map in cleanup")
+				dnsReqMutex.Lock()
+				for k, r := range reqs {
+					if now.After(r.exp) {
+						log.Debugf("a DNS request has expired - enable trace logging and reproduce this issue for more information")
+						log.Tracef("expired DNS req: %s %s", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name)
+
+						delete(reqs, k)
+					}
+				}
+				dnsReqMutex.Unlock()
+				log.Tracef("Unlocked the mutex for the dns requests map in cleanup - duration %v", time.Now().Sub(now))
+			case <-dnsReqChannel:
+				ticker.Stop()
+				log.Tracef("Exiting dns request cleanup go routine.")
+				return
+			}
+		}
+	}()
+
+	go func() {
+		for {
+			select {
+			case rep := <-respChan:
+				reply := dns.Msg{}
+				if err := reply.Unpack(rep); err == nil {
+					id := (uint32(reply.Id) << 16) | uint32(reply.Question[0].Qtype)
+					dnsReqMutex.Lock()
+					req, found := reqs[id]
+					if found {
+						delete(reqs, id)
+						dnsReqMutex.Unlock()
+						log.Tracef("proxy resolved request for %v id:%d", reply.Question[0].Name, reply.Id)
+						n, oobn, err := req.s.WriteMsgUDP(rep, nil, req.peer)
+						if err != nil {
+							log.Errorf("an error has occurred while trying to write a udp message. n:%d, oobn:%d, err:%v", n, oobn, err)
+						}
+					} else {
+						dnsReqMutex.Unlock()
+						// keep this log but leave commented out. When two listeners are enabled (ipv4/v6) this msg will
+						// just mean some other request was processed successfully and removed the entry from the map
+						// log.Tracef("matching request was not found for id:%d. %s %s", reply.Id, dns.Type(reply.Question[0].Qtype), reply.Question[0].Name)
+					}
+				}
+			case <-dnsReqChannel:
+				log.Tracef("Exiting the go routine for network interface response channel")
+				return
+			}
+		}
+
+	}()

 	log.Debug("Upstream DNS proxy loop begins")
 	for {
-		select {
-		case pr := <-proxiedRequests:
-			id := (uint32(pr.req.Id) << 16) | uint32(pr.req.Question[0].Qtype)
-			reqs[id] = pr
-			b, _ := pr.req.Pack()
-			for _, proxy := range dnsUpstreams {
-				if _, err := proxy.Write(b); err != nil {
+		pr := <-proxiedRequests
+		id := (uint32(pr.req.Id) << 16) | uint32(pr.req.Question[0].Qtype)
+		dnsReqMutex.Lock()
+		reqs[id] = pr
+		dnsReqMutex.Unlock()
+		b, _ := pr.req.Pack()
+		for _, proxy := range dnsUpstreams {
+			if _, err := proxy.Write(b); err != nil {

-					_ = proxy.Close() //first thing - close the proxy connection
+				_ = proxy.Close() //first thing - close the proxy connection

-					// when this hits - it never seems to recover. throw a panic which will get recovered
-					// via the defer specified above and try to recreate the connections. this is a heavy
-					// handed way of reconnecting to the DNS server but it should be infrequent
-					log.Panicf("failed to proxy DNS to %s %s %v. %v",
-						dns.Type(pr.req.Question[0].Qtype),
-						pr.req.Question[0].Name,
-						proxy.RemoteAddr(),
-						err)
-				} else {
-					log.Tracef("Proxied request sent to %v from ipv%d listener", proxy.RemoteAddr(), pr.ipVer)
-				}
-			}
-
-		case rep := <-respChan:
-			reply := dns.Msg{}
-			if err := reply.Unpack(rep); err == nil {
-				id := (uint32(reply.Id) << 16) | uint32(reply.Question[0].Qtype)
-				req, found := reqs[id]
-				if found {
-					delete(reqs, id)
-					log.Tracef("proxy resolved request for %v id:%d", reply.Question[0].Name, reply.Id)
-					n, oobn, err := req.s.WriteMsgUDP(rep, nil, req.peer)
-					if err != nil {
-						log.Errorf("an error has occurred while trying to write a udp message. n:%d, oobn:%d, err:%v", n, oobn, err)
-					}
-				} else {
-					// keep this log but leave commented out. When two listeners are enabled (ipv4/v6) this msg will
-					// just mean some other request was processed successfully and removed the entry from the map
-					// log.Tracef("matching request was not found for id:%d. %s %s", reply.Id, dns.Type(reply.Question[0].Qtype), reply.Question[0].Name)
-				}
-			}
-		case <-time.After(time.Minute):
-			// cleanup requests we didn't get answers for
-			now := time.Now()
-			for k, r := range reqs {
-				if now.After(r.exp) {
-					log.Debugf("a DNS request has expired - enable trace logging and reproduce this issue for more information")
-					log.Tracef("expired DNS req: %s %s", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name)
-
-					delete(reqs, k)
-				}
+				// when this hits - it never seems to recover. throw a panic which will get recovered
+				// via the defer specified above and try to recreate the connections. this is a heavy
+				// handed way of reconnecting to the DNS server but it should be infrequent
+				log.Panicf("failed to proxy DNS to %s %s %v. %v",
+					dns.Type(pr.req.Question[0].Qtype),
+					pr.req.Question[0].Name,
+					proxy.RemoteAddr(),
+					err)
+			} else {
+				log.Tracef("Proxied request sent to %v from ipv%d listener", proxy.RemoteAddr(), pr.ipVer)
 			}
 		}
+
 	}
 }
@@ -76,10 +76,10 @@ const (
 	ErrorEvent       = 0 //1000

 	// power events microsoft docs https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-powermanagementevent?redirectedfrom=MSDN
-	PBT_APMSUSPEND = 4 // Entering Suspend
-	PBT_APMRESUMESUSPEND = 7 // Resume from Suspend
+	PBT_APMSUSPEND           = 4  // Entering Suspend
+	PBT_APMRESUMESUSPEND     = 7  // Resume from Suspend
 	PBT_APMPOWERSTATUSCHANGE = 10 // Power Status Change
-	PBT_APMRESUMEAUTOMATIC = 18 // Resume Automatic
+	PBT_APMRESUMEAUTOMATIC   = 18 // Resume Automatic

 	// This is the name you will use for the NET START command
 	SvcStartName = "ziti"
@@ -20,9 +20,9 @@
 package main

 const (
-	Version   = "1.9.8"
-	Revision  = "a763f2acac36"
-	Branch    = "main"
+	Version   = "1.9.9"
+	Revision  = "19cb322d0c9a"
+	Branch    = "release-next"
 	BuildUser = ""
-	BuildDate = "2021-06-07 18:26:10"
+	BuildDate = "2021-06-22 14:08:30"
 )
@@ -1 +1 @@
-1.9.8
+1.9.9
@@ -1 +1 @@
 .9.8
 .9.9