From 263553dc7ccb3885aab5b4ae5d9f2e0066515774 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Wed, 2 Jun 2021 23:24:24 +0530 Subject: [PATCH 01/14] fixing the delay in dns request processing and clean up --- service/cziti/dns-proxy.go | 84 ++++++++++++++++--------- service/ziti-tunnel/service/pkg-vars.go | 6 +- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 94b1002a..e26289f7 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -350,32 +350,38 @@ outer: reqs := make(map[uint32]*proxiedReq) - 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 { + tickerChannel := make(chan bool) + ticker := time.NewTicker(60 * time.Second) + defer func() { + tickerChannel <- false + log.Tracef("Removing timer tasks for dns request handling") + }() + go func() { + for { + select { + case <-ticker.C: + // cleanup requests we didn't get answers for + now := time.Now() + log.Debugf("Check for expiry - begin") + for k, r := range reqs { + log.Debugf("Check for expiry now - %v , dns request expiry time - %v, DNS req: %s %s", now, r.exp, dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name) + 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) - _ = 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) + delete(reqs, k) + } } + case <-tickerChannel: + ticker.Stop() + return } + } + }() - case rep := <-respChan: + go func() { + for { + rep := <-respChan reply := dns.Msg{} if err := reply.Unpack(rep); err == nil { id := (uint32(reply.Id) << 16) | uint32(reply.Question[0].Qtype) @@ -393,17 +399,33 @@ outer: // 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) - } + }() + + log.Debug("Upstream DNS proxy loop begins") + for { + 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 { + + _ = 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) } } + } } diff --git a/service/ziti-tunnel/service/pkg-vars.go b/service/ziti-tunnel/service/pkg-vars.go index 21a0ead9..fdd49633 100644 --- a/service/ziti-tunnel/service/pkg-vars.go +++ b/service/ziti-tunnel/service/pkg-vars.go @@ -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" From a4119f3eaacf5f4810411800b652a75a22ba4bdf Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Wed, 2 Jun 2021 23:31:15 +0530 Subject: [PATCH 02/14] removing unnecessary log statments --- service/cziti/dns-proxy.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index e26289f7..b3758b13 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -362,9 +362,7 @@ outer: case <-ticker.C: // cleanup requests we didn't get answers for now := time.Now() - log.Debugf("Check for expiry - begin") for k, r := range reqs { - log.Debugf("Check for expiry now - %v , dns request expiry time - %v, DNS req: %s %s", now, r.exp, dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name) 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) From 0aea4ea2cb224e98c467f96828853c6fe40ac3a8 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Thu, 3 Jun 2021 18:03:20 +0530 Subject: [PATCH 03/14] adding lock before updating the map across different go routines --- service/cziti/dns-proxy.go | 50 +++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index b3758b13..00b4e6e7 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -349,12 +349,13 @@ outer: } reqs := make(map[uint32]*proxiedReq) + var dnsReqMutex = &sync.Mutex{} - tickerChannel := make(chan bool) + dnsReqChannel := make(chan struct{}) ticker := time.NewTicker(60 * time.Second) defer func() { - tickerChannel <- false - log.Tracef("Removing timer tasks for dns request handling") + close(dnsReqChannel) + log.Tracef("Exiting dns request handling routines.") }() go func() { for { @@ -362,6 +363,7 @@ outer: case <-ticker.C: // cleanup requests we didn't get answers for now := time.Now() + 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") @@ -370,7 +372,8 @@ outer: delete(reqs, k) } } - case <-tickerChannel: + dnsReqMutex.Unlock() + case <-dnsReqChannel: ticker.Stop() return } @@ -379,23 +382,30 @@ outer: go func() { for { - 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) + 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) } - } 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 <-dnsReqChannel: + return } } @@ -405,7 +415,9 @@ outer: for { 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 { From 22398e1cffde29bd906eec5917592f43ee7c9c46 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 7 Jun 2021 15:24:11 +0530 Subject: [PATCH 04/14] check upstream dns servers until internet connection is restored --- service/cziti/dns-proxy.go | 41 +++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 00b4e6e7..35d97034 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -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,21 @@ 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()) } }() - - domainMap := cleanDomainsForNrpt() - windns.AddNrptRules(domainMap, dnsip.String()) - log.Infof("Added connection specific domains to NRPT: %v", domainMap) - + 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) + AddDomainSpecificNrpt() + log.Infof("establishing links to all upstream DNS. total detected upstream DNS: %d", len(upstreamDnsServers)) outer: for _, s := range upstreamDnsServers { @@ -320,7 +317,10 @@ outer: if dnsRetryInterval >= 10000 { dnsRetryInterval = 10000 } - goto outer + goto GetUpstream + } + if len(upstreamDnsServers) > 0 && len(dnsUpstreams) != 0 && dnsRetryInterval>500 { + AddDomainSpecificNrpt() } log.Infof("starting goroutines for all connected DNS proxies. Total goroutines to spawn: %d of %d detected DNS", len(dnsUpstreams), len(upstreamDnsServers)) @@ -352,15 +352,19 @@ outer: var dnsReqMutex = &sync.Mutex{} dnsReqChannel := make(chan struct{}) - ticker := time.NewTicker(60 * time.Second) + 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() dnsReqMutex.Lock() @@ -439,3 +443,12 @@ outer: } } + +func AddDomainSpecificNrpt() { + 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) +} From 5acc0894b4db212edfdfc05ce9fd8be89843cd69 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 7 Jun 2021 15:28:23 +0530 Subject: [PATCH 05/14] adding upstream dial succeed log --- service/cziti/dns-proxy.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 35d97034..4cf78ce7 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -318,6 +318,8 @@ outer: dnsRetryInterval = 10000 } goto GetUpstream + } else { + log.Debugf("Upstream DNS dials succeeded.") } if len(upstreamDnsServers) > 0 && len(dnsUpstreams) != 0 && dnsRetryInterval>500 { AddDomainSpecificNrpt() From 85397705a03662fb704adb25584b8f476ad9e035 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Mon, 7 Jun 2021 23:22:27 +0530 Subject: [PATCH 06/14] adding trace log for response messages from internet --- service/cziti/dns-proxy.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 4cf78ce7..e95dc0d2 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -343,7 +343,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] } } From 620825852e8d1fb5a0d678e85438dc2b50030215 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 7 Jun 2021 18:29:36 +0000 Subject: [PATCH 07/14] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 7ae01ac7..a9be57de 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -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.7.0")] -[assembly: AssemblyVersion("1.9.7.0")] -[assembly: AssemblyFileVersion("1.9.7.0")] +// [assembly: AssemblyVersion("1.9.8.0")] +[assembly: AssemblyVersion("1.9.8.0")] +[assembly: AssemblyFileVersion("1.9.8.0")] diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index c384a42b..54e00a6d 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -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.6.0")] -[assembly: AssemblyVersion("1.9.4.0")] -[assembly: AssemblyFileVersion("1.9.4.0")] +// [assembly: AssemblyVersion("1.9.8.0")] +[assembly: AssemblyVersion("1.9.8.0")] +[assembly: AssemblyFileVersion("1.9.8.0")] From f9bdc4254477a3afde09f82b42a1c5d3cc52526d Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Tue, 8 Jun 2021 17:36:30 +0530 Subject: [PATCH 08/14] removing ununecessary comments and duplicate invocation of nrpt domains clean up as per the code review comments --- service/cziti/dns-proxy.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index e95dc0d2..4bf9fe51 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -273,7 +273,13 @@ func runDNSproxy(localDnsServers []net.IP) { GetUpstream: upstreamDnsServers := windns.GetUpstreamDNS() log.Infof("starting DNS proxy upstream: %v, local: %v", upstreamDnsServers, localDnsServers) - AddDomainSpecificNrpt() + + 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) log.Infof("establishing links to all upstream DNS. total detected upstream DNS: %d", len(upstreamDnsServers)) outer: @@ -318,11 +324,6 @@ outer: dnsRetryInterval = 10000 } goto GetUpstream - } else { - log.Debugf("Upstream DNS dials succeeded.") - } - if len(upstreamDnsServers) > 0 && len(dnsUpstreams) != 0 && dnsRetryInterval>500 { - AddDomainSpecificNrpt() } log.Infof("starting goroutines for all connected DNS proxies. Total goroutines to spawn: %d of %d detected DNS", len(dnsUpstreams), len(upstreamDnsServers)) From 1475725e464f3b7877aa572d3802d4280eed50ba Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Tue, 8 Jun 2021 17:42:02 +0530 Subject: [PATCH 09/14] version update --- release-notes.md | 28 ++++++++++++++++++++++++++++ version | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 0a509425..c4ce5e09 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,31 @@ +# 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 + +## 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 diff --git a/version b/version index 66beabb5..6ae756c4 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.9.8 +1.9.9 From 7576a212c2066d8ae113a15ff9467e4e9339d1f9 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Tue, 8 Jun 2021 17:57:37 +0530 Subject: [PATCH 10/14] removing unused function --- service/cziti/dns-proxy.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 4bf9fe51..2fd2681f 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -449,12 +449,3 @@ outer: } } - -func AddDomainSpecificNrpt() { - 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) -} From 83701432a2d7461d03fe89491edf5f8c9a9c4705 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Tue, 8 Jun 2021 21:08:56 +0530 Subject: [PATCH 11/14] adding trace logs as per the review comments --- service/cziti/dns-proxy.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 2fd2681f..1209e975 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -373,6 +373,7 @@ outer: } // 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) { @@ -383,8 +384,10 @@ outer: } } 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 } } @@ -415,6 +418,7 @@ outer: } } case <-dnsReqChannel: + log.Tracef("Exiting the go routine for network interface response channel") return } } From 16074d2660da760ccd8e1db2509d401903fc3b57 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 9 Jun 2021 10:11:34 +0000 Subject: [PATCH 12/14] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- service/ziti-tunnel/version.go | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index a9be57de..4e3bd4b5 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -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")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 7bbedc5c..138e20f8 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -23,10 +23,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index 54e00a6d..d56ff0f6 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -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")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 2307c033..0c778f7c 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.9.8" - Revision = "a763f2acac36" - Branch = "main" + Version = "1.9.9" + Revision = "8aa51fa536c4" + Branch = "release-next" BuildUser = "" - BuildDate = "2021-06-07 18:26:10" + BuildDate = "2021-06-09 10:05:30" ) From 19cb322d0c9a648a397777c0912a2572fa870059 Mon Sep 17 00:00:00 2001 From: Mary Lincy Dcouto Date: Tue, 22 Jun 2021 19:34:41 +0530 Subject: [PATCH 13/14] updating the signing process change info in the release notes --- release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release-notes.md b/release-notes.md index c4ce5e09..43971c9f 100644 --- a/release-notes.md +++ b/release-notes.md @@ -5,6 +5,7 @@ ## 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 From 7e5b319b319961d935ade36134e62073dc88df1c Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 22 Jun 2021 14:14:00 +0000 Subject: [PATCH 14/14] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 0c778f7c..61d2512d 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.9" - Revision = "8aa51fa536c4" + Revision = "19cb322d0c9a" Branch = "release-next" BuildUser = "" - BuildDate = "2021-06-09 10:05:30" + BuildDate = "2021-06-22 14:08:30" )