MeshCentral/MeshCentralRouter
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Added alternative RDP ports and email 2FA support.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire
2020-03-21 22:48:46 -07:00
parent c236c7ccb8
commit 6c076f3777
4 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
MainForm.cs
View File

@@ -38,6 +38,7 @@ namespace MeshCentralRouter
public bool ignoreCert = false;
public bool inaddrany = false;
public bool forceExit = false;
public bool sendEmailToken = false;
public class DeviceComparer : IComparer
{
@@ -102,6 +103,9 @@ namespace MeshCentralRouter
panel3.Visible = (newPanel == 3);
panel4.Visible = (newPanel == 4);
currentPanel = newPanel;
// Setup stuff
nextButton2.Enabled = (tokenTextBox.Text.Replace(" ", "") != "");
}
private void MainForm_Load(object sender, EventArgs e)
@@ -315,7 +319,13 @@ namespace MeshCentralRouter
if (this.InvokeRequired) { this.Invoke(new MeshCentralServer.onStateChangedHandler(Meshcentral_onStateChanged), state); return; }
if (state == 0) {
if (meshcentral.disconnectMsg == "tokenrequired") { tokenTextBox.Text = ""; setPanel(2); tokenTextBox.Focus(); } else { setPanel(1); }
if (meshcentral.disconnectMsg == "tokenrequired") {
emailTokenButton.Visible = (meshcentral.disconnectEmail2FA == true) && (meshcentral.disconnectEmail2FASent == false);
tokenEmailSentLabel.Visible = (meshcentral.disconnectEmail2FASent == true);
tokenTextBox.Text = "";
setPanel(2);
tokenTextBox.Focus();
} else { setPanel(1); }
if ((meshcentral.disconnectMsg != null) && meshcentral.disconnectMsg.StartsWith("noauth")) { stateLabel.Text = "Invalid username or password"; stateLabel.Visible = true; stateClearTimer.Enabled = true; serverNameComboBox.Focus(); }
else if (meshcentral.disconnectMsg == "cert") {
lastBadConnectCert = meshcentral.disconnectCert;
@@ -562,6 +572,8 @@ namespace MeshCentralRouter
private void nextButton2_Click(object sender, EventArgs e)
{
if ((tokenTextBox.Text.Replace(" ", "") == "") && (sendEmailToken == false)) return;
// Attempt to login with token
addButton.Enabled = false;
addRelayButton.Enabled = false;
@@ -573,7 +585,15 @@ namespace MeshCentralRouter
meshcentral.onStateChanged += Meshcentral_onStateChanged;
meshcentral.onNodesChanged += Meshcentral_onNodesChanged;
meshcentral.onLoginTokenChanged += Meshcentral_onLoginTokenChanged;
meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, tokenTextBox.Text.Replace(" ", ""));
if (sendEmailToken == true)
{
sendEmailToken = false;
meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, "**email**");
}
else
{
meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, tokenTextBox.Text.Replace(" ", ""));
}
}
private void tokenTextBox_KeyPress(object sender, KeyPressEventArgs e)
@@ -773,6 +793,25 @@ namespace MeshCentralRouter
map.appButton_Click(this, null);
}
private void emailTokenButton_Click(object sender, EventArgs e)
{
if (MessageBox.Show(this, "Send token to registered email address?", "Two-factor Authentication", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
{
sendEmailToken = true;
nextButton2_Click(this, null);
}
}
private void tokenTextBox_KeyUp(object sender, KeyEventArgs e)
{
nextButton2.Enabled = (tokenTextBox.Text.Replace(" ","") != "");
}
private void tokenTextBox_TextChanged(object sender, EventArgs e)
{
nextButton2.Enabled = (tokenTextBox.Text.Replace(" ", "") != "");
}
/*
private delegate void displayMessageHandler(string msg, int buttons, string extra, int progress);
private void displayMessage(string msg, int buttons = 0, string extra = "", int progress = 0)