* Command for destroying certificates added.

* Renamed command methods, nothing 'admin' about them.
ArachisH · May 11, 2020 · 12c8740 · 12c8740
1 parent 651ede2
commit 12c8740
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/Tanji/Pages/Connection/ConnectionPage.cs b/Tanji/Pages/Connection/ConnectionPage.cs
@@ -188,7 +188,7 @@ private void CoTUpdateVariableBtn_Click(object sender, EventArgs e)
 
         private void CoTDestroyCertificatesBtn_Click(object sender, EventArgs e)
         {
-            Eavesdropper.Certifier.DestroyCertificates();
+            TryDestroyCertificateAuthority();
         }
         private void CoTExportCertificateAuthorityBtn_Click(object sender, EventArgs e)
         {
@@ -461,6 +461,17 @@ private async Task InterceptConnectionAsync()
             await Task.Delay(1000).ContinueWith(t => GC.Collect()).ConfigureAwait(false);
         }
 
+        private void RunTanjiAsAdmin(string argument)
+        {
+            using (var proc = new Process())
+            {
+                proc.StartInfo.FileName = Path.GetFullPath("Tanji.exe");
+                proc.StartInfo.UseShellExecute = true;
+                proc.StartInfo.Verb = "runas";
+                proc.StartInfo.Arguments = argument;
+                proc.Start();
+            }
+        }
         private bool HasPingInstructions()
         {
             ABCFile abc = UI.Game.ABCFiles.Last();
@@ -490,20 +501,22 @@ private bool TryInstallCertificateAuthority()
         {
             if (!Eavesdropper.Certifier.CreateTrustedRootCertificate())
             {
-                using (var proc = new Process())
-                {
-                    proc.StartInfo.FileName = Path.GetFullPath("Tanji.exe");
-                    proc.StartInfo.UseShellExecute = true;
-                    proc.StartInfo.Verb = "runas";
-                    proc.StartInfo.Arguments = "aca";
-                    proc.Start();
-                }
-
+                RunTanjiAsAdmin("ica");
                 // Will return true if the external process succeeded in installing certifcate with admin privileges.
                 return Eavesdropper.Certifier.CreateTrustedRootCertificate();
             }
             return true;
         }
+        private bool TryDestroyCertificateAuthority()
+        {
+            if (!Eavesdropper.Certifier.DestroyCertificates())
+            {
+                RunTanjiAsAdmin("dcs");
+                // Will return true if the external process succeeded in destroying the certifcates with admin privileges.
+                return Eavesdropper.Certifier.DestroyCertificates();
+            }
+            return true;
+        }
         private WebRequest TrimQuery(HttpWebRequest request)
         {
             if (string.IsNullOrWhiteSpace(request.RequestUri.Query)) return request;

diff --git a/Tanji/Program.cs b/Tanji/Program.cs
@@ -29,7 +29,8 @@ private static void Main(string[] args)
                 switch (args[0].Substring(args[0].Length - 3))
                 {
                     case "swf": PatchClient(new FileInfo(Path.GetFullPath(args[0]))); break;
-                    case "aca": AdminCAInstall(); break;
+                    case "ica": InstallCertificateAuthority(); break;
+                    case "dcs": DestroyCertificates(); break;
                 }
                 return;
             }
@@ -45,10 +46,16 @@ private static void Main(string[] args)
             Application.Run(new MainFrm());
         }
 
-        private static void AdminCAInstall()
+        private static void DestroyCertificates()
         {
             var tanjiCertificateManager = new CertificateManager("Tanji", "Tanji Certificate Authority");
-            bool installedRootCA= tanjiCertificateManager.CreateTrustedRootCertificate();
+            bool destroyedCertificates = tanjiCertificateManager.DestroyCertificates();
+            Console.WriteLine("Tanji Generated Certificates Destroyed: " + destroyedCertificates);
+        }
+        private static void InstallCertificateAuthority()
+        {
+            var tanjiCertificateManager = new CertificateManager("Tanji", "Tanji Certificate Authority");
+            bool installedRootCA = tanjiCertificateManager.CreateTrustedRootCertificate();
             Console.WriteLine("Tanji Certificate Authority Installed: " + installedRootCA);
         }
         private static void PatchClient(FileInfo clientInfo)