Replace RSAPatcher with a Harmony patch, reduces launch time

FailedShack · Jun 17, 2019 · d27817c · d27817c
1 parent b926dd4
commit d27817c
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 132 deletions.
diff --git a/USBHelperInjector/Contracts/IInjectorService.cs b/USBHelperInjector/Contracts/IInjectorService.cs
@@ -14,6 +14,9 @@ public interface IInjectorService
         [OperationContract]
         void SetDonationKey(string donationKey);
 
+        [OperationContract]
+        void SetPublicKey(string publicKey);
+
         [OperationContract]
         void SetDownloaderMaxRetries(int maxRetries);
 

diff --git a/USBHelperInjector/InjectorService.cs b/USBHelperInjector/InjectorService.cs
@@ -72,6 +72,11 @@ public void SetDonationKey(string donationKey)
             Overrides.DonationKey = donationKey;
         }
 
+        public void SetPublicKey(string publicKey)
+        {
+            Overrides.PublicKey = publicKey;
+        }
+
         public void SetDownloaderMaxRetries(int maxRetries)
         {
             Overrides.MaxRetries = maxRetries;

diff --git a/USBHelperInjector/Overrides.cs b/USBHelperInjector/Overrides.cs
@@ -14,6 +14,8 @@ public class Overrides
 
         public static string DonationKey { get; set; }
 
+        public static string PublicKey { get; set; }
+
         public static bool ForceKeySiteForm { get; set; }
 
         public static WebProxy Proxy { get; set; }

diff --git a/USBHelperInjector/Patches/PublicKeyPatch.cs b/USBHelperInjector/Patches/PublicKeyPatch.cs
@@ -0,0 +1,28 @@
+using Harmony;
+using System.Linq;
+using System.Reflection;
+
+namespace USBHelperInjector.Patches
+{
+    [HarmonyPatch]
+    class PublicKeyPatch
+    {
+        static MethodBase TargetMethod()
+        {
+            return (from type in ReflectionHelper.MainModule.GetTypes()
+                    from prop in type.GetProperties(BindingFlags.NonPublic | BindingFlags.Static)
+                    where prop.Name == "keysPub"
+                    select prop).FirstOrDefault().GetGetMethod(true);
+        }
+
+        static bool Prefix(ref string __result)
+        {
+            if (Overrides.PublicKey != null)
+            {
+                __result = Overrides.PublicKey;
+                return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/USBHelperInjector/USBHelperInjector.csproj b/USBHelperInjector/USBHelperInjector.csproj
@@ -68,6 +68,7 @@
     <Compile Include="Patches\KeySiteErrorMessagePatch.cs" />
     <Compile Include="Patches\LanguagePatch.cs" />
     <Compile Include="Patches\MessageBoxPatch.cs" />
+    <Compile Include="Patches\PublicKeyPatch.cs" />
     <Compile Include="Patches\SearchPatch.cs" />
     <Compile Include="Patches\ServicePointPatch.cs" />
     <Compile Include="Patches\SettingsDonationKeyPatches.cs" />

diff --git a/USBHelperLauncher/DebugMessage.cs b/USBHelperLauncher/DebugMessage.cs
@@ -32,11 +32,12 @@ public async Task<string> Build()
             DateTime now = DateTime.UtcNow;
             var hosts = Program.Hosts;
             var av = new Dictionary<string, bool>();
-            sb.Append('-', 10).Append(" USBHelperLauncher Debug Information ").Append('-', 10).AppendLine();
+            sb.Append('-', 13).Append(" USBHelperLauncher Debug Information ").Append('-', 13).AppendLine();
             sb.AppendLine("Debug Time: " + now + " (UTC)");
             sb.AppendLine("Session Length: " + (now - Program.GetSessionStart()).ToString(@"hh\:mm\:ss"));
             sb.AppendLine("Session GUID: " + Program.GetSessionGuid().ToString());
             sb.AppendLine("Proxy Available: " + (exception == null ? "Yes" : "No (" + exception.Message + ")"));
+            sb.AppendLine("Public Key Override: " + (Program.OverridePublicKey ? "Yes" : "No"));
             sb.AppendLine("Version: " + Program.GetVersion());
             sb.AppendLine("Helper Version: " + Program.GetHelperVersion());
             sb.AppendLine(".NET Framework Version: " + Get45or451FromRegistry());

diff --git a/USBHelperLauncher/LauncherService.cs b/USBHelperLauncher/LauncherService.cs
@@ -18,9 +18,10 @@ public void SendInjectorSettings()
             Program.GetLogger().WriteLine("Sending information to injector...");
             var factory = new ChannelFactory<IInjectorService>(new NetNamedPipeBinding(), "net.pipe://localhost/InjectorService");
             var channel = factory.CreateChannel();
-            if (Program.PatchPublicKey)
+            if (Program.OverridePublicKey)
             {
                 channel.SetDonationKey(Program.GenerateDonationKey());
+                channel.SetPublicKey(Program.PublicKey);
             }
             if (Settings.TitleKeys.Count == 0)
             {

diff --git a/USBHelperLauncher/Program.cs b/USBHelperLauncher/Program.cs
@@ -43,7 +43,8 @@ class Program
         private static RSAParameters rsaParams;
 
         public static Hosts Hosts { get; set; }
-        public static bool PatchPublicKey { get; private set; } = true;
+        public static string PublicKey { get; private set; }
+        public static bool OverridePublicKey { get; private set; } = true;
 
         [STAThread]
         static void Main(string[] args)
@@ -61,8 +62,8 @@ static void Main(string[] args)
                 {
                     switch (group.Value)
                     {
-                        case "nopatch":
-                            PatchPublicKey = false;
+                        case "nokey":
+                            OverridePublicKey = false;
                             break;
                         case "showconsole":
                             showConsole = true;
@@ -229,35 +230,17 @@ static void Main(string[] args)
             executable = Path.Combine(GetLauncherPath(), "Patched.exe");
             injector.Inject(executable);
             logger.WriteLine("Injected module initializer.");
-            if (PatchPublicKey)
+            dialog.Invoke(new Action(() => dialog.Close()));
+
+            if (OverridePublicKey)
             {
-                dialog.Invoke(new Action(() => dialog.SetHeader("Patching...")));
-                RSAPatcher patcher = new RSAPatcher(executable);
-                string xml;
+                // Generate an RSA key pair for our donation keys
                 using (var rsa = new RSACryptoServiceProvider(2048))
                 {
                     rsaParams = rsa.ExportParameters(true);
-                    xml = rsa.ToXmlString(false);
-                }
-                var builder = new StringBuilder();
-                var element = XElement.Parse(xml);
-                var settings = new XmlWriterSettings
-                {
-                    OmitXmlDeclaration = true,
-                    Indent = true
-                };
-                using (var xmlWriter = XmlWriter.Create(builder, settings))
-                {
-                    element.Save(xmlWriter);
+                    PublicKey = rsa.ToXmlString(false);
                 }
-                patcher.SetPublicKey(builder.ToString());
-                logger.WriteLine("Patched public key.");
             }
-            else
-            {
-                logger.WriteLine("Patching has been disabled.");
-            }
-            dialog.Invoke(new Action(() => dialog.Close()));
 
             // Time to launch Wii U USB Helper
             sessionStart = DateTime.UtcNow;
@@ -278,7 +261,7 @@ static void Main(string[] args)
             MenuItem advanced = new MenuItem("Advanced");
             advanced.MenuItems.Add("Toggle Console", OnVisibilityChange);
             advanced.MenuItems.Add("Clear Install", OnClearInstall);
-            advanced.MenuItems.Add("Generate Donation Key", OnGenerateKey).Enabled = PatchPublicKey;
+            advanced.MenuItems.Add("Generate Donation Key", OnGenerateKey).Enabled = OverridePublicKey;
             advanced.MenuItems.Add("Hosts Editor", OnOpenHostsEditor);
             advanced.MenuItems.Add("Export Sessions", OnExportSessions);
             trayMenu.MenuItems.Add("Exit", OnExit);

diff --git a/USBHelperLauncher/Properties/AssemblyInfo.cs b/USBHelperLauncher/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Puede especificar todos los valores o utilizar los números de compilación y de revisión predeterminados
 // mediante el carácter '*', como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.15.0.0")]
-[assembly: AssemblyFileVersion("0.15.0.0")]
+[assembly: AssemblyVersion("0.15.0.1")]
+[assembly: AssemblyFileVersion("0.15.0.1")]
diff --git a/USBHelperLauncher/RSAPatcher.cs b/USBHelperLauncher/RSAPatcher.cs
diff --git a/USBHelperLauncher/USBHelperLauncher.csproj b/USBHelperLauncher/USBHelperLauncher.csproj
@@ -154,7 +154,6 @@
     <Compile Include="Net\Endpoint.cs" />
     <Compile Include="Net\RegistrationEndpoint.cs" />
     <Compile Include="Net\Request.cs" />
-    <Compile Include="RSAPatcher.cs" />
     <Compile Include="Configuration\Settings.cs" />
     <Compile Include="Utils\Buffer.cs" />
     <Compile Include="Utils\CitraRepoUtil.cs" />