Allow patcher to resign and replace executable

Author: jvyden

Refresher.sln.DotSettings

@@ -24,4 +24,5 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reverify/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=RFSH/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=RPCS/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=USRDIR/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=USRDIR/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=webman/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Refresher/Accessors/ConsolePatchAccessor.cs

@@ -15,42 +15,40 @@ public ConsolePatchAccessor(string remoteIp)
         this._client.AutoConnect();
     }
 
-    private string GetPath(string path)
+    private static string GetPath(string path)
     {
         if (Path.IsPathRooted(path)) return path;
         return BasePath + path;
     }
 
-    public override bool DirectoryExists(string path) => this._client.DirectoryExists(this.GetPath(path));
+    public override bool DirectoryExists(string path) => this._client.DirectoryExists(GetPath(path));
 
-    public override bool FileExists(string path) => this._client.FileExists(this.GetPath(path));
+    public override bool FileExists(string path) => this._client.FileExists(GetPath(path));
 
     public override IEnumerable<string> GetDirectoriesInDirectory(string path) =>
-        this._client.GetListing(this.GetPath(path))
+        this._client.GetListing(GetPath(path))
             .Where(l => l.Type == FtpObjectType.Directory)
             .Select(l => l.FullName);
 
     public override IEnumerable<string> GetFilesInDirectory(string path) =>
-        this._client.GetListing(this.GetPath(path))
+        this._client.GetListing(GetPath(path))
             .Where(l => l.Type == FtpObjectType.File)
             .Select(l => l.FullName);
 
     public override Stream OpenRead(string path)
     {
         MemoryStream ms = new();
-        this._client.DownloadStream(ms, this.GetPath(path));
+        this._client.DownloadStream(ms, GetPath(path));
         ms.Seek(0, SeekOrigin.Begin);
         return ms;
 
         // technically we can use a stream directly but this uses a lot more requests
-        // and webman doesnt like that
-        return this._client.OpenRead(this.GetPath(path));
+        // and webman doesnt like that, it tends to just slow down to a crawl after a bunch of them :(
+        // return this._client.OpenRead(GetPath(path));
     }
 
-    public override Stream OpenWrite(string path)
-    {
-        return this._client.OpenWrite(this.GetPath(path));
-    }
+    public override Stream OpenWrite(string path) => this._client.OpenWrite(GetPath(path));
+    public override void RemoveFile(string path) => this._client.DeleteFile(GetPath(path));
 
     public void Dispose()
     {

Refresher/Accessors/EmulatorPatchAccessor.cs

@@ -23,4 +23,8 @@ private string GetPath(string path)
 
     public override Stream OpenRead(string path) => File.OpenRead(this.GetPath(path));
     public override Stream OpenWrite(string path) => File.OpenWrite(this.GetPath(path));
+    public override void RemoveFile(string path) => File.Delete(this.GetPath(path));
+
+    public override void DuplicateFile(string inPath, string outPath)
+        => File.Copy(this.GetPath(inPath), this.GetPath(outPath));
 }

Refresher/Accessors/PatchAccessor.cs

@@ -8,6 +8,7 @@ public abstract class PatchAccessor
     public abstract IEnumerable<string> GetFilesInDirectory(string path);
     public abstract Stream OpenRead(string path);
     public abstract Stream OpenWrite(string path);
+    public abstract void RemoveFile(string path);
 
     public string DownloadFile(string path)
     {
@@ -27,4 +28,12 @@ public void UploadFile(string inPath, string outPath)
 
         inStream.CopyTo(outStream);
     }
+
+    public virtual void DuplicateFile(string inPath, string outPath)
+    {
+        using Stream inStream = this.OpenRead(inPath);
+        using Stream outStream = this.OpenWrite(outPath);
+        
+        inStream.CopyTo(outStream);
+    }
 }

Refresher/Refresher.csproj

@@ -22,7 +22,7 @@
       <EmbeddedResource Include="Resources\refresher.ico" LogicalName="refresher.ico" />
       <PackageReference Include="FluentFTP" Version="47.1.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="SCEToolSharp" Version="1.0.7" />
+      <PackageReference Include="SCEToolSharp" Version="1.0.8" />
     </ItemGroup>
 
 

Refresher/UI/ConsolePatchForm.cs

@@ -22,4 +22,7 @@ protected override TableRow AddRemoteField()
     {
         return AddField("PS3's IP", out this._remoteAddress);
     }
+
+    protected override bool NeedsResign => true;
+    protected override bool ShouldReplaceExecutable => true;
 }

Refresher/UI/EmulatorPatchForm.cs

@@ -43,4 +43,7 @@ protected override TableRow AddRemoteField()
     {
         return AddField("RPCS3 dev_hdd0 folder", out this._folderField);
     }
+
+    protected override bool NeedsResign => false;
+    protected override bool ShouldReplaceExecutable => false;
 }

Refresher/UI/IntegratedPatchForm.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using Eto.Drawing;
 using Eto.Forms;
 using Refresher.Accessors;
@@ -12,7 +13,7 @@ namespace Refresher.UI;
 public abstract class IntegratedPatchForm : PatchForm<Patcher>
 {
     private readonly DropDown _gameDropdown;
-    private readonly TextBox _outputField;
+    private readonly TextBox? _outputField;
 
     private string _tempFile;
     private string _usrDir;
@@ -21,18 +22,22 @@ public abstract class IntegratedPatchForm : PatchForm<Patcher>
 
     protected override TableLayout FormPanel { get; }
 
+    [SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
     protected IntegratedPatchForm(string subtitle) : base(subtitle)
     {
         this.FormPanel = new TableLayout(new List<TableRow>
         {
-            // ReSharper disable once VirtualMemberCallInConstructor
             this.AddRemoteField(),
             AddField("Game to patch", out this._gameDropdown),
             AddField("Server URL", out this.UrlField),
-            AddField("Identifier (EBOOT.<value>.elf)", out this._outputField),
         });
+
+        if (!this.ShouldReplaceExecutable)
+        {
+            this.FormPanel.Rows.Add(AddField("Identifier (EBOOT.<value>.elf)", out this._outputField));
+            this._outputField!.PlaceholderText = "refresh";
+        }
 
-        this._outputField.PlaceholderText = "refresh";
         this._gameDropdown.SelectedValueChanged += this.GameChanged;
 
         this.InitializePatcher();
@@ -93,13 +98,21 @@ protected void GameChanged(object? sender, EventArgs ev)
 
         string licenseDir = Path.Join(Path.GetTempPath(), "refresher-" + Random.Shared.Next());
         Directory.CreateDirectory(licenseDir);
-        IEnumerable<string> licenseFiles = this.Accessor.GetFilesInDirectory(Path.Combine("home", "00000001", "exdata"));
-        
-        foreach (string licenseFile in licenseFiles)
+
+        // if this is a NP game then download RIFs/RAPs, disc copies don't need anything else
+        if (game.TitleId.StartsWith('N'))
         {
-            if(!licenseFile.Contains(game.TitleId)) continue;
-            string downloadedFile = this.Accessor.DownloadFile(licenseFile);
-            File.Move(downloadedFile, Path.Join(licenseDir, Path.GetFileName(licenseFile)));
+            // TODO: the first user might not have the licenses necessary, should download from all users
+            IEnumerable<string> licenseFiles = this.Accessor.GetFilesInDirectory(Path.Combine("home", "00000001", "exdata"));
+            foreach (string licenseFile in licenseFiles)
+            {
+                // only download if it contains our game's title id
+                // TODO: determine content id directly so we skip dlc licenses
+                if(!licenseFile.Contains(game.TitleId)) continue;
+                
+                string downloadedFile = this.Accessor.DownloadFile(licenseFile);
+                File.Move(downloadedFile, Path.Join(licenseDir, Path.GetFileName(licenseFile)));
+            }
         }
 
         this.LogMessage($"EBOOT Path: {ebootPath}");
@@ -123,11 +136,38 @@ protected void GameChanged(object? sender, EventArgs ev)
 
     public override void CompletePatch(object? sender, EventArgs e) {
         Debug.Assert(this.Accessor != null);
-        string identifier = string.IsNullOrWhiteSpace(this._outputField.Text) ? this._outputField.PlaceholderText : this._outputField.Text;
 
-        string destination = Path.Combine(this._usrDir, $"EBOOT.{identifier}.elf");
+        string? identifier = string.IsNullOrWhiteSpace(this._outputField?.Text) ? this._outputField?.PlaceholderText : this._outputField?.Text;
+        identifier ??= "";
+
+        string fileToUpload;
+        if (this.NeedsResign)
+        {
+            string encryptedTempFile = Path.GetTempFileName();
+            LibSceToolSharp.SetDiscEncryptOptions();
+            LibSceToolSharp.Encrypt(this._tempFile, encryptedTempFile);
+
+            fileToUpload = encryptedTempFile;
+        }
+        else
+        {
+            fileToUpload = this._tempFile;
+        }
+
+        string destinationFile = this.ShouldReplaceExecutable ? "EBOOT.BIN" : $"EBOOT.{identifier}.BIN";
+        string destination = Path.Combine(this._usrDir, destinationFile);
+
+        // if we're replacing the executable, back it up to EBOOT.BIN.ORIG before we do so
+        if (this.ShouldReplaceExecutable)
+        {
+            string backup = destination + ".ORIG";
+            if (!this.Accessor.FileExists(backup))
+                this.Accessor.DuplicateFile(destination, backup);
+            
+            this.Accessor.RemoveFile(destination);
+        }
 
-        this.Accessor.UploadFile(this._tempFile, destination);
+        this.Accessor.UploadFile(fileToUpload, destination);
         MessageBox.Show($"Successfully patched EBOOT! It was saved to '{destination}'.");
 
         // Re-initialize patcher so we can patch with the same parameters again
@@ -136,4 +176,6 @@ public override void CompletePatch(object? sender, EventArgs e) {
     }
 
     protected abstract TableRow AddRemoteField();
+    protected abstract bool NeedsResign { get; }
+    protected abstract bool ShouldReplaceExecutable { get; }
 }