gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-23 20:55:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.12.x' of github.com:openziti/desktop-edge-win into release-1.12.x

Browse Source
This commit is contained in:
mary-dcouto
2022-02-17 10:56:25 +05:30
parent 7861544295 c0ee0b9f0e
commit 05c4dcfa0a
11 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -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.1.0")]
[assembly: AssemblyVersion("1.12.1.0")]
[assembly: AssemblyFileVersion("1.12.1.0")]
DesktopEdge/Views/Screens/Debugging.xaml.cs
+1 -1
View File
@@ -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) {
DesktopEdge/Views/Screens/MFAScreen.xaml.cs
+5 -5
View File
@@ -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,14 +256,14 @@ 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 = "";
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;
}
@@ -287,7 +287,7 @@ namespace ZitiDesktopEdge {
AuthCode.Text = "";
this.OnError?.Invoke("Authentication Failed");
} else {
this._identity.RecoveryCodes = codeResponse.Data;
this._identity.RecoveryCodes = codeResponse.Data.RecoveryCodes;
this.OnClose?.Invoke(true);
}
this._executing = false;
DesktopEdge/Views/Screens/MainMenu.xaml.cs
+5 -1
View File
@@ -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();
Installer/ZitiDesktopEdge.aip
+2 -2
View File
@@ -23,10 +23,10 @@
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
<ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
<ROW Property="ProductCode" Value="1033:{3E143A1C-7C2B-466D-90E6-C29D1CCE54A0} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{85BA43AC-2467-439D-9664-129A684D5D79} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.11.2" Type="32"/>
<ROW Property="ProductVersion" Value="1.12.1" Type="32"/>
<ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
<ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>
ZitiDesktopEdge.Client/DataStructures/DataStructures.cs
+22 -10
View File
@@ -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; }
}
@@ -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
@@ -506,9 +513,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
ZitiDesktopEdge.Client/ServiceClient/DataClient.cs
+4 -4
View File
@@ -274,9 +274,9 @@ namespace ZitiDesktopEdge.ServiceClient {
return null;
}
async public Task<MfaRecoveryCodesResponse> ReturnMFACodes(string identifier, string totpOrRecoveryCode) {
async public Task<MfaRecoveryCodesResponse> GetMFACodes(string identifier, string totpOrRecoveryCode) {
try {
await sendAsync(new ReturnMFACodesFunction(identifier, totpOrRecoveryCode));
await sendAsync(new GetMFACodesFunction(identifier, totpOrRecoveryCode));
MfaRecoveryCodesResponse mfa = await readAsync<MfaRecoveryCodesResponse>(ipcReader);
return mfa;
} catch (Exception ioe) {
@@ -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<SvcResponse>(ipcReader);
return; // rtn;
} catch (Exception ioe) {
ZitiUpdateService/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -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.1.0")]
[assembly: AssemblyVersion("1.12.1.0")]
[assembly: AssemblyFileVersion("1.12.1.0")]
release-notes.md
+14
View File
@@ -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 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
version
+1 -1
View File
@@ -1 +1 @@
1.12.0
1.12.1
ziti-edge-tunnel/build.bat
+1 -1
View File
@@ -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