From 55c32e2309efdf277bab5167f3e2460271ed5b5f Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 29 Jun 2020 11:55:34 -0400 Subject: [PATCH 01/25] add cziti logs into service log fetch. might be a lot of data but we need it... --- ZitiUpdateService/UpdateService.cs | 3 +-- service/cziti/dns-proxy.go | 9 +++++-- service/ziti-tunnel/service/ipc.go | 40 ++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs index 1cd46eb7..a78f7fba 100644 --- a/ZitiUpdateService/UpdateService.cs +++ b/ZitiUpdateService/UpdateService.cs @@ -114,7 +114,6 @@ namespace ZitiUpdateService { xmlDoc.LoadXml(result); XmlNode node = xmlDoc.SelectSingleNode("metadata/versioning/" + _versionType); string version = node.InnerText; - Log("Version Checked: " + version + " on " + _version + " from " + _versionType); if (version != _version) { Log("Version Checked: " + version + " on " + _version + " from " + _versionType); @@ -237,7 +236,7 @@ namespace ZitiUpdateService { private void StartZiti() { controller = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == "ziti"); - if (controller.Status != ServiceControllerStatus.Running) { + if (controller != null && controller.Status != ServiceControllerStatus.Running) { try { Log("Starting Service"); controller.Start(); diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index c1d582ea..9762a2cb 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -199,7 +199,12 @@ func runDNSproxy(dnsServers []string) { for _, proxy := range dnsUpstreams { // log.Debug("sending proxy req", dns.Type(pr.req.Question[0].Qtype), pr.req.Question[0].Name, proxy.RemoteAddr()) if _, err := proxy.Write(b); err != nil { - log.Debug("failed to proxy DNS to ", proxy) + //TODO: if this happens -does this mean the next dns server is not available? + log.Debugf("failed to proxy DNS to %s %s %v. %v", + dns.Type(pr.req.Question[0].Qtype), + pr.req.Question[0].Name, + proxy.RemoteAddr(), + err) } } @@ -222,7 +227,7 @@ func runDNSproxy(dnsServers []string) { now := time.Now() for k, r := range reqs { if now.After(r.exp) { - log.Debug("req expired", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name) + log.Debugf("req expired %s %s", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name) delete(reqs, k) } } diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index fc65dbbf..d5164d04 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -141,6 +141,7 @@ func SubMain(ops chan string, changes chan<- svc.Status) error { ops <- "done" return nil } + func waitForStopRequest(ops <-chan string) { sig := make(chan os.Signal) signal.Notify(sig) @@ -430,18 +431,42 @@ func serveLogs(conn net.Conn) { _, _ = w.WriteString("an unexpected error occurred while retrieving logs. look at the actual log file.") return } + writeLogToStream(file, w) - r := bufio.NewReader(file) - wrote, err := io.Copy(w, r) + file, err = os.OpenFile(config.LogFile(), os.O_RDONLY, 0644) if err != nil { - log.Errorf("problem responding with log data") + log.Errorf("could not open log file at %s", config.LogFile()) + _, _ = w.WriteString("an unexpected error occurred while retrieving logs. look at the actual log file.") + return } - _, err = w.Write([]byte("end of logs\n")) + writeLogToStream(file, w) + + file, err = os.OpenFile(config.Path()+"cziti.log", os.O_RDONLY, 0644) + if err != nil { + log.Errorf("could not open log file at %s", config.LogFile()) + _, _ = w.WriteString("an unexpected error occurred while retrieving logs. look at the actual log file.") + return + } + writeLogToStream(file, w) + + err = conn.Close() + if err != nil { + log.Error("error closing connection", err) + } +} + +func writeLogToStream(file *os.File, writer *bufio.Writer) { + r := bufio.NewReader(file) + wrote, err := io.Copy(writer, r) + if err != nil { + log.Errorf("problem responding with log data for: %v", file) + } + _, err = writer.Write([]byte("end of logs\n")) if err != nil { log.Errorf("unexpected error writing log response: %v", err) } - err = w.Flush() + err = writer.Flush() if err != nil { log.Errorf("unexpected error flushing log response: %v", err) } @@ -451,11 +476,6 @@ func serveLogs(conn net.Conn) { if err != nil { log.Error("error closing log file", err) } - - err = conn.Close() - if err != nil { - log.Error("error closing connection", err) - } } func serveEvents(conn net.Conn) { From dcefc9088a108bcf729806344782e4f6590b6c4a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 29 Jun 2020 12:08:59 -0400 Subject: [PATCH 02/25] update version to 0.0.13 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 8cbf02c3..43b29618 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.12 +0.0.13 From ea108d12acf54e89577e3560792f081151ca3b1b Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Thu, 2 Jul 2020 16:27:17 +0100 Subject: [PATCH 03/25] UI Issues - Not Fully Hidden on deactivation, moving on adding identity, changing Clints braces ;) --- ZitiTunneler/MainWindow.xaml.cs | 16 +++++++++++-- ZitiUpdateService/UpdateService.cs | 37 ++++++++++-------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/ZitiTunneler/MainWindow.xaml.cs b/ZitiTunneler/MainWindow.xaml.cs index e4ec807c..aebabe17 100644 --- a/ZitiTunneler/MainWindow.xaml.cs +++ b/ZitiTunneler/MainWindow.xaml.cs @@ -64,6 +64,8 @@ namespace ZitiTunneler { App.Current.MainWindow.WindowState = WindowState.Normal; App.Current.MainWindow.Closing += MainWindow_Closing; + App.Current.MainWindow.Deactivated += MainWindow_Deactivated; + App.Current.MainWindow.Activated += MainWindow_Activated; notifyIcon = new System.Windows.Forms.NotifyIcon(); notifyIcon.Visible = true; notifyIcon.Click += TargetNotifyIcon_Click; @@ -76,6 +78,14 @@ namespace ZitiTunneler { InitializeComponent(); } + private void MainWindow_Activated(object sender, EventArgs e) { + this.Visibility = Visibility.Visible; + } + + private void MainWindow_Deactivated(object sender, EventArgs e) { + this.Visibility = Visibility.Collapsed; + } + private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) { notifyIcon.Visible = false; notifyIcon.Icon.Dispose(); @@ -343,8 +353,10 @@ namespace ZitiTunneler { IdList.Height += 60; } var desktopWorkingArea = System.Windows.SystemParameters.WorkArea; - this.Left = desktopWorkingArea.Right-this.Width-_right; - this.Top = desktopWorkingArea.Bottom-this.Height-_bottom; + if (this._isAttached) { + this.Left = desktopWorkingArea.Right - this.Width - _right; + this.Top = desktopWorkingArea.Bottom - this.Height - _bottom; + } } private void OpenIdentity(ZitiIdentity identity) { diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs index a78f7fba..2d0f2521 100644 --- a/ZitiUpdateService/UpdateService.cs +++ b/ZitiUpdateService/UpdateService.cs @@ -41,8 +41,7 @@ namespace ZitiUpdateService { InitializeComponent(); } - public void Debug() - { + public void Debug() { OnStart(null); } @@ -70,15 +69,13 @@ namespace ZitiUpdateService { var serviceTimerInterval = ConfigurationManager.AppSettings.Get("ServiceTimer"); var serviceInt = TimeSpan.Zero; - if (!TimeSpan.TryParse(serviceTimerInterval, out serviceInt)) - { + if (!TimeSpan.TryParse(serviceTimerInterval, out serviceInt)) { serviceInt = new TimeSpan(0, 1, 0); } var updateTimerInterval = ConfigurationManager.AppSettings.Get("UpdateTimer"); var upInt = TimeSpan.Zero; - if (!TimeSpan.TryParse(updateTimerInterval, out upInt)) - { + if (!TimeSpan.TryParse(updateTimerInterval, out upInt)) { upInt = new TimeSpan(0, 1, 0); } @@ -103,8 +100,7 @@ namespace ZitiUpdateService { private void CheckUpdate(object sender, ElapsedEventArgs e) { if (inUpdateCheck) return; inUpdateCheck = true; //simple semaphone - try - { + try { var request = WebRequest.Create(_versionUrl) as HttpWebRequest; var response = request.GetResponse(); Stream receiveStream = response.GetResponseStream(); @@ -114,13 +110,11 @@ namespace ZitiUpdateService { xmlDoc.LoadXml(result); XmlNode node = xmlDoc.SelectSingleNode("metadata/versioning/" + _versionType); string version = node.InnerText; - if (version != _version) - { + if (version != _version) { Log("Version Checked: " + version + " on " + _version + " from " + _versionType); UpdateServiceFiles(version); } - } catch - { + } catch { } inUpdateCheck = false; @@ -129,25 +123,19 @@ namespace ZitiUpdateService { private void CheckService(object sender, ElapsedEventArgs e) { if (inServiceCheck || inUpdateCheck) return; inServiceCheck = true; //simple semaphone - try - { + try { controller = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == "ziti"); if (controller == null) return; //means it's not installed or the user doesn't have privs - if (controller.Status == ServiceControllerStatus.Stopped || controller.Status == ServiceControllerStatus.StopPending) - { - if (_isJustStopped) - { + if (controller.Status == ServiceControllerStatus.Stopped || controller.Status == ServiceControllerStatus.StopPending) { + if (_isJustStopped) { _isJustStopped = false; Log("Ziti Service has been stopped, update Network"); //should not be necessary in v0.0.10+ RunScript(); StartZiti(); } - } - else - { - if (controller.Status == ServiceControllerStatus.Running) - { + } else { + if (controller.Status == ServiceControllerStatus.Running) { _isJustStopped = true; } } @@ -169,8 +157,7 @@ namespace ZitiUpdateService { string version = node.InnerText; Log("Got Version: " + version+" from "+_versionType); - if (_version.Trim() == currentVersion.Trim()) - { + if (_version.Trim() == currentVersion.Trim()) { _version = currentVersion; Log("Version local is the same as the version remote: " + version); return; From 1b6a5d058d3574820ec386799a0be25b784780a0 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Thu, 2 Jul 2020 16:46:30 +0100 Subject: [PATCH 04/25] Smooth Styling --- ZitiTunneler/MainWindow.xaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml index e777c23d..af7deb70 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/ZitiTunneler/MainWindow.xaml @@ -14,6 +14,9 @@ Closing="Window_Closing" WindowStyle="None" Loaded="MainWindow1_Loaded" Deactivated="MainUI_Deactivated" Activated="MainUI_Activated" Background="#000F0F23"> + From c31180677e0bdebd6903326c1515ad3160e302e1 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Thu, 2 Jul 2020 16:48:36 +0100 Subject: [PATCH 05/25] Support Changes --- ZitiTunneler/MainMenu.xaml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ZitiTunneler/MainMenu.xaml.cs b/ZitiTunneler/MainMenu.xaml.cs index ec1c812e..3b3c43a4 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/ZitiTunneler/MainMenu.xaml.cs @@ -130,10 +130,10 @@ namespace ZitiTunneler Process.Start(new ProcessStartInfo("https://netfoundry.io/terms") { UseShellExecute = true }); } private void ShowFeedback(object sender, MouseButtonEventArgs e) { - Process.Start(new ProcessStartInfo("mailto:support@netfoundry.io") { UseShellExecute = true }); + Process.Start(new ProcessStartInfo("mailto:ziti-support@netfoundry.io") { UseShellExecute = true }); } private void ShowSupport(object sender, MouseButtonEventArgs e) { - Process.Start(new ProcessStartInfo("https://support.netfoundry.io") { UseShellExecute = true }); + Process.Start(new ProcessStartInfo("https://openziti.discourse.group/") { UseShellExecute = true }); } private void DetachWindow(object sender, MouseButtonEventArgs e) { From 795f3a1293a8e2174bb259f94310ee02e079dd34 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 6 Jul 2020 15:24:22 -0400 Subject: [PATCH 06/25] remove cmd for now --- service/ziti-tunnel/cmd/root.go | 44 ------------------- service/ziti-tunnel/cmd/root_addidentity.go | 37 ---------------- service/ziti-tunnel/cmd/root_debug.go | 37 ---------------- service/ziti-tunnel/cmd/root_disable_id.go | 37 ---------------- service/ziti-tunnel/cmd/root_enable_id.go | 37 ---------------- .../ziti-tunnel/cmd/root_removeidentity.go | 37 ---------------- service/ziti-tunnel/cmd/root_svc.go | 37 ---------------- service/ziti-tunnel/cmd/root_svc_install.go | 37 ---------------- service/ziti-tunnel/cmd/root_svc_remove.go | 37 ---------------- service/ziti-tunnel/cmd/root_svc_start.go | 36 --------------- service/ziti-tunnel/cmd/root_svc_status.go | 37 ---------------- service/ziti-tunnel/cmd/root_svc_stop.go | 36 --------------- service/ziti-tunnel/cmd/version.go | 37 ---------------- 13 files changed, 486 deletions(-) delete mode 100644 service/ziti-tunnel/cmd/root.go delete mode 100644 service/ziti-tunnel/cmd/root_addidentity.go delete mode 100644 service/ziti-tunnel/cmd/root_debug.go delete mode 100644 service/ziti-tunnel/cmd/root_disable_id.go delete mode 100644 service/ziti-tunnel/cmd/root_enable_id.go delete mode 100644 service/ziti-tunnel/cmd/root_removeidentity.go delete mode 100644 service/ziti-tunnel/cmd/root_svc.go delete mode 100644 service/ziti-tunnel/cmd/root_svc_install.go delete mode 100644 service/ziti-tunnel/cmd/root_svc_remove.go delete mode 100644 service/ziti-tunnel/cmd/root_svc_start.go delete mode 100644 service/ziti-tunnel/cmd/root_svc_status.go delete mode 100644 service/ziti-tunnel/cmd/root_svc_stop.go delete mode 100644 service/ziti-tunnel/cmd/version.go diff --git a/service/ziti-tunnel/cmd/root.go b/service/ziti-tunnel/cmd/root.go deleted file mode 100644 index 5c50bef5..00000000 --- a/service/ziti-tunnel/cmd/root.go +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( - "fmt" - "github.com/spf13/cobra" - "os" - "path/filepath" -) -var exeName, _ = os.Executable() -var rootCmd = &cobra.Command{ - Use: filepath.Base(exeName) , - Short: "Runs the ziti-tunnel as a service", - Long: `This program provides access to a ziti-based network. - When executed without parameters it is expected that this application is running as a service`, - Run: func(cmd *cobra.Command, args []string) { - // Do Stuff Here - fmt.Println("i am in command") - }, -} - -func Execute() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } - -} diff --git a/service/ziti-tunnel/cmd/root_addidentity.go b/service/ziti-tunnel/cmd/root_addidentity.go deleted file mode 100644 index 087e1321..00000000 --- a/service/ziti-tunnel/cmd/root_addidentity.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(addIdCmd) -} - -var addIdCmd = &cobra.Command{ - Use: "addId", - Short: "Adds the provided jwt file to the running service", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Adds the provided jwt file to the running service") - }, -} diff --git a/service/ziti-tunnel/cmd/root_debug.go b/service/ziti-tunnel/cmd/root_debug.go deleted file mode 100644 index 327b0672..00000000 --- a/service/ziti-tunnel/cmd/root_debug.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(debugCmd) -} - -var debugCmd = &cobra.Command{ - Use: "debug", - Short: "Runs the program interactively instead of expecting to be run as a service. Used in debugging", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Runs the program interactively instead of expecting to be run as a service. Used in debugging") - }, -} diff --git a/service/ziti-tunnel/cmd/root_disable_id.go b/service/ziti-tunnel/cmd/root_disable_id.go deleted file mode 100644 index eae3ab7d..00000000 --- a/service/ziti-tunnel/cmd/root_disable_id.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(disableIdCmd) -} - -var disableIdCmd = &cobra.Command{ - Use: "disable", - Short: "Disables any identity in the running service using the provided fingerprint", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Disables any identity in the running service using the provided fingerprint") - }, -} diff --git a/service/ziti-tunnel/cmd/root_enable_id.go b/service/ziti-tunnel/cmd/root_enable_id.go deleted file mode 100644 index e3ffcb8b..00000000 --- a/service/ziti-tunnel/cmd/root_enable_id.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(enableIdCmd) -} - -var enableIdCmd = &cobra.Command{ - Use: "enable", - Short: "Enables any identity in the running service using the provided fingerprint", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Enables any identity in the running service using the provided fingerprint") - }, -} diff --git a/service/ziti-tunnel/cmd/root_removeidentity.go b/service/ziti-tunnel/cmd/root_removeidentity.go deleted file mode 100644 index ec8b55d2..00000000 --- a/service/ziti-tunnel/cmd/root_removeidentity.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(removeIdCmd) -} - -var removeIdCmd = &cobra.Command{ - Use: "removeId", - Short: "Removes any identity from the running service using the provided fingerprint", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Removes any identity from the running service using the provided fingerprint") - }, -} diff --git a/service/ziti-tunnel/cmd/root_svc.go b/service/ziti-tunnel/cmd/root_svc.go deleted file mode 100644 index a1768b41..00000000 --- a/service/ziti-tunnel/cmd/root_svc.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(serviceCmd) -} - -var serviceCmd = &cobra.Command{ - Use: "service", - Short: "Expects to run the program as a service", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("print or return the version here") - }, -} diff --git a/service/ziti-tunnel/cmd/root_svc_install.go b/service/ziti-tunnel/cmd/root_svc_install.go deleted file mode 100644 index bbacff4c..00000000 --- a/service/ziti-tunnel/cmd/root_svc_install.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - serviceCmd.AddCommand(installCmd) -} - -var installCmd = &cobra.Command{ - Use: "install", - Short: "Installs the executable as a service.", - Long: `When installing as a service using this function make sure not to move the executable. The path to the executing program will be used in the service`, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("install this thing as a service") - }, -} diff --git a/service/ziti-tunnel/cmd/root_svc_remove.go b/service/ziti-tunnel/cmd/root_svc_remove.go deleted file mode 100644 index 60e360ca..00000000 --- a/service/ziti-tunnel/cmd/root_svc_remove.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - serviceCmd.AddCommand(removeCmd) -} - -var removeCmd = &cobra.Command{ - Use: "remove", - Short: "Removes the executable as a service.", - Long: `When removing the service make sure the path and service name have not changed`, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("remove this thing as a service") - }, -} diff --git a/service/ziti-tunnel/cmd/root_svc_start.go b/service/ziti-tunnel/cmd/root_svc_start.go deleted file mode 100644 index ad4918c4..00000000 --- a/service/ziti-tunnel/cmd/root_svc_start.go +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - serviceCmd.AddCommand(startCmd) -} - -var startCmd = &cobra.Command{ - Use: "start", - Short: "Tries to start the service", - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Tries to start the service") - }, -} diff --git a/service/ziti-tunnel/cmd/root_svc_status.go b/service/ziti-tunnel/cmd/root_svc_status.go deleted file mode 100644 index d3c820ab..00000000 --- a/service/ziti-tunnel/cmd/root_svc_status.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - serviceCmd.AddCommand(statusCmd) -} - -var statusCmd = &cobra.Command{ - Use: "status", - Short: "Prints the status of the service", - Hidden: true, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Prints the status of the service") - }, -} diff --git a/service/ziti-tunnel/cmd/root_svc_stop.go b/service/ziti-tunnel/cmd/root_svc_stop.go deleted file mode 100644 index 48ddb636..00000000 --- a/service/ziti-tunnel/cmd/root_svc_stop.go +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - serviceCmd.AddCommand(stopCmd) -} - -var stopCmd = &cobra.Command{ - Use: "stop", - Short: "Tries to stop the service", - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("try to stop the service") - }, -} diff --git a/service/ziti-tunnel/cmd/version.go b/service/ziti-tunnel/cmd/version.go deleted file mode 100644 index da7a6ca7..00000000 --- a/service/ziti-tunnel/cmd/version.go +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright NetFoundry, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package cmd - -import ( -"fmt" - -"github.com/spf13/cobra" -) - -func init() { - rootCmd.AddCommand(versionCmd) -} - -var versionCmd = &cobra.Command{ - Use: "version", - Short: "Print the version of the current executable", - Long: ``, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("print or return the version here") - }, -} From e4ccbd2e7006360f1282a9855a859248699e96ff Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 6 Jul 2020 15:36:45 -0400 Subject: [PATCH 07/25] Release 0.0.13 --- service/ziti-tunnel/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 69308499..38eeff88 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -3,9 +3,9 @@ package main const ( - Version = "0.0.7" - Revision = "8416b2241862" - Branch = "jun5" + Version = "0.0.13" + Revision = "dcefc9088a10" + Branch = "master" BuildUser = "Clint D" - BuildDate = "2020-06-05 12:52:45" + BuildDate = "2020-07-06 15:36:45" ) From 2a874f51d695432a960a2a77a53b3c912a97e41b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 6 Jul 2020 15:37:20 -0400 Subject: [PATCH 08/25] Release 0.0.13 --- 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 38eeff88..3f3e2114 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -4,8 +4,8 @@ package main const ( Version = "0.0.13" - Revision = "dcefc9088a10" + Revision = "e4ccbd2e7006" Branch = "master" BuildUser = "Clint D" - BuildDate = "2020-07-06 15:36:45" + BuildDate = "2020-07-06 15:37:20" ) From 4eb018f90b4a82534468af782733920de40b79fc Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 6 Jul 2020 15:41:34 -0400 Subject: [PATCH 09/25] Release 0.0.13 --- 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 3f3e2114..babd11a0 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -4,8 +4,8 @@ package main const ( Version = "0.0.13" - Revision = "e4ccbd2e7006" + Revision = "2a874f51d695" Branch = "master" BuildUser = "Clint D" - BuildDate = "2020-07-06 15:37:20" + BuildDate = "2020-07-06 15:41:34" ) From a76fb24ba90225738e26da457ae7658f467ff2b7 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 7 Jul 2020 08:41:51 -0400 Subject: [PATCH 10/25] move to latest sdk and move from old include style to new openziti --- service/cziti/cziti-cli/main.go | 2 +- service/cziti/dns-proxy.go | 2 +- service/cziti/sdk.go | 1 + service/go.mod | 15 +-- service/go.sum | 146 +++++++++++++++++---- service/ziti-tunnel/dto/dtos.go | 8 +- service/ziti-tunnel/globals/loghelper.go | 2 +- service/ziti-tunnel/idutil/identity.go | 6 +- service/ziti-tunnel/main.go | 4 +- service/ziti-tunnel/service/debug.go | 4 +- service/ziti-tunnel/service/events.go | 2 +- service/ziti-tunnel/service/ipc.go | 18 +-- service/ziti-tunnel/service/permissions.go | 2 +- service/ziti-tunnel/service/pkg-vars.go | 4 +- service/ziti-tunnel/service/service.go | 2 +- service/ziti-tunnel/service/state.go | 8 +- service/ziti-wintun/main.go | 4 +- 17 files changed, 158 insertions(+), 72 deletions(-) diff --git a/service/cziti/cziti-cli/main.go b/service/cziti/cziti-cli/main.go index 073f7ad0..daf67bb7 100644 --- a/service/cziti/cziti-cli/main.go +++ b/service/cziti/cziti-cli/main.go @@ -25,7 +25,7 @@ import ( "os" "strconv" "strings" - "github.com/netfoundry/ziti-tunnel-win/service/cziti" + "github.com/openziti/ziti-tunnel-win/service/cziti" ) func main() { diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 9762a2cb..6a69d3e5 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -22,7 +22,7 @@ import ( "github.com/miekg/dns" "net" "time" - "github.com/netfoundry/ziti-tunnel-win/service/cziti/windns" + "github.com/openziti/ziti-tunnel-win/service/cziti/windns" ) func processDNSquery(packet []byte, p *net.UDPAddr, s *net.UDPConn) { diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index eb59d4de..39eaf766 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -223,6 +223,7 @@ func LoadZiti(cfg string) *CZitiCtx { ctx.options.init_cb = C.ziti_init_cb(C.initCB) ctx.options.service_cb = C.ziti_service_cb(C.serviceCB) ctx.options.refresh_interval = C.long(15) + ctx.options.metrics_type = C.INSTANT ctx.options.config_types = C.all_configs ch := make(chan *CZitiCtx) diff --git a/service/go.mod b/service/go.mod index 7278df0b..38e86173 100644 --- a/service/go.mod +++ b/service/go.mod @@ -1,4 +1,4 @@ -module github.com/netfoundry/ziti-tunnel-win/service +module github.com/openziti/ziti-tunnel-win/service go 1.14 @@ -6,19 +6,16 @@ require ( github.com/Microsoft/go-winio v0.4.14 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect - github.com/jonboulle/clockwork v0.1.0 // indirect - github.com/kr/pretty v0.1.0 // indirect github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible github.com/lestrrat-go/strftime v1.0.1 // indirect github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc github.com/miekg/dns v1.1.29 - github.com/netfoundry/ziti-foundation v0.9.8 - github.com/netfoundry/ziti-sdk-golang v0.11.16 - github.com/sirupsen/logrus v1.5.0 - github.com/spf13/cobra v0.0.5 + github.com/openziti/foundation v0.11.11 + github.com/openziti/sdk-golang v0.13.20 + github.com/sirupsen/logrus v1.6.0 + github.com/spf13/cobra v0.0.7 github.com/tebeka/strftime v0.1.4 // indirect - golang.org/x/sys v0.0.0-20200406113430-c6e801f48ba2 + golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae golang.zx2c4.com/wireguard v0.0.20200320 golang.zx2c4.com/wireguard/windows v0.1.0 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) diff --git a/service/go.sum b/service/go.sum index 43d2c7e0..1e414a1c 100644 --- a/service/go.sum +++ b/service/go.sum @@ -1,23 +1,35 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo= github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antlr/antlr4 v0.0.0-20191115170859-54daca92f7b0/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/biogo/store v0.0.0-20190426020002-884f370e325d/go.mod h1:Iev9Q3MErcn+w3UOJD/DkEzllvugfdx7bGcMOFhvr/4= +github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU= @@ -26,12 +38,31 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -42,10 +73,14 @@ github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uc github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.3-0.20170604004442-17d67be645c3/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -69,6 +104,7 @@ github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaa github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc h1:PQrqw9XKYcPRI9rKwoGZucMjWvfZpyfb5j8Lc13j8YY= @@ -81,53 +117,78 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/netfoundry/secretstream v0.1.1/go.mod h1:uasYkYSp0MmNSlKOWJ2sVzxPms8e58TS4ENq4yro86k= -github.com/netfoundry/ziti-foundation v0.9.8 h1:Nyx4U+pZ6iPtXBYSIad8xg5nBVjQNLatCHg5krQmeWM= -github.com/netfoundry/ziti-foundation v0.9.8/go.mod h1:desAxe5jN/V/+cYe99TGEqxtMVdlJ1HfSRzCmuPJD7M= -github.com/netfoundry/ziti-sdk-golang v0.11.16 h1:YZxHtDq4o+r141ISHvElT0CH4DKdb+EeQaoxSDVJAq0= -github.com/netfoundry/ziti-sdk-golang v0.11.16/go.mod h1:Onxp1kNm0xarDjl6S43Y9PQPVHfXgUFcM157KQKqHm4= +github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg= +github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/netfoundry/secretstream v0.1.2/go.mod h1:uasYkYSp0MmNSlKOWJ2sVzxPms8e58TS4ENq4yro86k= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/openziti/foundation v0.11.11 h1:GPASO0aTtzuzwQbfvu1OMOPdAKzi/DTkxKJ0y2NTzXU= +github.com/openziti/foundation v0.11.11/go.mod h1:Qdd7eCuTrpRwEeDbvYy89sFbEY4+J7OuX8UygxNBsvY= +github.com/openziti/sdk-golang v0.13.20 h1:vnpGvaS/TBz2zd8lUO4cGVYmRWcnAX0v8k/P9+q36BI= +github.com/openziti/sdk-golang v0.13.20/go.mod h1:2cCcWJATUzfx8T9CjaERqersSbKT0r5DptUTcZvHOVs= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q= -github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= +github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/speps/go-hashids v2.0.0+incompatible h1:kSfxGfESueJKTx0mpER9Y/1XHl+FVQjtCqRyYcviFbw= github.com/speps/go-hashids v2.0.0+incompatible/go.mod h1:P7hqPzMdnZOfyIk+xrlG1QaSMw+gCBdHKsBDnhpaZvc= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU= +github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tebeka/strftime v0.1.4 h1:e0FKSyxthD1Xk4cIixFPoyfD33u2SbjNngOaaC3ePoU= github.com/tebeka/strftime v0.1.4/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -136,21 +197,35 @@ golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -159,17 +234,21 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200301040627-c5d0d7b4ec88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200406113430-c6e801f48ba2 h1:Z9pPywZscwuw0ijrLEbTzW9lppFgBY4HDgbvoDnreQs= -golang.org/x/sys v0.0.0-20200406113430-c6e801f48ba2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de h1:aYKJLPSrddB2N7/6OKyFqJ337SXpo61bBuvO5p1+7iY= golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -178,14 +257,23 @@ golang.zx2c4.com/wireguard v0.0.20200320 h1:1vE6zVeO7fix9cJX1Z9ZQ+ikPIIx7vIyU0o0 golang.zx2c4.com/wireguard v0.0.20200320/go.mod h1:lDian4Sw4poJ04SgHh35nzMVwGSYlPumkdnHcucAQoY= golang.zx2c4.com/wireguard/windows v0.1.0 h1:742izt2DAJBpIQT+DvrzN58P9p7fO4BUFOgMzY9qVhw= golang.zx2c4.com/wireguard/windows v0.1.0/go.mod h1:EK7CxrFnicmYJ0ZCF6crBh2/EMMeSxMlqgLlwN0Kv9s= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/service/ziti-tunnel/dto/dtos.go b/service/ziti-tunnel/dto/dtos.go index a41f9c08..e5312164 100644 --- a/service/ziti-tunnel/dto/dtos.go +++ b/service/ziti-tunnel/dto/dtos.go @@ -18,11 +18,11 @@ package dto import ( - idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config" - "github.com/netfoundry/ziti-sdk-golang/ziti/enroll" - "github.com/netfoundry/ziti-tunnel-win/service/cziti" + idcfg "github.com/openziti/sdk-golang/ziti/config" + "github.com/openziti/sdk-golang/ziti/enroll" + "github.com/openziti/ziti-tunnel-win/service/cziti" "log" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" ) type AddIdentity struct { diff --git a/service/ziti-tunnel/globals/loghelper.go b/service/ziti-tunnel/globals/loghelper.go index d8b3832d..e90699d8 100644 --- a/service/ziti-tunnel/globals/loghelper.go +++ b/service/ziti-tunnel/globals/loghelper.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" ) var Elog debug.Log diff --git a/service/ziti-tunnel/idutil/identity.go b/service/ziti-tunnel/idutil/identity.go index 1372088b..911c244f 100644 --- a/service/ziti-tunnel/idutil/identity.go +++ b/service/ziti-tunnel/idutil/identity.go @@ -19,9 +19,9 @@ package idutil import ( "github.com/michaelquigley/pfxlog" - idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config" - "github.com/netfoundry/ziti-tunnel-win/service/cziti" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto" + idcfg "github.com/openziti/sdk-golang/ziti/config" + "github.com/openziti/ziti-tunnel-win/service/cziti" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" ) var log = pfxlog.Logger() diff --git a/service/ziti-tunnel/main.go b/service/ziti-tunnel/main.go index 017a93a4..855e5e13 100644 --- a/service/ziti-tunnel/main.go +++ b/service/ziti-tunnel/main.go @@ -24,10 +24,10 @@ import ( "golang.org/x/sys/windows/svc/eventlog" "os" "strings" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" "golang.org/x/sys/windows/svc" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/service" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/service" ) var log = globals.Logger() diff --git a/service/ziti-tunnel/service/debug.go b/service/ziti-tunnel/service/debug.go index 0ea3f401..2180a68c 100644 --- a/service/ziti-tunnel/service/debug.go +++ b/service/ziti-tunnel/service/debug.go @@ -18,8 +18,8 @@ package service import ( - idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto" + idcfg "github.com/openziti/sdk-golang/ziti/config" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" ) func dbg() { diff --git a/service/ziti-tunnel/service/events.go b/service/ziti-tunnel/service/events.go index 5b02dc67..5a644680 100644 --- a/service/ziti-tunnel/service/events.go +++ b/service/ziti-tunnel/service/events.go @@ -17,7 +17,7 @@ package service -import "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto" +import "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" const ( ADDED = "added" diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index d5164d04..f2f68b14 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -23,15 +23,15 @@ import ( "encoding/json" "fmt" "github.com/Microsoft/go-winio" - "github.com/netfoundry/ziti-foundation/identity/identity" - idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config" - "github.com/netfoundry/ziti-sdk-golang/ziti/enroll" - "github.com/netfoundry/ziti-tunnel-win/service/cziti" - "github.com/netfoundry/ziti-tunnel-win/service/cziti/windns" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/idutil" + "github.com/openziti/foundation/identity/identity" + idcfg "github.com/openziti/sdk-golang/ziti/config" + "github.com/openziti/sdk-golang/ziti/enroll" + "github.com/openziti/ziti-tunnel-win/service/cziti" + "github.com/openziti/ziti-tunnel-win/service/cziti/windns" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/idutil" "golang.org/x/sys/windows/svc" "golang.zx2c4.com/wireguard/tun" "io" diff --git a/service/ziti-tunnel/service/permissions.go b/service/ziti-tunnel/service/permissions.go index e659919b..3eec543d 100644 --- a/service/ziti-tunnel/service/permissions.go +++ b/service/ziti-tunnel/service/permissions.go @@ -18,7 +18,7 @@ package service import ( - "github.com/netfoundry/ziti-foundation/util/stringz" + "github.com/openziti/foundation/util/stringz" "os/user" ) diff --git a/service/ziti-tunnel/service/pkg-vars.go b/service/ziti-tunnel/service/pkg-vars.go index b3624092..ca36cc19 100644 --- a/service/ziti-tunnel/service/pkg-vars.go +++ b/service/ziti-tunnel/service/pkg-vars.go @@ -21,8 +21,8 @@ import ( "golang.org/x/sys/windows/svc" "sync" "time" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" ) var pipeBase = `\\.\pipe\NetFoundry\tunneler\` diff --git a/service/ziti-tunnel/service/service.go b/service/ziti-tunnel/service/service.go index cc985156..7e0e303f 100644 --- a/service/ziti-tunnel/service/service.go +++ b/service/ziti-tunnel/service/service.go @@ -23,7 +23,7 @@ import ( "fmt" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" ) diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index 77aa94e6..8a354b57 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -21,10 +21,10 @@ import ( "bufio" "encoding/json" "fmt" - "github.com/netfoundry/ziti-tunnel-win/service/cziti" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto" - "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/idutil" + "github.com/openziti/ziti-tunnel-win/service/cziti" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" + "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/idutil" "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "net" diff --git a/service/ziti-wintun/main.go b/service/ziti-wintun/main.go index 8c18f59b..be5d0198 100644 --- a/service/ziti-wintun/main.go +++ b/service/ziti-wintun/main.go @@ -28,8 +28,8 @@ import ( user2 "os/user" "path/filepath" "syscall" - "github.com/netfoundry/ziti-tunnel-win/service/cziti" - "github.com/netfoundry/ziti-tunnel-win/service/cziti/windns" + "github.com/openziti/ziti-tunnel-win/service/cziti" + "github.com/openziti/ziti-tunnel-win/service/cziti/windns" ) const bufferSize = 64 * 1024 From 913b62581c3c8772adedbae4cce4e775659e7885 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 7 Jul 2020 19:35:54 -0400 Subject: [PATCH 11/25] changes to openziti from netfoundry --- service/cziti/logging.go | 26 ++++++++++++++++++++++++++ service/go.mod | 1 + service/go.sum | 3 +++ service/ziti-tunnel/service/ipc.go | 2 +- service/ziti-tunnel/service/state.go | 2 +- 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 service/cziti/logging.go diff --git a/service/cziti/logging.go b/service/cziti/logging.go new file mode 100644 index 00000000..6dd945f4 --- /dev/null +++ b/service/cziti/logging.go @@ -0,0 +1,26 @@ +package cziti + +import ( + "fmt" + "github.com/robfig/cron/v3" +) + +var c = cron.New() + +func Bob() { + c.AddFunc("@midnight", func() { fmt.Println("Every hour on the half hour") }) + c.AddFunc("@every 1s", everySecond) + c.Start() +} + +func everySecond() { + fmt.Println("ticking a second") +} + +/* +uv_async_t async; +uv_async_init(loop, &async, my_callback); +async.data = "hi"; + +uv_async_send(&async); +*/ \ No newline at end of file diff --git a/service/go.mod b/service/go.mod index 38e86173..8169dc73 100644 --- a/service/go.mod +++ b/service/go.mod @@ -12,6 +12,7 @@ require ( github.com/miekg/dns v1.1.29 github.com/openziti/foundation v0.11.11 github.com/openziti/sdk-golang v0.13.20 + github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.6.0 github.com/spf13/cobra v0.0.7 github.com/tebeka/strftime v0.1.4 // indirect diff --git a/service/go.sum b/service/go.sum index 1e414a1c..cb2c5887 100644 --- a/service/go.sum +++ b/service/go.sum @@ -148,6 +148,9 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= +github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index f2f68b14..58422ac1 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -249,7 +249,7 @@ func initialize(ipv4 string, ipv4mask int) error { func setTunInfo(s *dto.TunnelStatus, ipv4 string, ipv4mask int) { if strings.TrimSpace(ipv4) == "" { - log.Infof("ip not provided using default: %d", ipv4) + log.Infof("ip not provided using default: %v", ipv4) ipv4 = Ipv4ip } if ipv4mask < 8 || ipv4mask > 24 { diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index 8a354b57..d35a7716 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -138,7 +138,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) error { luid := winipcfg.LUID(nativeTunDevice.LUID()) if strings.TrimSpace(ipv4) == "" { - log.Infof("ip not provided using default: %d", ipv4) + log.Infof("ip not provided using default: %v", ipv4) ipv4 = Ipv4ip } if ipv4mask < 8 || ipv4mask > 24 { From 9548ad894146ef6a7e71c852ac5c9aeb03ca285e Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 7 Jul 2020 19:38:50 -0400 Subject: [PATCH 12/25] bump version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 43b29618..9789c4cc 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.13 +0.0.14 From 5b13156e7a857d69d2ee482adf815f1ac59e06df Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Wed, 8 Jul 2020 16:44:34 +0100 Subject: [PATCH 13/25] Name Change --- ZitiTunneler/MainWindow.xaml | 2 +- ZitiTunneler/Properties/Resources.Designer.cs | 20 +++++++++---------- ZitiTunneler/Properties/Settings.Designer.cs | 12 +++++------ ...Tunneler.csproj => ZitiDesktopEdge.csproj} | 4 ++-- ZitiUWPSolution.sln | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) rename ZitiTunneler/{ZitiTunneler.csproj => ZitiDesktopEdge.csproj} (99%) diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml index af7deb70..a66c230b 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/ZitiTunneler/MainWindow.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" ShowInTaskbar="False" x:Name="MainUI" - Title="ZitiTunneler" Height="520" + Title="Ziti Desktop Edge" Height="520" Width="350" ResizeMode="NoResize" ClipToBounds="False" Icon="Assets/Images/icon.png" AllowsTransparency="True" diff --git a/ZitiTunneler/Properties/Resources.Designer.cs b/ZitiTunneler/Properties/Resources.Designer.cs index 60ce376f..a9833004 100644 --- a/ZitiTunneler/Properties/Resources.Designer.cs +++ b/ZitiTunneler/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace ZitiTunneler.Properties { +namespace Ziti.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace ZitiTunneler.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -39,13 +39,13 @@ namespace ZitiTunneler.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZitiTunneler.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ziti.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. diff --git a/ZitiTunneler/Properties/Settings.Designer.cs b/ZitiTunneler/Properties/Settings.Designer.cs index 4a310077..7c548a7b 100644 --- a/ZitiTunneler/Properties/Settings.Designer.cs +++ b/ZitiTunneler/Properties/Settings.Designer.cs @@ -8,15 +8,15 @@ // //------------------------------------------------------------------------------ -namespace ZitiTunneler.Properties { - - +namespace Ziti.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance; diff --git a/ZitiTunneler/ZitiTunneler.csproj b/ZitiTunneler/ZitiDesktopEdge.csproj similarity index 99% rename from ZitiTunneler/ZitiTunneler.csproj rename to ZitiTunneler/ZitiDesktopEdge.csproj index 9c600c19..d1b53374 100644 --- a/ZitiTunneler/ZitiTunneler.csproj +++ b/ZitiTunneler/ZitiDesktopEdge.csproj @@ -6,8 +6,8 @@ AnyCPU {FA4291EA-A97E-4854-959F-91EE7B330B37} WinExe - ZitiTunneler - ZitiTunneler + Ziti + Ziti Desktop Edge v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/ZitiUWPSolution.sln b/ZitiUWPSolution.sln index dbf08b50..73f38580 100644 --- a/ZitiUWPSolution.sln +++ b/ZitiUWPSolution.sln @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiTunneler", "ZitiTunneler\ZitiTunneler.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiDesktopEdge", "ZitiTunneler\ZitiDesktopEdge.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiUpdateService", "ZitiUpdateService\ZitiUpdateService.csproj", "{9AB81609-F5DD-40A6-87B5-F3279D48514D}" EndProject From ebcbad61325057543037ee54ae8cb7d317a1a2ac Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 8 Jul 2020 13:40:27 -0400 Subject: [PATCH 14/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d4d257e..1ec5b193 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Ziti Tunnel for Windows +# Ziti Desktop Edge for Windows (the uwp project which used to be here has moved to [uwp-vpnplugin-archive](.uwp-vpnplugin-archive) and is likely abandoned) -The Ziti Tunnel for Windows is an application that is necessary to integrate applications which cannot embed a Ziti SDK +The Ziti Desktop Edge for Windows is an application that is necessary to integrate applications which cannot embed a Ziti SDK directly into the application. This is colloquially known as a "brown field" Ziti-enabled application because the app itself has no understanding that it has been Ziti-enabled. From 7cf7305ffe8835af124c78332c343089fc25a3b2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 8 Jul 2020 14:08:15 -0400 Subject: [PATCH 15/25] add the wintun installer sln/project --- ZitiWintunInstaller.sln | 31 +++++++++++++ ZitiWintunInstaller/.gitignore | 1 + ZitiWintunInstaller/Product.wxs | 33 ++++++++++++++ .../ZitiWintunInstaller.wixproj | 45 +++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 ZitiWintunInstaller.sln create mode 100644 ZitiWintunInstaller/.gitignore create mode 100644 ZitiWintunInstaller/Product.wxs create mode 100644 ZitiWintunInstaller/ZitiWintunInstaller.wixproj diff --git a/ZitiWintunInstaller.sln b/ZitiWintunInstaller.sln new file mode 100644 index 00000000..08823b4c --- /dev/null +++ b/ZitiWintunInstaller.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29318.209 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D66B1C6A-ADFE-437E-B037-C4C849A6CA97}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + README.md = README.md + EndProjectSection +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ZitiWintunInstaller", "ZitiWintunInstaller\ZitiWintunInstaller.wixproj", "{1A5D850F-2E38-4524-8745-29A96FA62683}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1A5D850F-2E38-4524-8745-29A96FA62683}.Debug|x86.ActiveCfg = Debug|x86 + {1A5D850F-2E38-4524-8745-29A96FA62683}.Debug|x86.Build.0 = Debug|x86 + {1A5D850F-2E38-4524-8745-29A96FA62683}.Release|x86.ActiveCfg = Release|x86 + {1A5D850F-2E38-4524-8745-29A96FA62683}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3E499EAC-C1BA-41A0-8076-D660F8ACC977} + EndGlobalSection +EndGlobal diff --git a/ZitiWintunInstaller/.gitignore b/ZitiWintunInstaller/.gitignore new file mode 100644 index 00000000..6bade68c --- /dev/null +++ b/ZitiWintunInstaller/.gitignore @@ -0,0 +1 @@ +wintun*msm diff --git a/ZitiWintunInstaller/Product.wxs b/ZitiWintunInstaller/Product.wxs new file mode 100644 index 00000000..d79aca6d --- /dev/null +++ b/ZitiWintunInstaller/Product.wxs @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZitiWintunInstaller/ZitiWintunInstaller.wixproj b/ZitiWintunInstaller/ZitiWintunInstaller.wixproj new file mode 100644 index 00000000..25e9d37e --- /dev/null +++ b/ZitiWintunInstaller/ZitiWintunInstaller.wixproj @@ -0,0 +1,45 @@ + + + + Debug + x86 + 3.10 + 1a5d850f-2e38-4524-8745-29a96fa62683 + 2.0 + OpenZitiWintunInstaller + Package + NFWintunInstaller + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + + + + + echo Inside Pre-build event about to download wintun +echo from: https://www.wintun.net/builds/wintun-amd64-0.8.1.msm +echo into $(MSBuildProjectFullPath)\wintun-amd64-0.8.1.msm + +call powershell "Invoke-WebRequest https://www.wintun.net/builds/wintun-amd64-0.8.1.msm -OutFile $(ProjectDir)wintun-amd64-0.8.1.msm" + + + \ No newline at end of file From 3478993b90268161cf4b083549c5796204279b64 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 8 Jul 2020 14:21:23 -0400 Subject: [PATCH 16/25] Rename ZitiTunneler --> ZitiDesktopEdge --- ZitiUWPSolution.sln => ZitiDesktopEdge.sln | 2 +- ZitiTunneler/App.xaml | 4 ++-- ZitiTunneler/App.xaml.cs | 2 +- ZitiTunneler/ControllerScreen.xaml | 4 ++-- ZitiTunneler/ControllerScreen.xaml.cs | 2 +- ZitiTunneler/IdentityDetails.xaml | 4 ++-- ZitiTunneler/IdentityDetails.xaml.cs | 4 ++-- ZitiTunneler/IdentityItem.xaml | 4 ++-- ZitiTunneler/IdentityItem.xaml.cs | 4 ++-- ZitiTunneler/MainMenu.xaml | 4 ++-- ZitiTunneler/MainMenu.xaml.cs | 4 ++-- ZitiTunneler/MainWindow.xaml | 6 +++--- ZitiTunneler/MainWindow.xaml.cs | 6 +++--- ZitiTunneler/MenuEditItem.xaml | 4 ++-- ZitiTunneler/MenuEditItem.xaml.cs | 2 +- ZitiTunneler/MenuItem.xaml | 4 ++-- ZitiTunneler/MenuItem.xaml.cs | 2 +- ZitiTunneler/Models/UILog.cs | 2 +- ZitiTunneler/Models/UIModel.cs | 2 +- ZitiTunneler/Models/ZitiIdentity.cs | 2 +- ZitiTunneler/Models/ZitiService.cs | 2 +- ZitiTunneler/Properties/AssemblyInfo.cs | 6 +++--- ZitiTunneler/Properties/Resources.Designer.cs | 20 +++++++++---------- ZitiTunneler/Properties/Settings.Designer.cs | 12 +++++------ ZitiTunneler/RegistrationScreen.xaml | 4 ++-- ZitiTunneler/RegistrationScreen.xaml.cs | 2 +- ZitiTunneler/ServiceClient/ClientImpl.cs | 2 +- ZitiTunneler/ServiceClient/DataStructures.cs | 2 +- ZitiTunneler/ServiceInfo.xaml | 4 ++-- ZitiTunneler/ServiceInfo.xaml.cs | 2 +- ZitiTunneler/SubMenuItem.xaml | 4 ++-- ZitiTunneler/SubMenuItem.xaml.cs | 2 +- ZitiTunneler/Themes/Generic.xaml | 2 +- ZitiTunneler/Toggler.xaml | 4 ++-- ZitiTunneler/Toggler.xaml.cs | 2 +- ...Tunneler.csproj => ZitiDekstopEdge.csproj} | 4 ++-- 36 files changed, 71 insertions(+), 71 deletions(-) rename ZitiUWPSolution.sln => ZitiDesktopEdge.sln (96%) rename ZitiTunneler/{ZitiTunneler.csproj => ZitiDekstopEdge.csproj} (99%) diff --git a/ZitiUWPSolution.sln b/ZitiDesktopEdge.sln similarity index 96% rename from ZitiUWPSolution.sln rename to ZitiDesktopEdge.sln index dbf08b50..51b5ef0a 100644 --- a/ZitiUWPSolution.sln +++ b/ZitiDesktopEdge.sln @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiTunneler", "ZitiTunneler\ZitiTunneler.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiDekstopEdge", "ZitiTunneler\ZitiDekstopEdge.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiUpdateService", "ZitiUpdateService\ZitiUpdateService.csproj", "{9AB81609-F5DD-40A6-87B5-F3279D48514D}" EndProject diff --git a/ZitiTunneler/App.xaml b/ZitiTunneler/App.xaml index fa730afb..876e1d58 100644 --- a/ZitiTunneler/App.xaml +++ b/ZitiTunneler/App.xaml @@ -1,7 +1,7 @@ - diff --git a/ZitiTunneler/App.xaml.cs b/ZitiTunneler/App.xaml.cs index 2418dc42..d79bc3d8 100644 --- a/ZitiTunneler/App.xaml.cs +++ b/ZitiTunneler/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for App.xaml /// diff --git a/ZitiTunneler/ControllerScreen.xaml b/ZitiTunneler/ControllerScreen.xaml index 0f6633a5..4d9eed8b 100644 --- a/ZitiTunneler/ControllerScreen.xaml +++ b/ZitiTunneler/ControllerScreen.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/ControllerScreen.xaml.cs b/ZitiTunneler/ControllerScreen.xaml.cs index 1d922775..f3d584d1 100644 --- a/ZitiTunneler/ControllerScreen.xaml.cs +++ b/ZitiTunneler/ControllerScreen.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for ControllerScreen.xaml /// diff --git a/ZitiTunneler/IdentityDetails.xaml b/ZitiTunneler/IdentityDetails.xaml index e7d0251b..027e222c 100644 --- a/ZitiTunneler/IdentityDetails.xaml +++ b/ZitiTunneler/IdentityDetails.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/ZitiTunneler/IdentityDetails.xaml.cs index 3c0bd255..5aea08d9 100644 --- a/ZitiTunneler/IdentityDetails.xaml.cs +++ b/ZitiTunneler/IdentityDetails.xaml.cs @@ -12,9 +12,9 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -using ZitiTunneler.Models; +using ZitiDesktopEdge.Models; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for IdentityDetails.xaml /// diff --git a/ZitiTunneler/IdentityItem.xaml b/ZitiTunneler/IdentityItem.xaml index 7d0eda60..3fc3f4aa 100644 --- a/ZitiTunneler/IdentityItem.xaml +++ b/ZitiTunneler/IdentityItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/IdentityItem.xaml.cs b/ZitiTunneler/IdentityItem.xaml.cs index e1bcb844..a601218b 100644 --- a/ZitiTunneler/IdentityItem.xaml.cs +++ b/ZitiTunneler/IdentityItem.xaml.cs @@ -12,9 +12,9 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -using ZitiTunneler.Models; +using ZitiDesktopEdge.Models; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// User Control to list Identities and give status /// diff --git a/ZitiTunneler/MainMenu.xaml b/ZitiTunneler/MainMenu.xaml index 4c36e7f5..e3c3779e 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/ZitiTunneler/MainMenu.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/MainMenu.xaml.cs b/ZitiTunneler/MainMenu.xaml.cs index 3b3c43a4..4852156f 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/ZitiTunneler/MainMenu.xaml.cs @@ -5,9 +5,9 @@ using System.Diagnostics; using System; using System.Threading; using System.Management.Automation; -using ZitiTunneler.Models; +using ZitiDesktopEdge.Models; -namespace ZitiTunneler +namespace ZitiDesktopEdge { /// /// Interaction logic for MainMenu.xaml diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml index af7deb70..9ab38231 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/ZitiTunneler/MainWindow.xaml @@ -1,13 +1,13 @@ - /// Interaction logic for MainWindow.xaml diff --git a/ZitiTunneler/MenuEditItem.xaml b/ZitiTunneler/MenuEditItem.xaml index be1332b8..10c04ec3 100644 --- a/ZitiTunneler/MenuEditItem.xaml +++ b/ZitiTunneler/MenuEditItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/MenuEditItem.xaml.cs b/ZitiTunneler/MenuEditItem.xaml.cs index 7e55b604..14aa8075 100644 --- a/ZitiTunneler/MenuEditItem.xaml.cs +++ b/ZitiTunneler/MenuEditItem.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/MenuItem.xaml b/ZitiTunneler/MenuItem.xaml index 51d0296e..7cb19dfe 100644 --- a/ZitiTunneler/MenuItem.xaml +++ b/ZitiTunneler/MenuItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/MenuItem.xaml.cs b/ZitiTunneler/MenuItem.xaml.cs index 156ac5e5..dd4da3c3 100644 --- a/ZitiTunneler/MenuItem.xaml.cs +++ b/ZitiTunneler/MenuItem.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/Models/UILog.cs b/ZitiTunneler/Models/UILog.cs index fc157a6d..af73adbb 100644 --- a/ZitiTunneler/Models/UILog.cs +++ b/ZitiTunneler/Models/UILog.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace ZitiTunneler.Models { +namespace ZitiDesktopEdge.Models { public class UILog { private static string _logDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "NetFoundry" ,"Logs", "Log.log"); diff --git a/ZitiTunneler/Models/UIModel.cs b/ZitiTunneler/Models/UIModel.cs index e8b5b46a..641877aa 100644 --- a/ZitiTunneler/Models/UIModel.cs +++ b/ZitiTunneler/Models/UIModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZitiTunneler.Models +namespace ZitiDesktopEdge.Models { static class UIModel { diff --git a/ZitiTunneler/Models/ZitiIdentity.cs b/ZitiTunneler/Models/ZitiIdentity.cs index 4278bd99..9af38425 100644 --- a/ZitiTunneler/Models/ZitiIdentity.cs +++ b/ZitiTunneler/Models/ZitiIdentity.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZitiTunneler.Models { +namespace ZitiDesktopEdge.Models { public class ZitiIdentity { public List Services { get; set; } public string Name { get; set; } diff --git a/ZitiTunneler/Models/ZitiService.cs b/ZitiTunneler/Models/ZitiService.cs index fa513ce1..f1f22583 100644 --- a/ZitiTunneler/Models/ZitiService.cs +++ b/ZitiTunneler/Models/ZitiService.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZitiTunneler.Models { +namespace ZitiDesktopEdge.Models { public class ZitiService { public string Name { get; set; } public string Url { get; set; } diff --git a/ZitiTunneler/Properties/AssemblyInfo.cs b/ZitiTunneler/Properties/AssemblyInfo.cs index d3db0749..9155285a 100644 --- a/ZitiTunneler/Properties/AssemblyInfo.cs +++ b/ZitiTunneler/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ using System.Windows; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ZitiTunneler")] +[assembly: AssemblyTitle("Ziti Desktop Edge")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ZitiTunneler")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyProduct("Ziti Desktop Edge")] +[assembly: AssemblyCopyright("Copyright NetFoundry © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/ZitiTunneler/Properties/Resources.Designer.cs b/ZitiTunneler/Properties/Resources.Designer.cs index 60ce376f..e73a18ff 100644 --- a/ZitiTunneler/Properties/Resources.Designer.cs +++ b/ZitiTunneler/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace ZitiTunneler.Properties { +namespace Ziti.Desktop.Edge.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,19 +19,19 @@ namespace ZitiTunneler.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -39,13 +39,13 @@ namespace ZitiTunneler.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZitiTunneler.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ziti.Desktop.Edge.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. diff --git a/ZitiTunneler/Properties/Settings.Designer.cs b/ZitiTunneler/Properties/Settings.Designer.cs index 4a310077..bd88d524 100644 --- a/ZitiTunneler/Properties/Settings.Designer.cs +++ b/ZitiTunneler/Properties/Settings.Designer.cs @@ -8,15 +8,15 @@ // //------------------------------------------------------------------------------ -namespace ZitiTunneler.Properties { - - +namespace Ziti.Desktop.Edge.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance; diff --git a/ZitiTunneler/RegistrationScreen.xaml b/ZitiTunneler/RegistrationScreen.xaml index d9d562d9..16bd3287 100644 --- a/ZitiTunneler/RegistrationScreen.xaml +++ b/ZitiTunneler/RegistrationScreen.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/RegistrationScreen.xaml.cs b/ZitiTunneler/RegistrationScreen.xaml.cs index 19b250d1..3bc20ca6 100644 --- a/ZitiTunneler/RegistrationScreen.xaml.cs +++ b/ZitiTunneler/RegistrationScreen.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for RegistrationScreen.xaml /// diff --git a/ZitiTunneler/ServiceClient/ClientImpl.cs b/ZitiTunneler/ServiceClient/ClientImpl.cs index d4ce7a6b..517900f3 100644 --- a/ZitiTunneler/ServiceClient/ClientImpl.cs +++ b/ZitiTunneler/ServiceClient/ClientImpl.cs @@ -22,7 +22,7 @@ using System.Windows.Documents; /// one or more messages returned. /// /// -namespace ZitiTunneler.ServiceClient +namespace ZitiDesktopEdge.ServiceClient { internal class Client { diff --git a/ZitiTunneler/ServiceClient/DataStructures.cs b/ZitiTunneler/ServiceClient/DataStructures.cs index 61e4b1cd..6d904b60 100644 --- a/ZitiTunneler/ServiceClient/DataStructures.cs +++ b/ZitiTunneler/ServiceClient/DataStructures.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; /// These classes represent the data structures that are passed back and forth /// between the service and the client. /// -namespace ZitiTunneler.ServiceClient +namespace ZitiDesktopEdge.ServiceClient { class SvcResponse { diff --git a/ZitiTunneler/ServiceInfo.xaml b/ZitiTunneler/ServiceInfo.xaml index 24fe242d..91e678bd 100644 --- a/ZitiTunneler/ServiceInfo.xaml +++ b/ZitiTunneler/ServiceInfo.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/ServiceInfo.xaml.cs b/ZitiTunneler/ServiceInfo.xaml.cs index 6653045e..dea597fb 100644 --- a/ZitiTunneler/ServiceInfo.xaml.cs +++ b/ZitiTunneler/ServiceInfo.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/SubMenuItem.xaml b/ZitiTunneler/SubMenuItem.xaml index 7147afe6..54028384 100644 --- a/ZitiTunneler/SubMenuItem.xaml +++ b/ZitiTunneler/SubMenuItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/SubMenuItem.xaml.cs b/ZitiTunneler/SubMenuItem.xaml.cs index c06bebd4..5c9de79e 100644 --- a/ZitiTunneler/SubMenuItem.xaml.cs +++ b/ZitiTunneler/SubMenuItem.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/Themes/Generic.xaml b/ZitiTunneler/Themes/Generic.xaml index 253d4f7d..cd5d962e 100644 --- a/ZitiTunneler/Themes/Generic.xaml +++ b/ZitiTunneler/Themes/Generic.xaml @@ -1,6 +1,6 @@ + xmlns:local="clr-namespace:ZitiDesktopEdge"> diff --git a/ZitiTunneler/Toggler.xaml b/ZitiTunneler/Toggler.xaml index 06bc1188..f017c716 100644 --- a/ZitiTunneler/Toggler.xaml +++ b/ZitiTunneler/Toggler.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/Toggler.xaml.cs b/ZitiTunneler/Toggler.xaml.cs index 4f9d416a..db532134 100644 --- a/ZitiTunneler/Toggler.xaml.cs +++ b/ZitiTunneler/Toggler.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Media.Animation; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for Toggler.xaml /// diff --git a/ZitiTunneler/ZitiTunneler.csproj b/ZitiTunneler/ZitiDekstopEdge.csproj similarity index 99% rename from ZitiTunneler/ZitiTunneler.csproj rename to ZitiTunneler/ZitiDekstopEdge.csproj index 9c600c19..7d83eb20 100644 --- a/ZitiTunneler/ZitiTunneler.csproj +++ b/ZitiTunneler/ZitiDekstopEdge.csproj @@ -6,8 +6,8 @@ AnyCPU {FA4291EA-A97E-4854-959F-91EE7B330B37} WinExe - ZitiTunneler - ZitiTunneler + Ziti.Desktop.Edge + ZitiDesktopEdge v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} From 7837cef3e3c46e996297d723efc00500eaa31942 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 8 Jul 2020 14:27:22 -0400 Subject: [PATCH 17/25] more renames --- {ZitiTunneler => DesktopEdge}/App.config | 0 {ZitiTunneler => DesktopEdge}/App.xaml | 0 {ZitiTunneler => DesktopEdge}/App.xaml.cs | 0 .../Assets/Fonts/open_sans.ttf | Bin .../Assets/Fonts/russo_one.ttf | Bin .../Assets/Images/Ziti-Green.png | Bin .../Assets/Images/Ziti-Red.png | Bin .../Assets/Images/Ziti-White.png | Bin .../Assets/Images/about.png | Bin .../Assets/Images/advanced.png | Bin .../Assets/Images/appicon.png | Bin .../Assets/Images/back.png | Bin .../Assets/Images/background.png | Bin .../Assets/Images/bubble.png | Bin .../Assets/Images/card.png | Bin .../Assets/Images/close.png | Bin .../Assets/Images/closer.png | Bin .../Assets/Images/connect.png | Bin .../Assets/Images/connected.png | Bin .../Assets/Images/dashboard.png | Bin .../Assets/Images/detach.png | Bin .../Assets/Images/down.png | Bin .../Assets/Images/feedback.png | Bin .../Assets/Images/globe.png | Bin .../Assets/Images/hamburger.png | Bin .../Assets/Images/header.png | Bin .../Assets/Images/icon.ico | Bin .../Assets/Images/icon.png | Bin .../Assets/Images/identity.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/jwt.png | Bin .../Assets/Images/lastArrow.png | Bin .../Assets/Images/loading.png | Bin .../Assets/Images/logo.png | Bin .../Assets/Images/logs.png | Bin .../Assets/Images/next.png | Bin .../Assets/Images/nextArrow.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/off.png | Bin .../Assets/Images/offline.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/on.png | Bin .../Assets/Images/online.png | Bin .../Assets/Images/open.png | Bin .../Assets/Images/privacy.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/qr.png | Bin .../Assets/Images/select.png | Bin .../Assets/Images/server.png | Bin .../Assets/Images/support.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/up.png | Bin .../Assets/Images/wrench.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/x.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/z.png | Bin .../Assets/Images/ziti-green.ico | Bin .../Assets/Images/ziti-red.ico | Bin .../Assets/Images/ziti-white.ico | Bin {ZitiTunneler => DesktopEdge}/ControllerScreen.xaml | 0 .../ControllerScreen.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/IdentityDetails.xaml | 0 .../IdentityDetails.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/IdentityItem.xaml | 0 {ZitiTunneler => DesktopEdge}/IdentityItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MainMenu.xaml | 2 +- {ZitiTunneler => DesktopEdge}/MainMenu.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MainWindow.xaml | 2 +- {ZitiTunneler => DesktopEdge}/MainWindow.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml | 0 {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MenuItem.xaml | 0 {ZitiTunneler => DesktopEdge}/MenuItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/Models/UILog.cs | 0 {ZitiTunneler => DesktopEdge}/Models/UIModel.cs | 0 .../Models/ZitiIdentity.cs | 0 {ZitiTunneler => DesktopEdge}/Models/ZitiService.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../RegistrationScreen.xaml | 0 .../RegistrationScreen.xaml.cs | 0 .../ServiceClient/ClientImpl.cs | 0 .../ServiceClient/DataStructures.cs | 0 {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml | 0 {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml | 0 {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/Themes/Generic.xaml | 0 {ZitiTunneler => DesktopEdge}/Toggler.resx | 0 {ZitiTunneler => DesktopEdge}/Toggler.xaml | 0 {ZitiTunneler => DesktopEdge}/Toggler.xaml.cs | 0 .../ZitiDekstopEdge.csproj | 0 {ZitiTunneler => DesktopEdge}/app.manifest | 0 {ZitiTunneler => DesktopEdge}/packages.config | 0 {ZitiTunneler => DesktopEdge}/ziti.ico | Bin ZitiDesktopEdge.sln | 2 +- 93 files changed, 3 insertions(+), 3 deletions(-) rename {ZitiTunneler => DesktopEdge}/App.config (100%) rename {ZitiTunneler => DesktopEdge}/App.xaml (100%) rename {ZitiTunneler => DesktopEdge}/App.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Fonts/open_sans.ttf (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Fonts/russo_one.ttf (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/Ziti-Green.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/Ziti-Red.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/Ziti-White.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/about.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/advanced.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/appicon.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/back.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/background.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/bubble.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/card.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/close.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/closer.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/connect.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/connected.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/dashboard.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/detach.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/down.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/feedback.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/globe.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/hamburger.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/header.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/icon.ico (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/icon.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/identity.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/jwt.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/lastArrow.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/loading.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/logo.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/logs.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/next.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/nextArrow.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/off.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/offline.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/on.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/online.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/open.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/privacy.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/qr.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/select.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/server.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/support.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/up.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/wrench.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/x.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/z.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/ziti-green.ico (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/ziti-red.ico (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/ziti-white.ico (100%) rename {ZitiTunneler => DesktopEdge}/ControllerScreen.xaml (100%) rename {ZitiTunneler => DesktopEdge}/ControllerScreen.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/IdentityDetails.xaml (100%) rename {ZitiTunneler => DesktopEdge}/IdentityDetails.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/IdentityItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/IdentityItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MainMenu.xaml (96%) rename {ZitiTunneler => DesktopEdge}/MainMenu.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MainWindow.xaml (99%) rename {ZitiTunneler => DesktopEdge}/MainWindow.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MenuItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/MenuItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/UILog.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/UIModel.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/ZitiIdentity.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/ZitiService.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/AssemblyInfo.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Resources.Designer.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Resources.resx (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Settings.Designer.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Settings.settings (100%) rename {ZitiTunneler => DesktopEdge}/RegistrationScreen.xaml (100%) rename {ZitiTunneler => DesktopEdge}/RegistrationScreen.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/ServiceClient/ClientImpl.cs (100%) rename {ZitiTunneler => DesktopEdge}/ServiceClient/DataStructures.cs (100%) rename {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml (100%) rename {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/Themes/Generic.xaml (100%) rename {ZitiTunneler => DesktopEdge}/Toggler.resx (100%) rename {ZitiTunneler => DesktopEdge}/Toggler.xaml (100%) rename {ZitiTunneler => DesktopEdge}/Toggler.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/ZitiDekstopEdge.csproj (100%) rename {ZitiTunneler => DesktopEdge}/app.manifest (100%) rename {ZitiTunneler => DesktopEdge}/packages.config (100%) rename {ZitiTunneler => DesktopEdge}/ziti.ico (100%) diff --git a/ZitiTunneler/App.config b/DesktopEdge/App.config similarity index 100% rename from ZitiTunneler/App.config rename to DesktopEdge/App.config diff --git a/ZitiTunneler/App.xaml b/DesktopEdge/App.xaml similarity index 100% rename from ZitiTunneler/App.xaml rename to DesktopEdge/App.xaml diff --git a/ZitiTunneler/App.xaml.cs b/DesktopEdge/App.xaml.cs similarity index 100% rename from ZitiTunneler/App.xaml.cs rename to DesktopEdge/App.xaml.cs diff --git a/ZitiTunneler/Assets/Fonts/open_sans.ttf b/DesktopEdge/Assets/Fonts/open_sans.ttf similarity index 100% rename from ZitiTunneler/Assets/Fonts/open_sans.ttf rename to DesktopEdge/Assets/Fonts/open_sans.ttf diff --git a/ZitiTunneler/Assets/Fonts/russo_one.ttf b/DesktopEdge/Assets/Fonts/russo_one.ttf similarity index 100% rename from ZitiTunneler/Assets/Fonts/russo_one.ttf rename to DesktopEdge/Assets/Fonts/russo_one.ttf diff --git a/ZitiTunneler/Assets/Images/Ziti-Green.png b/DesktopEdge/Assets/Images/Ziti-Green.png similarity index 100% rename from ZitiTunneler/Assets/Images/Ziti-Green.png rename to DesktopEdge/Assets/Images/Ziti-Green.png diff --git a/ZitiTunneler/Assets/Images/Ziti-Red.png b/DesktopEdge/Assets/Images/Ziti-Red.png similarity index 100% rename from ZitiTunneler/Assets/Images/Ziti-Red.png rename to DesktopEdge/Assets/Images/Ziti-Red.png diff --git a/ZitiTunneler/Assets/Images/Ziti-White.png b/DesktopEdge/Assets/Images/Ziti-White.png similarity index 100% rename from ZitiTunneler/Assets/Images/Ziti-White.png rename to DesktopEdge/Assets/Images/Ziti-White.png diff --git a/ZitiTunneler/Assets/Images/about.png b/DesktopEdge/Assets/Images/about.png similarity index 100% rename from ZitiTunneler/Assets/Images/about.png rename to DesktopEdge/Assets/Images/about.png diff --git a/ZitiTunneler/Assets/Images/advanced.png b/DesktopEdge/Assets/Images/advanced.png similarity index 100% rename from ZitiTunneler/Assets/Images/advanced.png rename to DesktopEdge/Assets/Images/advanced.png diff --git a/ZitiTunneler/Assets/Images/appicon.png b/DesktopEdge/Assets/Images/appicon.png similarity index 100% rename from ZitiTunneler/Assets/Images/appicon.png rename to DesktopEdge/Assets/Images/appicon.png diff --git a/ZitiTunneler/Assets/Images/back.png b/DesktopEdge/Assets/Images/back.png similarity index 100% rename from ZitiTunneler/Assets/Images/back.png rename to DesktopEdge/Assets/Images/back.png diff --git a/ZitiTunneler/Assets/Images/background.png b/DesktopEdge/Assets/Images/background.png similarity index 100% rename from ZitiTunneler/Assets/Images/background.png rename to DesktopEdge/Assets/Images/background.png diff --git a/ZitiTunneler/Assets/Images/bubble.png b/DesktopEdge/Assets/Images/bubble.png similarity index 100% rename from ZitiTunneler/Assets/Images/bubble.png rename to DesktopEdge/Assets/Images/bubble.png diff --git a/ZitiTunneler/Assets/Images/card.png b/DesktopEdge/Assets/Images/card.png similarity index 100% rename from ZitiTunneler/Assets/Images/card.png rename to DesktopEdge/Assets/Images/card.png diff --git a/ZitiTunneler/Assets/Images/close.png b/DesktopEdge/Assets/Images/close.png similarity index 100% rename from ZitiTunneler/Assets/Images/close.png rename to DesktopEdge/Assets/Images/close.png diff --git a/ZitiTunneler/Assets/Images/closer.png b/DesktopEdge/Assets/Images/closer.png similarity index 100% rename from ZitiTunneler/Assets/Images/closer.png rename to DesktopEdge/Assets/Images/closer.png diff --git a/ZitiTunneler/Assets/Images/connect.png b/DesktopEdge/Assets/Images/connect.png similarity index 100% rename from ZitiTunneler/Assets/Images/connect.png rename to DesktopEdge/Assets/Images/connect.png diff --git a/ZitiTunneler/Assets/Images/connected.png b/DesktopEdge/Assets/Images/connected.png similarity index 100% rename from ZitiTunneler/Assets/Images/connected.png rename to DesktopEdge/Assets/Images/connected.png diff --git a/ZitiTunneler/Assets/Images/dashboard.png b/DesktopEdge/Assets/Images/dashboard.png similarity index 100% rename from ZitiTunneler/Assets/Images/dashboard.png rename to DesktopEdge/Assets/Images/dashboard.png diff --git a/ZitiTunneler/Assets/Images/detach.png b/DesktopEdge/Assets/Images/detach.png similarity index 100% rename from ZitiTunneler/Assets/Images/detach.png rename to DesktopEdge/Assets/Images/detach.png diff --git a/ZitiTunneler/Assets/Images/down.png b/DesktopEdge/Assets/Images/down.png similarity index 100% rename from ZitiTunneler/Assets/Images/down.png rename to DesktopEdge/Assets/Images/down.png diff --git a/ZitiTunneler/Assets/Images/feedback.png b/DesktopEdge/Assets/Images/feedback.png similarity index 100% rename from ZitiTunneler/Assets/Images/feedback.png rename to DesktopEdge/Assets/Images/feedback.png diff --git a/ZitiTunneler/Assets/Images/globe.png b/DesktopEdge/Assets/Images/globe.png similarity index 100% rename from ZitiTunneler/Assets/Images/globe.png rename to DesktopEdge/Assets/Images/globe.png diff --git a/ZitiTunneler/Assets/Images/hamburger.png b/DesktopEdge/Assets/Images/hamburger.png similarity index 100% rename from ZitiTunneler/Assets/Images/hamburger.png rename to DesktopEdge/Assets/Images/hamburger.png diff --git a/ZitiTunneler/Assets/Images/header.png b/DesktopEdge/Assets/Images/header.png similarity index 100% rename from ZitiTunneler/Assets/Images/header.png rename to DesktopEdge/Assets/Images/header.png diff --git a/ZitiTunneler/Assets/Images/icon.ico b/DesktopEdge/Assets/Images/icon.ico similarity index 100% rename from ZitiTunneler/Assets/Images/icon.ico rename to DesktopEdge/Assets/Images/icon.ico diff --git a/ZitiTunneler/Assets/Images/icon.png b/DesktopEdge/Assets/Images/icon.png similarity index 100% rename from ZitiTunneler/Assets/Images/icon.png rename to DesktopEdge/Assets/Images/icon.png diff --git a/ZitiTunneler/Assets/Images/identity.png b/DesktopEdge/Assets/Images/identity.png similarity index 100% rename from ZitiTunneler/Assets/Images/identity.png rename to DesktopEdge/Assets/Images/identity.png diff --git a/ZitiTunneler/Assets/Images/jwt.png b/DesktopEdge/Assets/Images/jwt.png similarity index 100% rename from ZitiTunneler/Assets/Images/jwt.png rename to DesktopEdge/Assets/Images/jwt.png diff --git a/ZitiTunneler/Assets/Images/lastArrow.png b/DesktopEdge/Assets/Images/lastArrow.png similarity index 100% rename from ZitiTunneler/Assets/Images/lastArrow.png rename to DesktopEdge/Assets/Images/lastArrow.png diff --git a/ZitiTunneler/Assets/Images/loading.png b/DesktopEdge/Assets/Images/loading.png similarity index 100% rename from ZitiTunneler/Assets/Images/loading.png rename to DesktopEdge/Assets/Images/loading.png diff --git a/ZitiTunneler/Assets/Images/logo.png b/DesktopEdge/Assets/Images/logo.png similarity index 100% rename from ZitiTunneler/Assets/Images/logo.png rename to DesktopEdge/Assets/Images/logo.png diff --git a/ZitiTunneler/Assets/Images/logs.png b/DesktopEdge/Assets/Images/logs.png similarity index 100% rename from ZitiTunneler/Assets/Images/logs.png rename to DesktopEdge/Assets/Images/logs.png diff --git a/ZitiTunneler/Assets/Images/next.png b/DesktopEdge/Assets/Images/next.png similarity index 100% rename from ZitiTunneler/Assets/Images/next.png rename to DesktopEdge/Assets/Images/next.png diff --git a/ZitiTunneler/Assets/Images/nextArrow.png b/DesktopEdge/Assets/Images/nextArrow.png similarity index 100% rename from ZitiTunneler/Assets/Images/nextArrow.png rename to DesktopEdge/Assets/Images/nextArrow.png diff --git a/ZitiTunneler/Assets/Images/off.png b/DesktopEdge/Assets/Images/off.png similarity index 100% rename from ZitiTunneler/Assets/Images/off.png rename to DesktopEdge/Assets/Images/off.png diff --git a/ZitiTunneler/Assets/Images/offline.png b/DesktopEdge/Assets/Images/offline.png similarity index 100% rename from ZitiTunneler/Assets/Images/offline.png rename to DesktopEdge/Assets/Images/offline.png diff --git a/ZitiTunneler/Assets/Images/on.png b/DesktopEdge/Assets/Images/on.png similarity index 100% rename from ZitiTunneler/Assets/Images/on.png rename to DesktopEdge/Assets/Images/on.png diff --git a/ZitiTunneler/Assets/Images/online.png b/DesktopEdge/Assets/Images/online.png similarity index 100% rename from ZitiTunneler/Assets/Images/online.png rename to DesktopEdge/Assets/Images/online.png diff --git a/ZitiTunneler/Assets/Images/open.png b/DesktopEdge/Assets/Images/open.png similarity index 100% rename from ZitiTunneler/Assets/Images/open.png rename to DesktopEdge/Assets/Images/open.png diff --git a/ZitiTunneler/Assets/Images/privacy.png b/DesktopEdge/Assets/Images/privacy.png similarity index 100% rename from ZitiTunneler/Assets/Images/privacy.png rename to DesktopEdge/Assets/Images/privacy.png diff --git a/ZitiTunneler/Assets/Images/qr.png b/DesktopEdge/Assets/Images/qr.png similarity index 100% rename from ZitiTunneler/Assets/Images/qr.png rename to DesktopEdge/Assets/Images/qr.png diff --git a/ZitiTunneler/Assets/Images/select.png b/DesktopEdge/Assets/Images/select.png similarity index 100% rename from ZitiTunneler/Assets/Images/select.png rename to DesktopEdge/Assets/Images/select.png diff --git a/ZitiTunneler/Assets/Images/server.png b/DesktopEdge/Assets/Images/server.png similarity index 100% rename from ZitiTunneler/Assets/Images/server.png rename to DesktopEdge/Assets/Images/server.png diff --git a/ZitiTunneler/Assets/Images/support.png b/DesktopEdge/Assets/Images/support.png similarity index 100% rename from ZitiTunneler/Assets/Images/support.png rename to DesktopEdge/Assets/Images/support.png diff --git a/ZitiTunneler/Assets/Images/up.png b/DesktopEdge/Assets/Images/up.png similarity index 100% rename from ZitiTunneler/Assets/Images/up.png rename to DesktopEdge/Assets/Images/up.png diff --git a/ZitiTunneler/Assets/Images/wrench.png b/DesktopEdge/Assets/Images/wrench.png similarity index 100% rename from ZitiTunneler/Assets/Images/wrench.png rename to DesktopEdge/Assets/Images/wrench.png diff --git a/ZitiTunneler/Assets/Images/x.png b/DesktopEdge/Assets/Images/x.png similarity index 100% rename from ZitiTunneler/Assets/Images/x.png rename to DesktopEdge/Assets/Images/x.png diff --git a/ZitiTunneler/Assets/Images/z.png b/DesktopEdge/Assets/Images/z.png similarity index 100% rename from ZitiTunneler/Assets/Images/z.png rename to DesktopEdge/Assets/Images/z.png diff --git a/ZitiTunneler/Assets/Images/ziti-green.ico b/DesktopEdge/Assets/Images/ziti-green.ico similarity index 100% rename from ZitiTunneler/Assets/Images/ziti-green.ico rename to DesktopEdge/Assets/Images/ziti-green.ico diff --git a/ZitiTunneler/Assets/Images/ziti-red.ico b/DesktopEdge/Assets/Images/ziti-red.ico similarity index 100% rename from ZitiTunneler/Assets/Images/ziti-red.ico rename to DesktopEdge/Assets/Images/ziti-red.ico diff --git a/ZitiTunneler/Assets/Images/ziti-white.ico b/DesktopEdge/Assets/Images/ziti-white.ico similarity index 100% rename from ZitiTunneler/Assets/Images/ziti-white.ico rename to DesktopEdge/Assets/Images/ziti-white.ico diff --git a/ZitiTunneler/ControllerScreen.xaml b/DesktopEdge/ControllerScreen.xaml similarity index 100% rename from ZitiTunneler/ControllerScreen.xaml rename to DesktopEdge/ControllerScreen.xaml diff --git a/ZitiTunneler/ControllerScreen.xaml.cs b/DesktopEdge/ControllerScreen.xaml.cs similarity index 100% rename from ZitiTunneler/ControllerScreen.xaml.cs rename to DesktopEdge/ControllerScreen.xaml.cs diff --git a/ZitiTunneler/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml similarity index 100% rename from ZitiTunneler/IdentityDetails.xaml rename to DesktopEdge/IdentityDetails.xaml diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs similarity index 100% rename from ZitiTunneler/IdentityDetails.xaml.cs rename to DesktopEdge/IdentityDetails.xaml.cs diff --git a/ZitiTunneler/IdentityItem.xaml b/DesktopEdge/IdentityItem.xaml similarity index 100% rename from ZitiTunneler/IdentityItem.xaml rename to DesktopEdge/IdentityItem.xaml diff --git a/ZitiTunneler/IdentityItem.xaml.cs b/DesktopEdge/IdentityItem.xaml.cs similarity index 100% rename from ZitiTunneler/IdentityItem.xaml.cs rename to DesktopEdge/IdentityItem.xaml.cs diff --git a/ZitiTunneler/MainMenu.xaml b/DesktopEdge/MainMenu.xaml similarity index 96% rename from ZitiTunneler/MainMenu.xaml rename to DesktopEdge/MainMenu.xaml index e3c3779e..1c4c1677 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/DesktopEdge/MainMenu.xaml @@ -71,7 +71,7 @@ - + diff --git a/ZitiTunneler/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs similarity index 100% rename from ZitiTunneler/MainMenu.xaml.cs rename to DesktopEdge/MainMenu.xaml.cs diff --git a/ZitiTunneler/MainWindow.xaml b/DesktopEdge/MainWindow.xaml similarity index 99% rename from ZitiTunneler/MainWindow.xaml rename to DesktopEdge/MainWindow.xaml index 9ab38231..9120a866 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/DesktopEdge/MainWindow.xaml @@ -218,7 +218,7 @@