From 33c78634dff903d6b4eea724c152026cd4317c4c Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Fri, 31 Jul 2020 22:06:03 +0100 Subject: [PATCH 01/11] Style Changes, Broke Remove Id --- DesktopEdge/App.xaml | 26 +++++++- DesktopEdge/IdentityDetails.xaml | 60 ++++++++++++++----- DesktopEdge/IdentityDetails.xaml.cs | 21 ++++--- DesktopEdge/MainMenu.xaml | 4 +- DesktopEdge/MainMenu.xaml.cs | 12 +++- DesktopEdge/MainWindow.xaml | 2 +- DesktopEdge/MainWindow.xaml.cs | 2 - DesktopEdge/Themes/Generic.xaml | 1 - .../Views/ItemRenderers/MenuEditItem.xaml | 8 +-- .../Views/ItemRenderers/ServiceInfo.xaml | 4 +- DesktopEdge/ZitiDesktopEdge.csproj | 2 +- 11 files changed, 101 insertions(+), 41 deletions(-) diff --git a/DesktopEdge/App.xaml b/DesktopEdge/App.xaml index 876e1d58..09471510 100644 --- a/DesktopEdge/App.xaml +++ b/DesktopEdge/App.xaml @@ -20,6 +20,26 @@ + + + + + + diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs index 403fb727..e444ad25 100644 --- a/DesktopEdge/IdentityDetails.xaml.cs +++ b/DesktopEdge/IdentityDetails.xaml.cs @@ -57,8 +57,13 @@ namespace ZitiDesktopEdge { } set { _isAttached = value; - if (_isAttached) Arrow.Visibility = Visibility.Visible; - else Arrow.Visibility = Visibility.Collapsed; + if (_isAttached) { + Arrow.Visibility = Visibility.Visible; + ConfirmArrow.Visibility = Visibility.Visible; + } else { + Arrow.Visibility = Visibility.Collapsed; + ConfirmArrow.Visibility = Visibility.Collapsed; + } } } @@ -99,11 +104,15 @@ namespace ZitiDesktopEdge { MainDetailScroll.Height = height; } - private void CancelConfirm(object sender, MouseButtonEventArgs e) { + private void ForgetIdentity(object sender, MouseButtonEventArgs e) { + ConfirmView.Visibility = Visibility.Visible; + } + + private void CancelConfirmButton_Click(object sender, RoutedEventArgs e) { ConfirmView.Visibility = Visibility.Collapsed; } - private void ConfirmForget(object sender, MouseButtonEventArgs e) { + private void ConfirmButton_Click(object sender, RoutedEventArgs e) { this.Visibility = Visibility.Collapsed; ServiceClient.Client client = (ServiceClient.Client)Application.Current.Properties["ServiceClient"]; try { @@ -127,9 +136,5 @@ namespace ZitiDesktopEdge { OnError(ex.Message); } } - - private void ForgetIdentity(object sender, MouseButtonEventArgs e) { - ConfirmView.Visibility = Visibility.Visible; - } } } diff --git a/DesktopEdge/MainMenu.xaml b/DesktopEdge/MainMenu.xaml index 59a1ed8f..e6fc069e 100644 --- a/DesktopEdge/MainMenu.xaml +++ b/DesktopEdge/MainMenu.xaml @@ -68,8 +68,8 @@ - - + + diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs index f35ae09b..645406a5 100644 --- a/DesktopEdge/MainMenu.xaml.cs +++ b/DesktopEdge/MainMenu.xaml.cs @@ -69,7 +69,7 @@ namespace ZitiDesktopEdge MainItems.Visibility = Visibility.Collapsed; AboutItems.Visibility = Visibility.Collapsed; MainItemsButton.Visibility = Visibility.Collapsed; - AboutItemsButton.Visibility = Visibility.Collapsed; + AboutItemsArea.Visibility = Visibility.Collapsed; BackArrow.Visibility = Visibility.Collapsed; AdvancedItems.Visibility = Visibility.Collapsed; LicensesItems.Visibility = Visibility.Collapsed; @@ -78,9 +78,17 @@ namespace ZitiDesktopEdge if (menuState=="About") { MenuTitle.Content = "About"; - AboutItemsButton.Visibility = Visibility.Visible; + AboutItemsArea.Visibility = Visibility.Visible; AboutItems.Visibility = Visibility.Visible; BackArrow.Visibility = Visibility.Visible; + + // Service Version - Lose the snapshot + string version = File.ReadAllText(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "NetFoundry", "Service", "Version.txt")); + if (version.IndexOf("-") > 0) version = version.Split('-')[0]; + + // Interface Version + VersionInfo.Content = "App: " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()+" Service: "+ version; + } else if (menuState=="Advanced") { MenuTitle.Content = "Advanced Settings"; AdvancedItems.Visibility = Visibility.Visible; diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml index cbb2895b..6c9a90da 100644 --- a/DesktopEdge/MainWindow.xaml +++ b/DesktopEdge/MainWindow.xaml @@ -93,7 +93,7 @@ - + diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index 073d7a5b..7969df7d 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -35,7 +35,6 @@ namespace ZitiDesktopEdge { private int _right = 75; private int _bottom = 0; private double _maxHeight = 800d; - private string _serviceVersion = "0.0.8"; private string[] suffixes = { "bps", "kbps", "mbps", "gbps", "tbps", "pbps" }; private List identities { @@ -75,7 +74,6 @@ namespace ZitiDesktopEdge { LaunchOrInstall(); - MainMenu.ServiceVersion.Content = _serviceVersion; SetNotifyIcon("white"); InitializeComponent(); } diff --git a/DesktopEdge/Themes/Generic.xaml b/DesktopEdge/Themes/Generic.xaml index cd5d962e..d77f7b6c 100644 --- a/DesktopEdge/Themes/Generic.xaml +++ b/DesktopEdge/Themes/Generic.xaml @@ -2,5 +2,4 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:ZitiDesktopEdge"> - diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml index 10c04ec3..02fb7ee0 100644 --- a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml +++ b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml @@ -5,16 +5,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiDesktopEdge" mc:Ignorable="d" - d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand"> + d:DesignHeight="40" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand"> - + - - + + diff --git a/DesktopEdge/Views/ItemRenderers/ServiceInfo.xaml b/DesktopEdge/Views/ItemRenderers/ServiceInfo.xaml index c6a7806c..25f6a06f 100644 --- a/DesktopEdge/Views/ItemRenderers/ServiceInfo.xaml +++ b/DesktopEdge/Views/ItemRenderers/ServiceInfo.xaml @@ -14,8 +14,8 @@ - - + + diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj index f7ef1ccf..2d11cf5d 100644 --- a/DesktopEdge/ZitiDesktopEdge.csproj +++ b/DesktopEdge/ZitiDesktopEdge.csproj @@ -33,7 +33,7 @@ Ziti true 0 - 1.0.0.%2a + 1.0.0.0 false true true From 2588c92c6ffef16bcff27fb03706844454378841 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 5 Aug 2020 14:52:20 -0400 Subject: [PATCH 02/11] update release-notes --- release-notes.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/release-notes.md b/release-notes.md index 3ad83800..92ec7e98 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,13 @@ +# Release 0.0.21 + +* What's New + + * [#94](https://github.com/openziti/desktop-edge-win/issues/94) - Added support for 'hosted' services + +* Bug fixes + + * [#xxx](https://github.com/openziti/desktop-edge-win/issues/xxxx) - xxx + # Release 0.0.20 * What's New From 3553f98304e642b4a3ef954c1ecf4e7d842c92ec Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Wed, 5 Aug 2020 21:19:53 +0100 Subject: [PATCH 03/11] Service Details Tweaks --- DesktopEdge/Assets/Images/No_Services.png | Bin 0 -> 10625 bytes DesktopEdge/IdentityDetails.xaml | 14 +++++----- DesktopEdge/IdentityDetails.xaml.cs | 25 +++++++++++++----- .../Views/ItemRenderers/IdentityItem.xaml | 16 +++++------ .../Views/ItemRenderers/MenuEditItem.xaml | 6 ++--- DesktopEdge/ZitiDesktopEdge.csproj | 3 +++ 6 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 DesktopEdge/Assets/Images/No_Services.png diff --git a/DesktopEdge/Assets/Images/No_Services.png b/DesktopEdge/Assets/Images/No_Services.png new file mode 100644 index 0000000000000000000000000000000000000000..6d3f69bad698f9681b2b27c9f3fea657f5381ca5 GIT binary patch literal 10625 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 g4_`GLZWl`@o@L|Klqi_@% literal 0 HcmV?d00001 diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml index a204e8b6..b896ac81 100644 --- a/DesktopEdge/IdentityDetails.xaml +++ b/DesktopEdge/IdentityDetails.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" x:Name="IdentityArea" d:DesignHeight="500" d:DesignWidth="350"> - + @@ -44,8 +44,8 @@ - - + + @@ -53,11 +53,11 @@ - @@ -78,7 +78,7 @@ - + diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs index e444ad25..16bf4461 100644 --- a/DesktopEdge/IdentityDetails.xaml.cs +++ b/DesktopEdge/IdentityDetails.xaml.cs @@ -75,13 +75,24 @@ namespace ZitiDesktopEdge { IdentityEnrollment.Value = _identity.Status; IdentityStatus.Value = _identity.IsEnabled ? "active" : "disabled"; ServiceList.Children.Clear(); - for (int i=0; i<_identity.Services.Count; i++) { - ServiceInfo editor = new ServiceInfo(); - editor.Label = _identity.Services[i].Name; - editor.Value = _identity.Services[i].Url; - editor.Warning = _identity.Services[i].Warning; - editor.IsLocked = true; - ServiceList.Children.Add(editor); + if (_identity.Services.Count>0) { + for (int i = 0; i < _identity.Services.Count; i++) { + ServiceInfo editor = new ServiceInfo(); + editor.Label = _identity.Services[i].Name; + editor.Value = _identity.Services[i].Url; + editor.Warning = _identity.Services[i].Warning; + editor.IsLocked = true; + ServiceList.Children.Add(editor); + } + ServiceRow.Height = new GridLength((double)0.0); + MainDetailScroll.Visibility = Visibility.Visible; + ServiceTitle.Content = _identity.Services.Count + " SERVICES"; + } else { + int sHeight = 36 * _identity.Services.Count; + if (sHeight > 240) sHeight = 240; + ServiceRow.Height = new GridLength((double)sHeight); + MainDetailScroll.Visibility = Visibility.Collapsed; + ServiceTitle.Content = "NO SERVICES AVAILABLE"; } } diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml index 3fc3f4aa..cd72c52a 100644 --- a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml +++ b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml @@ -5,10 +5,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiDesktopEdge" mc:Ignorable="d" - d:DesignHeight="60" d:DesignWidth="375" Height="60"> + d:DesignHeight="64" d:DesignWidth="375" Height="64"> - + @@ -25,20 +25,20 @@ - - - + diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml index 02fb7ee0..1ab71b9c 100644 --- a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml +++ b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml @@ -5,16 +5,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ZitiDesktopEdge" mc:Ignorable="d" - d:DesignHeight="40" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand"> + d:DesignHeight="40" Height="40" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand"> - + - + diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj index 2d11cf5d..a075ca6c 100644 --- a/DesktopEdge/ZitiDesktopEdge.csproj +++ b/DesktopEdge/ZitiDesktopEdge.csproj @@ -349,5 +349,8 @@ + + + \ No newline at end of file From fa41bdb5731967fc6231ded4c8959c139891d6f6 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Wed, 5 Aug 2020 21:53:21 +0100 Subject: [PATCH 04/11] Fix Height Calculation For Service List --- DesktopEdge/IdentityDetails.xaml.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs index 16bf4461..9bced7f6 100644 --- a/DesktopEdge/IdentityDetails.xaml.cs +++ b/DesktopEdge/IdentityDetails.xaml.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -84,13 +85,14 @@ namespace ZitiDesktopEdge { editor.IsLocked = true; ServiceList.Children.Add(editor); } - ServiceRow.Height = new GridLength((double)0.0); + int sHeight = 36 * _identity.Services.Count; + if (sHeight > 240) sHeight = 240; + Debug.WriteLine("Height: " + ServiceRow.Height.Value.ToString()); + ServiceRow.Height = new GridLength((double)sHeight); MainDetailScroll.Visibility = Visibility.Visible; ServiceTitle.Content = _identity.Services.Count + " SERVICES"; } else { - int sHeight = 36 * _identity.Services.Count; - if (sHeight > 240) sHeight = 240; - ServiceRow.Height = new GridLength((double)sHeight); + ServiceRow.Height = new GridLength((double)0.0); MainDetailScroll.Visibility = Visibility.Collapsed; ServiceTitle.Content = "NO SERVICES AVAILABLE"; } From 12686b54a0b7db1e9f558ccb0409693a47e3aad9 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Thu, 6 Aug 2020 21:01:25 +0100 Subject: [PATCH 05/11] Service List Height --- DesktopEdge/IdentityDetails.xaml | 2 +- DesktopEdge/IdentityDetails.xaml.cs | 2 +- DesktopEdge/MainWindow.xaml | 2 +- DesktopEdge/MainWindow.xaml.cs | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml index b896ac81..14a8cf97 100644 --- a/DesktopEdge/IdentityDetails.xaml +++ b/DesktopEdge/IdentityDetails.xaml @@ -45,7 +45,7 @@ - + diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs index 9bced7f6..b12083c9 100644 --- a/DesktopEdge/IdentityDetails.xaml.cs +++ b/DesktopEdge/IdentityDetails.xaml.cs @@ -86,7 +86,7 @@ namespace ZitiDesktopEdge { ServiceList.Children.Add(editor); } int sHeight = 36 * _identity.Services.Count; - if (sHeight > 240) sHeight = 240; + if (sHeight > 200) sHeight = 200; Debug.WriteLine("Height: " + ServiceRow.Height.Value.ToString()); ServiceRow.Height = new GridLength((double)sHeight); MainDetailScroll.Visibility = Visibility.Visible; diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml index 6c9a90da..29b88c1d 100644 --- a/DesktopEdge/MainWindow.xaml +++ b/DesktopEdge/MainWindow.xaml @@ -194,7 +194,7 @@ - + diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index 7969df7d..dc49b0f9 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -342,7 +342,6 @@ namespace ZitiDesktopEdge { ZitiIdentity[] ids = identities.ToArray(); double height = 460 + (ids.Length * 60); if (height > _maxHeight) height = _maxHeight; - Debug.WriteLine("Set Height: " + height); this.Height = height; IdentityMenu.SetHeight(this.Height-160); for (int i=0; i Date: Tue, 11 Aug 2020 16:16:00 +0100 Subject: [PATCH 06/11] Folder Name Change Read File If Exists Only Mouse Clicks --- DesktopEdge/MainWindow.xaml.cs | 8 +++----- DesktopEdge/Models/UILog.cs | 6 +++++- DesktopEdge/Views/ItemRenderers/IdentityItem.xaml | 10 +++++----- DesktopEdge/ZitiDesktopEdge.csproj | 5 +++-- ZitiUpdateService/UpdateService.cs | 2 +- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index 41c0b5ce..f6d16aa7 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -430,11 +430,9 @@ namespace ZitiDesktopEdge { _timer.Enabled = true; _timer.Start(); } - private void Connect(object sender, RoutedEventArgs e) - { - this.Dispatcher.Invoke(() => - { - ShowLoad(); + private void Connect(object sender, RoutedEventArgs e) { + ShowLoad(); + this.Dispatcher.Invoke(() => { //Dispatcher.Invoke(new Action(() => { }), System.Windows.Threading.DispatcherPriority.ContextIdle); DoConnect(); HideLoad(); diff --git a/DesktopEdge/Models/UILog.cs b/DesktopEdge/Models/UILog.cs index af73adbb..f7c50d56 100644 --- a/DesktopEdge/Models/UILog.cs +++ b/DesktopEdge/Models/UILog.cs @@ -14,7 +14,11 @@ namespace ZitiDesktopEdge.Models { } public static string GetLogs() { - return File.ReadAllText(_logDirectory); + string logs = ""; + if (File.Exists(_logDirectory)) { + logs = File.ReadAllText(_logDirectory); + } + return logs; } } } diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml index cd72c52a..611562ba 100644 --- a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml +++ b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml @@ -26,19 +26,19 @@ - - + diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj index a075ca6c..973e5da5 100644 --- a/DesktopEdge/ZitiDesktopEdge.csproj +++ b/DesktopEdge/ZitiDesktopEdge.csproj @@ -16,6 +16,7 @@ true false + 1.0.0.0 publish\ true Disk @@ -32,8 +33,8 @@ NetFoundry Ziti true - 0 - 1.0.0.0 + 5 + 1.0.0.%2a false true true diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs index 2d0f2521..2c09a2d2 100644 --- a/ZitiUpdateService/UpdateService.cs +++ b/ZitiUpdateService/UpdateService.cs @@ -52,7 +52,7 @@ namespace ZitiUpdateService { } catch (Exception e) { Log(e.ToString()); } - _rootDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "NetFoundry"); + _rootDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "OpenZiti"); if (!Directory.Exists(_rootDirectory)) Directory.CreateDirectory(_rootDirectory); _logDirectory = Path.Combine(_rootDirectory, "Logs"); if (!Directory.Exists(_logDirectory)) Directory.CreateDirectory(_logDirectory); From 6edcf913ea6b7a1ef853af0303cf0b5edd64c754 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 11 Aug 2020 11:34:53 -0400 Subject: [PATCH 07/11] add hosted services to the mix --- service/build.bat | 10 ++++++---- service/cziti/ctun.go | 1 + service/cziti/sdk.go | 21 +++++++++++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/service/build.bat b/service/build.bat index 25a97902..25182eb0 100644 --- a/service/build.bat +++ b/service/build.bat @@ -24,7 +24,9 @@ echo version info generated goto QUICK :CLEAN -rmdir /s /q deps +echo REMOVING old build folder if it exists at %SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\build +rmdir /s /q %SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\build +echo REMOVING ziti.dll at %SVC_ROOT_DIR%ziti.dll del /q %SVC_ROOT_DIR%ziti.dll :QUICK @@ -32,7 +34,7 @@ echo changing to service folder: %SVC_ROOT_DIR% cd %SVC_ROOT_DIR% SET REPO_URL=https://github.com/openziti/ziti-tunneler-sdk-c.git -SET ZITI_TUNNEL_REPO_BRANCH=master +SET ZITI_TUNNEL_REPO_BRANCH=hosted-services SET TUNNELER_SDK_DIR=%SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\ SET CGO_CFLAGS=-DNOGDI -I %TUNNELER_SDK_DIR%install\include SET CGO_LDFLAGS=-L %TUNNELER_SDK_DIR%install\lib @@ -137,8 +139,8 @@ if %ACTUAL_ERR% NEQ 0 ( echo result of ninja build: %ACTUAL_ERR% ) -cp %TUNNELER_SDK_DIR%install\lib\ziti.dll %SVC_ROOT_DIR% -cp %TUNNELER_SDK_DIR%install\lib\libuv.dll %SVC_ROOT_DIR% +copy /y %TUNNELER_SDK_DIR%install\lib\ziti.dll %SVC_ROOT_DIR% +copy /y TUNNELER_SDK_DIR%install\lib\libuv.dll %SVC_ROOT_DIR% echo COPIED dlls to %SVC_ROOT_DIR% cd %SVC_ROOT_DIR% diff --git a/service/cziti/ctun.go b/service/cziti/ctun.go index 2e1e088f..06fab90f 100644 --- a/service/cziti/ctun.go +++ b/service/cziti/ctun.go @@ -100,6 +100,7 @@ func HookupTun(dev tun.Device, dns []net.IP) (Tunnel, error) { opts.ziti_dial = C.ziti_sdk_dial_cb(C.ziti_sdk_c_dial) opts.ziti_close = C.ziti_sdk_close_cb(C.ziti_sdk_c_close) opts.ziti_write = C.ziti_sdk_write_cb(C.ziti_sdk_c_write) + opts.ziti_host_v1 = C.ziti_sdk_host_v1_cb(C.ziti_sdk_c_host_v1) t.tunCtx = C.ziti_tunneler_init(opts, _impl.libuvCtx.l) diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index c0fcc824..eabbb6db 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -21,6 +21,7 @@ package cziti #cgo windows LDFLAGS: -l libziti.imp -luv -lws2_32 -lpsapi #include +#include "ziti/ziti_tunneler.h" #include "sdk.h" extern void initCB(ziti_context nf, int status, void *ctx); @@ -136,8 +137,8 @@ func (c *CZitiCtx) Controller() string { var tunCfgName = C.CString("ziti-tunneler-client.v1") //export serviceCB -func serviceCB(_ C.ziti_context, service *C.ziti_service, status C.int, data unsafe.Pointer) { - ctx := (*CZitiCtx)(data) +func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, tnlr_ctx unsafe.Pointer) { + ctx := (*CZitiCtx)(tnlr_ctx) if ctx.Services == nil { m := sync.Map{} //make(map[string]Service) @@ -162,6 +163,22 @@ func serviceCB(_ C.ziti_context, service *C.ziti_service, status C.int, data uns log.Warnf("could not find a service with id: %s, name: %s", service.id, service.name) } } else if status == C.ZITI_OK { + + if C.ZITI_CAN_BIND == ( service.perm_flags & C.ZITI_CAN_BIND ) { + var v1Config C.ziti_server_cfg_v1 + // get_config_rc = ziti_service_get_config(service, "ziti-tunneler-server.v1", &v1_config, parse_ziti_server_cfg_v1); + // int ziti_service_get_config(ziti_service *service, const char *cfg_type, void *cfg, int (*parser)(void *, const char *, size_t)) + r := C.ziti_service_get_config(service, C.CString("ziti-tunneler-server.v1"), unsafe.Pointer(&v1Config), (*[0]byte)(C.parse_ziti_server_cfg_v1)) + if (r == 0) { + for _, t := range devMap { + C.ziti_tunneler_host_v1(C.tunneler_context(t.tunCtx), unsafe.Pointer(ctx.zctx), service.name, v1Config.protocol, v1Config.hostname, v1Config.port) + } + C.free_ziti_server_cfg_v1(&v1Config) + } else { + log.Infof("service is bindable but doesn't have config? %s. flags: %v.", name, service.perm_flags) + } + } + cfg := C.ziti_service_get_raw_config(service, tunCfgName) host := "" From 299519dda6049840690747404dcbc947738dbfe1 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 11 Aug 2020 17:07:23 -0400 Subject: [PATCH 08/11] closes issue #94 - add hosted services also handle DNS requests that are both without a . and with. as well as when the connection-specific local domain is on the DNS request --- service/cziti/dns-proxy.go | 21 ++++++++++++++++++++- service/cziti/dns.go | 17 +++++++++-------- service/cziti/windns/windns.go | 28 ++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index ddd6c838..dc6fca05 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -28,6 +28,8 @@ import ( "github.com/openziti/desktop-edge-win/service/cziti/windns" ) +var domains []string // get any connection-specific local domains + func processDNSquery(packet []byte, p *net.UDPAddr, s *net.UDPConn) { q := &dns.Msg{} if err := q.Unpack(packet); err != nil { @@ -46,8 +48,24 @@ func processDNSquery(packet []byte, p *net.UDPAddr, s *net.UDPConn) { var ip net.IP // fmt.Printf("query: Type(%d) name(%s)\n", query.Qtype, query.Name) + dnsName := strings.TrimSpace(query.Name) + ip = DNS.Resolve(dnsName) - ip = DNS.Resolve(query.Name) + // never proxy hostnames that we know about regardless of type + if ip == nil { + // no direct hit. need to now check to see if the dns query used a connection-specific local domain + for _, d := range domains { + if strings.HasSuffix(dnsName, d) { + dnsNameTrimmed := strings.Trim(dnsName, d) + // dns request has domain appended - removing and resolving + ip = DNS.Resolve(dnsNameTrimmed) + if ip != nil { + log.Debugf("DNS %s failed at first but succeeded by looking up %s", dnsName, dnsNameTrimmed) + break + } + } + } + } // never proxy hostnames that we know about regardless of type if ip != nil { @@ -167,6 +185,7 @@ func dnsPanicRecover() { } func runDNSproxy(dnsServers []string) { + domains = windns.GetConnectionSpecificDomains() defer func() { if err := recover(); err != nil { log.Errorf("Recovered in f. %v", err) diff --git a/service/cziti/dns.go b/service/cziti/dns.go index 447172c8..5fa0c674 100644 --- a/service/cziti/dns.go +++ b/service/cziti/dns.go @@ -43,7 +43,7 @@ var DNS = &dnsImpl{} type dnsImpl struct { cidr uint32 - counter uint32 + ipCount uint32 serviceMap map[string]ctxService @@ -67,12 +67,13 @@ type ctxService struct { } func normalizeDnsName(dnsName string) string { - if strings.HasSuffix(dnsName, ".") { - return dnsName - } else { + dnsName = strings.TrimSpace(dnsName) + if !strings.HasSuffix(dnsName, ".") { // append a period to the dnsName - forcing it to be a FQDN - return dnsName + "." + dnsName += "." } + + return strings.ToLower(dnsName) //normalize the casing } // RegisterService will return the next ip address in the configured range. If the ip address is not @@ -115,7 +116,7 @@ func (dns *dnsImpl) RegisterService(svcId string, dnsNameToReg string, port uint } } else { // if not used at all - map it - nextAddr := dns.cidr | atomic.AddUint32(&dns.counter, 1) + nextAddr := dns.cidr | atomic.AddUint32(&dns.ipCount, 1) ip = make(net.IP, 4) binary.BigEndian.PutUint32(ip, nextAddr) @@ -145,7 +146,7 @@ func (dns *dnsImpl) DeregisterService(ctx *CZitiCtx, name string) { for k, sc := range dns.serviceMap { if sc.ctx == ctx && sc.name == name { if sc.count < 1 { - log.Infof("removing %s from DNS mapping", name) + log.Infof("removing service named %s from DNS mapping known as %s", name, k) delete(dns.serviceMap, k) } else { // another service is using the mapping - can't remove it yet so decrement @@ -182,6 +183,6 @@ func DnsInit(ip string, maskBits int) { i := net.ParseIP(ip).To4() mask := net.CIDRMask(maskBits, 32) DNS.cidr = binary.BigEndian.Uint32(i) & binary.BigEndian.Uint32(mask) - DNS.counter = 2 + DNS.ipCount = 2 }) } diff --git a/service/cziti/windns/windns.go b/service/cziti/windns/windns.go index 8072f6f4..c51fd80f 100644 --- a/service/cziti/windns/windns.go +++ b/service/cziti/windns/windns.go @@ -43,6 +43,34 @@ func ResetDNS() { } } +func GetConnectionSpecificDomains() []string { + script := `Get-DnsClient | Select-Object ConnectionSpecificSuffix | Get-Unique | ForEach-Object { $_.ConnectionSpecificSuffix }` + + cmd := exec.Command("powershell", "-Command", script) + cmd.Stderr = os.Stdout + output := new(bytes.Buffer) + cmd.Stdout = output + + err := cmd.Run() + + if err != nil { + panic(err) + } + + var names []string + for { + domain, err := output.ReadString('\n') + if err != nil { + break + } + domain = strings.TrimSpace(domain) + if !strings.HasSuffix(domain, ".") { + names = append(names, domain + ".") + } + } + return names +} + func GetUpstreamDNS() []string { script := `Get-DnsClientServerAddress | ForEach-Object { $_.ServerAddresses } | Sort-Object | Get-Unique` From 7906d316f8e4c2a39dc9ff8d79f7603ee6ab9130 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 11 Aug 2020 17:23:50 -0400 Subject: [PATCH 09/11] remove dummy file, bump version, update release notes --- release-notes.md | 4 ++-- testing.txt | 1 - version | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 testing.txt diff --git a/release-notes.md b/release-notes.md index 92ec7e98..f1327c75 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,4 +1,4 @@ -# Release 0.0.21 +# Release 1.0.4 * What's New @@ -6,7 +6,7 @@ * Bug fixes - * [#xxx](https://github.com/openziti/desktop-edge-win/issues/xxxx) - xxx + * [#102](https://github.com/openziti/desktop-edge-win/pull/102) - DNS requests with "connection-specific local domain" would not resolve # Release 0.0.20 diff --git a/testing.txt b/testing.txt deleted file mode 100644 index 45b983be..00000000 --- a/testing.txt +++ /dev/null @@ -1 +0,0 @@ -hi diff --git a/version b/version index 236c7ad0..ee90284c 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.21 +1.0.4 From 8dee6be82efc7eb7add471fa872ac28e3042d659 Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Wed, 12 Aug 2020 20:57:56 +0100 Subject: [PATCH 10/11] Fix Update Service Issue Pull from the right Service Location Minor UI Tweaks --- DesktopEdge/IdentityDetails.xaml | 8 ++++---- DesktopEdge/MainMenu.xaml.cs | 9 ++++++++- DesktopEdge/MainWindow.xaml | 5 ++--- DesktopEdge/MainWindow.xaml.cs | 9 ++++++++- ZitiUpdateService/App.config | 2 +- ZitiUpdateService/UpdateService.cs | 2 +- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml index 14a8cf97..d179f761 100644 --- a/DesktopEdge/IdentityDetails.xaml +++ b/DesktopEdge/IdentityDetails.xaml @@ -45,20 +45,20 @@ - + - +