mirrors/ryujinx
0
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-12-11 01:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Force the key install helper to delete key files before copying (not sure why the overwrite boolean does nothing for File.Copy)

Browse source
This commit is contained in:
GreemDev 2025-12-02 21:22:55 -06:00
parent 39f55b2af3
commit d522bfef62
1 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/Ryujinx.HLE/FileSystem/ContentManager.cs
View file

@ -483,10 +483,29 @@ namespace Ryujinx.HLE.FileSystem
{ {
if (Directory.Exists(keysSource)) if (Directory.Exists(keysSource))
{ {
foreach (string filePath in Directory.EnumerateFiles(keysSource, "*.keys")) string[] keyPaths = Directory.EnumerateFiles(keysSource, "*.keys").ToArray();
if (keyPaths.Length is 0)
throw new FileNotFoundException($"Directory '{keysSource}' contained no '.keys' files.");
foreach (string filePath in keyPaths)
{ {
VerifyKeysFile(filePath); try
File.Copy(filePath, Path.Combine(installDirectory, Path.GetFileName(filePath)), true); {
VerifyKeysFile(filePath);
}
catch (Exception e)
{
Logger.Error?.Print(LogClass.Application, e.Message);
continue;
}
string destPath = Path.Combine(installDirectory, Path.GetFileName(filePath));
if (File.Exists(destPath))
File.Delete(destPath);
File.Copy(filePath, destPath, true);
} }
return; return;
@ -501,13 +520,25 @@ namespace Ryujinx.HLE.FileSystem
using FileStream file = File.OpenRead(keysSource); using FileStream file = File.OpenRead(keysSource);
if (info.Extension is ".keys") if (info.Extension is not ".keys")
throw new InvalidFirmwarePackageException("Input file extension is not .keys");
try
{ {
VerifyKeysFile(keysSource); VerifyKeysFile(keysSource);
File.Copy(keysSource, Path.Combine(installDirectory, info.Name), true); }
} catch
else {
throw new InvalidFirmwarePackageException("Input file is not a valid key package"); throw new InvalidFirmwarePackageException("Input file is not a valid key package");
}
string dest = Path.Combine(installDirectory, info.Name);
if (File.Exists(dest))
File.Delete(dest);
// overwrite: true seems to not work on its own? https://github.com/Ryubing/Issues/issues/189
File.Copy(keysSource, dest, true);
} }
private void FinishInstallation(string temporaryDirectory, string registeredDirectory) private void FinishInstallation(string temporaryDirectory, string registeredDirectory)
@ -985,8 +1016,8 @@ namespace Ryujinx.HLE.FileSystem
public static void VerifyKeysFile(string filePath) public static void VerifyKeysFile(string filePath)
{ {
// Verify the keys file format refers to https://github.com/Thealexbarney/LibHac/blob/master/KEYS.md // Verify the keys file format refers to https://github.com/Thealexbarney/LibHac/blob/master/KEYS.md
string genericPattern = @"^[a-z0-9_]+ = [a-z0-9]+$"; string genericPattern = "^[a-z0-9_]+ = [a-z0-9]+$";
string titlePattern = @"^[a-z0-9]{32} = [a-z0-9]{32}$"; string titlePattern = "^[a-z0-9]{32} = [a-z0-9]{32}$";
if (File.Exists(filePath)) if (File.Exists(filePath))
{ {
@ -994,24 +1025,13 @@ namespace Ryujinx.HLE.FileSystem
string fileName = Path.GetFileName(filePath); string fileName = Path.GetFileName(filePath);
string[] lines = File.ReadAllLines(filePath); string[] lines = File.ReadAllLines(filePath);
bool verified; bool verified = fileName switch
switch (fileName)
{ {
case "prod.keys": "prod.keys" or "console.keys" or "dev.keys" => VerifyKeys(lines, genericPattern),
verified = VerifyKeys(lines, genericPattern); "title.keys" => VerifyKeys(lines, titlePattern),
break; _ => throw new FormatException(
case "title.keys": $"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.")
verified = VerifyKeys(lines, titlePattern); };
break;
case "console.keys":
verified = VerifyKeys(lines, genericPattern);
break;
case "dev.keys":
verified = VerifyKeys(lines, genericPattern);
break;
default:
throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
}
if (!verified) if (!verified)
{ {