MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-31 07:23:14 +00:00
Code Issues Releases Wiki Activity

URI exception fix.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire
2020-06-07 11:23:13 -07:00
parent 85b4f017bc
commit d7eeaac3fe
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MainForm.cs
View File

@@ -280,7 +280,6 @@ namespace MeshCentralRouter
private void nextButton1_Click(object sender, EventArgs e)
{
// Attempt to login
addButton.Enabled = false;
addRelayButton.Enabled = false;
@@ -293,12 +292,15 @@ namespace MeshCentralRouter
meshcentral.onLoginTokenChanged += Meshcentral_onLoginTokenChanged;
if (lastBadConnectCert != null) { meshcentral.okCertHash = lastBadConnectCert.GetCertHashString(); }
Uri serverurl = new Uri("wss://" + serverNameComboBox.Text + "/control.ashx");
Uri serverurl = null;
if (authLoginUrl != null) {
try {
meshcentral.okCertHash2 = getValueFromQueryString(authLoginUrl.Query, "t");
serverurl = new Uri("wss://" + authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443) + authLoginUrl.LocalPath + "?auth=" + getValueFromQueryString(authLoginUrl.Query, "c"));
} catch (Exception) { }
meshcentral.connect(serverurl, null, null, null);
} else {
try { serverurl = new Uri("wss://" + serverNameComboBox.Text + "/control.ashx"); } catch (Exception) { }
meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, null);
}
}
@@ -317,12 +319,13 @@ namespace MeshCentralRouter
meshcentral.onLoginTokenChanged += Meshcentral_onLoginTokenChanged;
meshcentral.okCertHash = lastBadConnectCert.GetCertHashString();
Uri serverurl = new Uri("wss://" + serverNameComboBox.Text + "/control.ashx");
Uri serverurl = null;
if (authLoginUrl != null) {
meshcentral.okCertHash2 = getValueFromQueryString(authLoginUrl.Query, "t");
serverurl = new Uri("wss://" + authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443) + authLoginUrl.LocalPath + "?auth=" + getValueFromQueryString(authLoginUrl.Query, "c"));
meshcentral.connect(serverurl, null, null, null);
} else {
serverurl = new Uri("wss://" + serverNameComboBox.Text + "/control.ashx");
meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, null);
}
}
@@ -787,8 +790,16 @@ namespace MeshCentralRouter
addButton.Enabled = false;
addRelayButton.Enabled = false;
openWebSiteButton.Visible = false;
Uri serverurl = new Uri("wss://" + serverNameComboBox.Text + "/control.ashx");
Uri serverurl = null;
if (authLoginUrl != null) {
serverurl = new Uri("wss://" + authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443) + authLoginUrl.LocalPath + "?auth=" + getValueFromQueryString(authLoginUrl.Query, "c"));
} else {
serverurl = new Uri("wss://" + serverNameComboBox.Text + "/control.ashx");
}
meshcentral = new MeshCentralServer();
meshcentral.debug = debug;
meshcentral.ignoreCert = ignoreCert;
if (lastBadConnectCert != null) { meshcentral.okCertHash = lastBadConnectCert.GetCertHashString(); }
meshcentral.onStateChanged += Meshcentral_onStateChanged;
@@ -886,7 +897,12 @@ namespace MeshCentralRouter
private void openWebSiteButton_Click(object sender, EventArgs e)
{
if (meshcentral.loginCookie != null) {
Uri serverurl = new Uri("https://" + serverNameComboBox.Text + "?login=" + meshcentral.loginCookie);
Uri serverurl = null;
if (authLoginUrl != null) {
serverurl = new Uri("https://" + authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443) + authLoginUrl.LocalPath + "?login=" + meshcentral.loginCookie);
} else {
serverurl = new Uri("https://" + serverNameComboBox.Text + "?login=" + meshcentral.loginCookie);
}
System.Diagnostics.Process.Start(serverurl.ToString());
}
}

3
MeshCentralServer.cs
View File

@@ -243,6 +243,8 @@ namespace MeshCentralRouter
if (jsonAction.ContainsKey("ugroups"))
{
Dictionary<string, object> usergroups = (Dictionary<string, object>)jsonAction["ugroups"];
if (usergroups != null)
{
foreach (string i in usergroups.Keys)
{
Dictionary<string, object> usergroupsEx = (Dictionary<string, object>)usergroups[i];
@@ -253,6 +255,7 @@ namespace MeshCentralRouter
}
if ((onNodesChanged != null) && (nodes != null)) onNodesChanged();
}
}
break;
}
case "event":