From 6da96ec6eacb011d86b85b9e4050e1909f20f3aa Mon Sep 17 00:00:00 2001 From: mary-dcouto Date: Mon, 14 Feb 2022 11:52:52 +0530 Subject: [PATCH 1/7] fix for the data format issue in the generate mfa command --- DesktopEdge/Views/Screens/MFAScreen.xaml.cs | 4 ++-- ZitiDesktopEdge.Client/DataStructures/DataStructures.cs | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/DesktopEdge/Views/Screens/MFAScreen.xaml.cs b/DesktopEdge/Views/Screens/MFAScreen.xaml.cs index e3eb89d9..d758995e 100644 --- a/DesktopEdge/Views/Screens/MFAScreen.xaml.cs +++ b/DesktopEdge/Views/Screens/MFAScreen.xaml.cs @@ -258,7 +258,7 @@ namespace ZitiDesktopEdge { this.OnError?.Invoke("Authentication Failed"); this._executing = false; } else { - this._identity.RecoveryCodes = codeResponse.Data; + this._identity.RecoveryCodes = codeResponse.Data.RecoveryCodes; this.OnClose?.Invoke(true); this._executing = false; } @@ -283,7 +283,7 @@ namespace ZitiDesktopEdge { this.OnError?.Invoke("Authentication Failed"); this._executing = false; } else { - this._identity.RecoveryCodes = codeResponse.Data; + this._identity.RecoveryCodes = codeResponse.Data.RecoveryCodes; this.OnClose?.Invoke(true); this._executing = false; } diff --git a/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs b/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs index fc1c7d6c..9c7cf927 100644 --- a/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs +++ b/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs @@ -506,9 +506,14 @@ namespace ZitiDesktopEdge.DataStructures { public string Identifier { get; set; } } + public class MfaRecoveryCodes { + public string[] RecoveryCodes { get; set; } + public string Identifier { get; set; } + + } public class MfaRecoveryCodesResponse : SvcResponse { - public string[] Data { get; set; } + public MfaRecoveryCodes Data { get; set; } } public class ConfigPayload From 929522395563fed42d0a381da923e671c03b7ef5 Mon Sep 17 00:00:00 2001 From: mary-dcouto Date: Mon, 14 Feb 2022 12:30:13 +0530 Subject: [PATCH 2/7] updating the Get MFA codes command --- DesktopEdge/Views/Screens/Debugging.xaml.cs | 2 +- DesktopEdge/Views/Screens/MFAScreen.xaml.cs | 6 +++--- .../DataStructures/DataStructures.cs | 12 ++++++------ ZitiDesktopEdge.Client/ServiceClient/DataClient.cs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DesktopEdge/Views/Screens/Debugging.xaml.cs b/DesktopEdge/Views/Screens/Debugging.xaml.cs index ea1c4c6a..0e43a8b7 100644 --- a/DesktopEdge/Views/Screens/Debugging.xaml.cs +++ b/DesktopEdge/Views/Screens/Debugging.xaml.cs @@ -70,7 +70,7 @@ namespace Ziti.Desktop.Edge.Views.Screens { } async private void btn5_Click(object sender, RoutedEventArgs e) { - await client.ReturnMFACodes(FingerPrint.Text, TheMFACode.Text); + await client.GetMFACodes(FingerPrint.Text, TheMFACode.Text); } async private void btn6_Click(object sender, RoutedEventArgs e) { diff --git a/DesktopEdge/Views/Screens/MFAScreen.xaml.cs b/DesktopEdge/Views/Screens/MFAScreen.xaml.cs index a0f0b462..ec3a029b 100644 --- a/DesktopEdge/Views/Screens/MFAScreen.xaml.cs +++ b/DesktopEdge/Views/Screens/MFAScreen.xaml.cs @@ -178,11 +178,11 @@ namespace ZitiDesktopEdge { } } - async private void ReturnMFACodes(object sender, MouseButtonEventArgs e) { + async private void GetMFACodes(object sender, MouseButtonEventArgs e) { DataClient serviceClient = serviceClient = (DataClient)Application.Current.Properties["ServiceClient"]; string code = AuthCode.Text; Logger.Debug("AuthMFA successful."); - MfaRecoveryCodesResponse getcodes = await serviceClient.ReturnMFACodes(this._identity.Identifier, code); + MfaRecoveryCodesResponse getcodes = await serviceClient.GetMFACodes(this._identity.Identifier, code); if (getcodes.Code != 0) { Logger.Error("AuthMFA failed. " + getcodes.Error); } @@ -256,7 +256,7 @@ namespace ZitiDesktopEdge { } this.OnLoad?.Invoke(true, "", ""); } else if (this.Type == 2) { - MfaRecoveryCodesResponse codeResponse = await serviceClient.ReturnMFACodes(this._identity.Identifier, code); + MfaRecoveryCodesResponse codeResponse = await serviceClient.GetMFACodes(this._identity.Identifier, code); if (codeResponse?.Code != 0) { Logger.Error("AuthMFA failed. " + codeResponse.Error); AuthCode.Text = ""; diff --git a/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs b/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs index 9c7cf927..b7fd15a0 100644 --- a/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs +++ b/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs @@ -159,17 +159,17 @@ namespace ZitiDesktopEdge.DataStructures { public string Code { get; set; } } - public class ReturnMFACodesFunction : ServiceFunction { - public ReturnMFACodesFunction(string identifier, string code) { - this.Command = "ReturnMFACodes"; - this.Data = new ReturnMFACodesFunctionPayload() { + public class GetMFACodesFunction : ServiceFunction { + public GetMFACodesFunction(string identifier, string code) { + this.Command = "GetMFACodes"; + this.Data = new GetMFACodesFunctionPayload() { Identifier = identifier, Code = code, }; } - public ReturnMFACodesFunctionPayload Data { get; set; } + public GetMFACodesFunctionPayload Data { get; set; } } - public class ReturnMFACodesFunctionPayload { + public class GetMFACodesFunctionPayload { public string Identifier { get; set; } public string Code { get; set; } } diff --git a/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs b/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs index 77ec0d5a..9e279b6f 100644 --- a/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs +++ b/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs @@ -274,9 +274,9 @@ namespace ZitiDesktopEdge.ServiceClient { return null; } - async public Task ReturnMFACodes(string identifier, string totpOrRecoveryCode) { + async public Task GetMFACodes(string identifier, string totpOrRecoveryCode) { try { - await sendAsync(new ReturnMFACodesFunction(identifier, totpOrRecoveryCode)); + await sendAsync(new GetMFACodesFunction(identifier, totpOrRecoveryCode)); MfaRecoveryCodesResponse mfa = await readAsync(ipcReader); return mfa; } catch (Exception ioe) { From 0afa1088b677507b2939b9ad66854ed2550640a7 Mon Sep 17 00:00:00 2001 From: mary-dcouto Date: Wed, 16 Feb 2022 12:05:32 +0530 Subject: [PATCH 3/7] generate zitidump files in the service logs path while collecting feedback info --- DesktopEdge/Views/Screens/MainMenu.xaml.cs | 6 +++++- .../DataStructures/DataStructures.cs | 13 ++++++++++--- ZitiDesktopEdge.Client/ServiceClient/DataClient.cs | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/DesktopEdge/Views/Screens/MainMenu.xaml.cs b/DesktopEdge/Views/Screens/MainMenu.xaml.cs index 87fb3381..8a0b32f9 100644 --- a/DesktopEdge/Views/Screens/MainMenu.xaml.cs +++ b/DesktopEdge/Views/Screens/MainMenu.xaml.cs @@ -314,7 +314,11 @@ namespace ZitiDesktopEdge { string timestamp = DateTime.Now.ToFileTime().ToString(); var dataClient = (DataClient)Application.Current.Properties["ServiceClient"]; - await dataClient.zitiDump(); + + string exeLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + string logLocation = Path.Combine(exeLocation, "logs"); + string serviceLogsLocation = Path.Combine(logLocation, "service"); + await dataClient.zitiDump(serviceLogsLocation); var monitorClient = (MonitorClient)Application.Current.Properties["MonitorClient"]; MonitorServiceStatusEvent resp = await monitorClient.CaptureLogsAsync(); diff --git a/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs b/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs index fc1c7d6c..6fa1e0d4 100644 --- a/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs +++ b/ZitiDesktopEdge.Client/DataStructures/DataStructures.cs @@ -199,12 +199,19 @@ namespace ZitiDesktopEdge.DataStructures { public SetLogLevelPayload Data { get; set; } } + public class ZitiDumpPayloadFunction { + public string DumpPath { get; set; } + + } + public class ZitiDumpFunction : ServiceFunction { - public ZitiDumpFunction(string level) { + public ZitiDumpFunction(string dumpPath) { this.Command = "ZitiDump"; - //this.Payload = null;//nothing for now + this.Data = new ZitiDumpPayloadFunction() { + DumpPath = dumpPath + }; } - //public SetLogLevelPayload Payload { get; set; } + public ZitiDumpPayloadFunction Data { get; set; } } public class IdentifierPayload diff --git a/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs b/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs index 77ec0d5a..e2694d0b 100644 --- a/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs +++ b/ZitiDesktopEdge.Client/ServiceClient/DataClient.cs @@ -404,9 +404,9 @@ namespace ZitiDesktopEdge.ServiceClient { } } - async public Task zitiDump() { + async public Task zitiDump(string dumpPath) { try { - await sendAsync(new ServiceFunction() { Command = "ZitiDump" }); + await sendAsync(new ZitiDumpFunction(dumpPath)); var rtn = await readAsync(ipcReader); return; // rtn; } catch (Exception ioe) { From 62573c1a49469d738fa94bb2498b48e053d129ab Mon Sep 17 00:00:00 2001 From: mary-dcouto Date: Wed, 16 Feb 2022 13:11:55 +0530 Subject: [PATCH 4/7] updating release notes and version --- release-notes.md | 14 ++++++++++++++ version | 2 +- ziti-edge-tunnel/build.bat | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/release-notes.md b/release-notes.md index 63753540..b8a804c6 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,17 @@ +# Release 1.12.1 + +## What's New +* The ziti tunnel service is changed to ziti-edge-tunnel service. This service uses the 0.17.x t-sdk version, so the new capabilities like srv support that are added to the tunnel sdk will be available in ziti-edge-tunnel service. + +## Other changes: +* none + +## Bugs fixed: +* none + +## Dependency Updates +* TSDK updated to 0.17.23 / CSDK 0.26.25 + # Release 1.11.2 ## What's New diff --git a/version b/version index 0eed1a29..f8f4f03b 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.12.0 +1.12.1 diff --git a/ziti-edge-tunnel/build.bat b/ziti-edge-tunnel/build.bat index c65fc789..edb3069a 100644 --- a/ziti-edge-tunnel/build.bat +++ b/ziti-edge-tunnel/build.bat @@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and REM limitations under the License. REM SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git -SET ZITI_TUNNEL_REPO_BRANCH=memory_check +SET ZITI_TUNNEL_REPO_BRANCH=desktop-edge-win REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk SET ZITI_SDK_C_BRANCH= SET ZITI_TUNNEL_REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c/releases/latest/download/ziti-edge-tunnel-Windows_x86_64.zip From c1a77efbe9a549e544dce7efe9e4159cac07cfc8 Mon Sep 17 00:00:00 2001 From: mary-dcouto Date: Wed, 16 Feb 2022 20:06:41 +0530 Subject: [PATCH 5/7] fixing the release notes --- release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index b8a804c6..e4a79dbb 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,7 +1,7 @@ # Release 1.12.1 ## What's New -* The ziti tunnel service is changed to ziti-edge-tunnel service. This service uses the 0.17.x t-sdk version, so the new capabilities like srv support that are added to the tunnel sdk will be available in ziti-edge-tunnel service. +* The ziti tunnel service is changed to ziti-edge-tunnel service. This service uses the 0.17.x t-sdk version, so the new capabilities that are added to the tunnel sdk will be available in ziti-edge-tunnel service. ## Other changes: * none From 62b23f5e36f70f8864c93c467e52605f55c2cf4b Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 16 Feb 2022 14:50:55 +0000 Subject: [PATCH 6/7] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index b4085841..b686d598 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.11.2.0")] -[assembly: AssemblyVersion("1.11.2.0")] -[assembly: AssemblyFileVersion("1.11.2.0")] +// [assembly: AssemblyVersion("1.12.0.0")] +[assembly: AssemblyVersion("1.12.0.0")] +[assembly: AssemblyFileVersion("1.12.0.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 85f6fdac..8e07277c 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -23,10 +23,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index 8aaf1126..9d3fb2e9 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.11.2.0")] -[assembly: AssemblyVersion("1.11.2.0")] -[assembly: AssemblyFileVersion("1.11.2.0")] +// [assembly: AssemblyVersion("1.12.0.0")] +[assembly: AssemblyVersion("1.12.0.0")] +[assembly: AssemblyFileVersion("1.12.0.0")] From c0ee0b9f0e3c4c5cd0a18e12723f96cbf96c2d90 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Thu, 17 Feb 2022 05:17:23 +0000 Subject: [PATCH 7/7] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index b686d598..8cc7c430 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.12.0.0")] -[assembly: AssemblyVersion("1.12.0.0")] -[assembly: AssemblyFileVersion("1.12.0.0")] +// [assembly: AssemblyVersion("1.12.1.0")] +[assembly: AssemblyVersion("1.12.1.0")] +[assembly: AssemblyFileVersion("1.12.1.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 8e07277c..7d0772c6 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -23,10 +23,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index 9d3fb2e9..f944c917 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.12.0.0")] -[assembly: AssemblyVersion("1.12.0.0")] -[assembly: AssemblyFileVersion("1.12.0.0")] +// [assembly: AssemblyVersion("1.12.1.0")] +[assembly: AssemblyVersion("1.12.1.0")] +[assembly: AssemblyFileVersion("1.12.1.0")]