From acc9093faa4374e167cfe2db57d067053e591b94 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:18:29 -0500 Subject: [PATCH 1/2] update build-test-release for easier copy/paste. update deps. update readme --- Installer/build.ps1 | 2 +- build-test-release.ps1 | 11 ++++++++--- release-notes.md | 16 ++++++++++++++++ release-streams/beta.json | 10 +++++----- version | 2 +- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 0a3cd3890..7c9b5b712 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -28,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe" $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com" $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" -$ZITI_EDGE_TUNNEL_VERSION="v1.3.5" +$ZITI_EDGE_TUNNEL_VERSION="v1.3.7" echo "Cleaning previous build folder if it exists" Remove-Item "${buildPath}" -r -ErrorAction Ignore diff --git a/build-test-release.ps1 b/build-test-release.ps1 index 150fe63dc..3f0945f77 100644 --- a/build-test-release.ps1 +++ b/build-test-release.ps1 @@ -85,9 +85,14 @@ if($revertGitAfter) { Write-Host "" Write-Host "Dependencies from ziti-edge-tunnel:" -Write-Host "---------------------------------------------" -& '.\Installer\build\service\ziti-edge-tunnel.exe' version -v -Write-Host "" +Write-Host "---------------------------------------------" +& '.\Installer\build\service\ziti-edge-tunnel.exe' version -v | ForEach-Object { + if ($_ -notmatch "StartServiceCtrlDispatcher failed") { + "* $_" + } +} +Write-Host "" + Write-Host "Start a python server in this location with:" Write-Host "" diff --git a/release-notes.md b/release-notes.md index 7fd3926d5..0aa7869f6 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,19 @@ +# Release 2.5.2.5 +## What's New +* nothing - bugfix + +## Other changes +* dependency update + +## Bugs fixed: +* none + +## Dependencies + +* ziti-tunneler: v1.3.7 +* ziti-sdk: 1.3.5 +* tlsuv: v0.33.2[OpenSSL 3.3.1 4 Jun 2024] + # Release 2.5.2.4 ## What's New * nothing - bugfix diff --git a/release-streams/beta.json b/release-streams/beta.json index 477490045..1fa0a9fa0 100644 --- a/release-streams/beta.json +++ b/release-streams/beta.json @@ -1,12 +1,12 @@ { - "name": "2.5.2.4", - "tag_name": "2.5.2.4", - "published_at": "2025-01-08T04:13:51Z", + "name": "2.5.2.5", + "tag_name": "2.5.2.5", + "published_at": "2025-01-10T08:16:11Z", "installation_critical": false, "assets": [ { - "name": "Ziti.Desktop.Edge.Client-2.5.2.4.exe", - "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.4/Ziti.Desktop.Edge.Client-2.5.2.4.exe" + "name": "Ziti.Desktop.Edge.Client-2.5.2.5.exe", + "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.5/Ziti.Desktop.Edge.Client-2.5.2.5.exe" } ] } diff --git a/version b/version index a6a6704cf..f6d778a4f 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.2.4 +2.5.2.5 From 8c4f47fafff2a8d2fe7bacb41ece05e07f717d62 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:48:01 -0500 Subject: [PATCH 2/2] don't show button if no provider is selected. fix main screen click when only one provider exists --- DesktopEdge/Views/Controls/StyledButton.xaml | 6 +++--- DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs | 2 ++ DesktopEdge/Views/Screens/IdentityDetails.xaml | 3 ++- DesktopEdge/Views/Screens/IdentityDetails.xaml.cs | 8 ++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/DesktopEdge/Views/Controls/StyledButton.xaml b/DesktopEdge/Views/Controls/StyledButton.xaml index 8f7353bc0..9ea450fce 100644 --- a/DesktopEdge/Views/Controls/StyledButton.xaml +++ b/DesktopEdge/Views/Controls/StyledButton.xaml @@ -28,7 +28,7 @@ - diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs index efa114525..b5b648f9a 100644 --- a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs +++ b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs @@ -462,6 +462,8 @@ private void ShowExtAuthList(object sender, System.Windows.Input.MouseEventArgs menuItem.Template = controlTemplate; contextMenu.Items.Add(menuItem); } + } else if (_identity?.ExtAuthProviders?.Count == 1) { + this.CompleteExternalAuth.Invoke(this.Identity, _identity?.ExtAuthProviders[0]); } fe.ContextMenu.PlacementTarget = fe; fe.ContextMenu.IsOpen = true; diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml b/DesktopEdge/Views/Screens/IdentityDetails.xaml index ff6c0a24f..c0394b0a2 100644 --- a/DesktopEdge/Views/Screens/IdentityDetails.xaml +++ b/DesktopEdge/Views/Screens/IdentityDetails.xaml @@ -252,8 +252,9 @@ IsTabStop="True" ButtonMargin="10,0,10,0" Margin="20,0,20,0" - MouseUp="ExtAuthProvider" + MouseUp="AuthenticateWithExtAuthProvider" VerticalAlignment="Center" + Visibility="Collapsed" /> diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs b/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs index 0932fe70c..565363493 100644 --- a/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs +++ b/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs @@ -238,7 +238,6 @@ public void UpdateView() { if (Identity.NeedsExtAuth) { ExternalProviderPanel.Visibility = Visibility.Visible; - AuthenticateWithProvider.Visibility = Visibility.Visible; ExternalProviderLabel.Visibility = Visibility.Visible; } else if (Identity.IsMFANeeded) { TOTPPanel.Visibility = Visibility.Visible; @@ -488,7 +487,7 @@ private void ExtAuthTOTP(object sender, MouseButtonEventArgs e) { } } - private void ExtAuthProvider(object sender, MouseButtonEventArgs e) { + private void AuthenticateWithExtAuthProvider(object sender, MouseButtonEventArgs e) { if (_identity.NeedsExtAuth) { if(ProviderList.SelectedItem == null) { Logger.Warn("no provider selected"); @@ -621,6 +620,11 @@ private void DoMFA(object sender, MouseButtonEventArgs e) { private bool userInitiatedChange = false; private void ProviderList_SelectionChanged(object sender, SelectionChangedEventArgs e) { + if (ProviderList.SelectedItem != null) { + AuthenticateWithProvider.Visibility = Visibility.Visible; + } else { + AuthenticateWithProvider.Visibility = Visibility.Collapsed; + } IsDefaultProvider.IsChecked = Identity.IsDefaultProvider(ProviderList.SelectedItem?.ToString()); userInitiatedChange = false; }