From a7d8d58f2b4afc0a504fe8f8352651a190e796a6 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 18 Sep 2017 00:21:34 -0400 Subject: [PATCH] It's always fucking tabs --- TGCommandLine/Program.cs | 44 ++++++------ TGControlPanel/Program.cs | 126 +++++++++++++++++------------------ TGServiceInterface/Server.cs | 62 ++++++++--------- 3 files changed, 116 insertions(+), 116 deletions(-) diff --git a/TGCommandLine/Program.cs b/TGCommandLine/Program.cs index df5fbee814..9e00cf3df7 100644 --- a/TGCommandLine/Program.cs +++ b/TGCommandLine/Program.cs @@ -56,9 +56,9 @@ namespace TGCommandLine } if (badConnectionString) - { - Console.WriteLine("Remote connection usage: <-c/--connect> username:password@address:port"); - return ExitCode.BadCommand; + { + Console.WriteLine("Remote connection usage: <-c/--connect> username:password@address:port"); + return ExitCode.BadCommand; } var res = Server.VerifyConnection(); @@ -113,30 +113,30 @@ namespace TGCommandLine return result; } - static bool BadCertificateInteractive(string message) - { - Console.WriteLine(message); - Console.Write("Do you wish to continue? NOT RECCOMENDED! (y/N): "); - var result = Console.ReadLine().Trim().ToLower(); - return result == "y" || result == "yes"; - } + static bool BadCertificateInteractive(string message) + { + Console.WriteLine(message); + Console.Write("Do you wish to continue? NOT RECCOMENDED! (y/N): "); + var result = Console.ReadLine().Trim().ToLower(); + return result == "y" || result == "yes"; + } static int Main(string[] args) { Command.OutputProcVar.Value = Console.WriteLine; - if (args.Length != 0) - { - Server.SetBadCertificateHandler((message) => { - foreach (var I in args) - if (I.ToLower() == "--disable-ssl-verification") //im just not even going to document this because i hate it so much - return true; - return false; - }); - //allow self signed certs in debug mode - return (int)RunCommandLine(new List(args)); - } + if (args.Length != 0) + { + Server.SetBadCertificateHandler((message) => { + foreach (var I in args) + if (I.ToLower() == "--disable-ssl-verification") //im just not even going to document this because i hate it so much + return true; + return false; + }); + //allow self signed certs in debug mode + return (int)RunCommandLine(new List(args)); + } - Server.SetBadCertificateHandler(BadCertificateInteractive); + Server.SetBadCertificateHandler(BadCertificateInteractive); Console.WriteLine("Type 'remote' to connect to a remote service"); //interactive mode diff --git a/TGControlPanel/Program.cs b/TGControlPanel/Program.cs index 43ff631518..280b4f0d54 100644 --- a/TGControlPanel/Program.cs +++ b/TGControlPanel/Program.cs @@ -5,70 +5,70 @@ using TGServiceInterface; namespace TGControlPanel { - static class Program - { - [STAThread] - static void Main(string[] args) - { - Server.SetBadCertificateHandler(BadCertificateHandler); - try - { - if (Properties.Settings.Default.UpgradeRequired) - { - Properties.Settings.Default.Upgrade(); - Properties.Settings.Default.UpgradeRequired = false; - Properties.Settings.Default.Save(); - } - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Login()); - } - catch (Exception e) - { - ServiceDisconnectException(e); - } - finally - { - Properties.Settings.Default.Save(); - } - } - static bool SSLErrorPromptResult = false; - static bool BadCertificateHandler(string message) - { - if (!SSLErrorPromptResult) - { - var result = MessageBox.Show(message + " IT IS HIGHLY RECCOMENDED YOU DO NOT PROCEED! Continue?", "SSL Error", MessageBoxButtons.YesNo) == DialogResult.Yes; - SSLErrorPromptResult = result; - return result; - } - return true; - } + static class Program + { + [STAThread] + static void Main(string[] args) + { + Server.SetBadCertificateHandler(BadCertificateHandler); + try + { + if (Properties.Settings.Default.UpgradeRequired) + { + Properties.Settings.Default.Upgrade(); + Properties.Settings.Default.UpgradeRequired = false; + Properties.Settings.Default.Save(); + } + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Login()); + } + catch (Exception e) + { + ServiceDisconnectException(e); + } + finally + { + Properties.Settings.Default.Save(); + } + } + static bool SSLErrorPromptResult = false; + static bool BadCertificateHandler(string message) + { + if (!SSLErrorPromptResult) + { + var result = MessageBox.Show(message + " IT IS HIGHLY RECCOMENDED YOU DO NOT PROCEED! Continue?", "SSL Error", MessageBoxButtons.YesNo) == DialogResult.Yes; + SSLErrorPromptResult = result; + return result; + } + return true; + } - public static void ServiceDisconnectException(Exception e) - { - MessageBox.Show("An unhandled exception occurred. This usually means we lost connection to the service. Error" + e.ToString()); - } + public static void ServiceDisconnectException(Exception e) + { + MessageBox.Show("An unhandled exception occurred. This usually means we lost connection to the service. Error" + e.ToString()); + } - public static string TextPrompt(string caption, string text) - { - Form prompt = new Form() - { - Width = 500, - Height = 150, - FormBorderStyle = FormBorderStyle.FixedDialog, - Text = caption, - StartPosition = FormStartPosition.CenterScreen - }; - Label textLabel = new Label() { Left = 50, Top = 20, Text = text, AutoSize = true }; - TextBox textBox = new TextBox() { Left = 50, Top = 50, Width = 400 }; - Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK }; - confirmation.Click += (sender, e) => { prompt.Close(); }; - prompt.Controls.Add(textBox); - prompt.Controls.Add(confirmation); - prompt.Controls.Add(textLabel); - prompt.AcceptButton = confirmation; + public static string TextPrompt(string caption, string text) + { + Form prompt = new Form() + { + Width = 500, + Height = 150, + FormBorderStyle = FormBorderStyle.FixedDialog, + Text = caption, + StartPosition = FormStartPosition.CenterScreen + }; + Label textLabel = new Label() { Left = 50, Top = 20, Text = text, AutoSize = true }; + TextBox textBox = new TextBox() { Left = 50, Top = 50, Width = 400 }; + Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK }; + confirmation.Click += (sender, e) => { prompt.Close(); }; + prompt.Controls.Add(textBox); + prompt.Controls.Add(confirmation); + prompt.Controls.Add(textLabel); + prompt.AcceptButton = confirmation; - return prompt.ShowDialog() == DialogResult.OK ? textBox.Text : null; - } - } + return prompt.ShowDialog() == DialogResult.OK ? textBox.Text : null; + } + } } diff --git a/TGServiceInterface/Server.cs b/TGServiceInterface/Server.cs index 866bde3d54..5b8b73ed8e 100644 --- a/TGServiceInterface/Server.cs +++ b/TGServiceInterface/Server.cs @@ -39,32 +39,32 @@ namespace TGServiceInterface static string HTTPSPassword; - public static void SetBadCertificateHandler(Func handler) - { - ServicePointManager.ServerCertificateValidationCallback = (sender, cert, chain, error) => - { - string ErrorMessage; - switch (error) - { - case SslPolicyErrors.None: - return true; - case SslPolicyErrors.RemoteCertificateChainErrors: - ErrorMessage = "There are certificate chain errors."; - break; - case SslPolicyErrors.RemoteCertificateNameMismatch: - ErrorMessage = "The certificate name does not match."; - break; - case SslPolicyErrors.RemoteCertificateNotAvailable: - ErrorMessage = "The certificate doesn't exist in the trust store."; - break; - default: - ErrorMessage = "An unknown error occurred."; - break; - } - ErrorMessage = String.Format("The certificate failed to verify for {0}:{1}. {2} {3}", HTTPSURL, HTTPSPort, ErrorMessage, cert.ToString()); - return handler(ErrorMessage); - }; - } + public static void SetBadCertificateHandler(Func handler) + { + ServicePointManager.ServerCertificateValidationCallback = (sender, cert, chain, error) => + { + string ErrorMessage; + switch (error) + { + case SslPolicyErrors.None: + return true; + case SslPolicyErrors.RemoteCertificateChainErrors: + ErrorMessage = "There are certificate chain errors."; + break; + case SslPolicyErrors.RemoteCertificateNameMismatch: + ErrorMessage = "The certificate name does not match."; + break; + case SslPolicyErrors.RemoteCertificateNotAvailable: + ErrorMessage = "The certificate doesn't exist in the trust store."; + break; + default: + ErrorMessage = "An unknown error occurred."; + break; + } + ErrorMessage = String.Format("The certificate failed to verify for {0}:{1}. {2} {3}", HTTPSURL, HTTPSPort, ErrorMessage, cert.ToString()); + return handler(ErrorMessage); + }; + } /// /// Set the interface to look for services on the current computer @@ -72,8 +72,8 @@ namespace TGServiceInterface public static void MakeLocalConnection() { HTTPSURL = null; - HTTPSPassword = null; - } + HTTPSPassword = null; + } /// /// Set the interface to look for services on a remote computer @@ -86,7 +86,7 @@ namespace TGServiceInterface HTTPSPort = port; HTTPSUsername = username; HTTPSPassword = password; - } + } /// /// Returns the requested server component interface. This does not guarantee a successful connection @@ -121,8 +121,8 @@ namespace TGServiceInterface { outChannel.Credentials.UserName.UserName = HTTPSUsername; outChannel.Credentials.UserName.Password = HTTPSPassword; - } - return outChannel.CreateChannel(); + } + return outChannel.CreateChannel(); } ///