MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Improved controls on keys files

Browse Source
This commit is contained in:
Nicola 2024-11-22 11:00:03 +01:00
parent 037c0b434f
commit dc28bdbfa4
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Ryujinx.HLE/FileSystem/ContentManager.cs
View File

@ -1019,29 +1019,56 @@ namespace Ryujinx.HLE.FileSystem
public void VerifyKeysFile(string filePath) public void VerifyKeysFile(string filePath)
{ {
string schemaPattern = @"^[a-zA-Z0-9_]+ = [a-zA-Z0-9]+$"; // 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 titlePattern = @"^[a-z0-9]{32} = [a-z0-9]{32}$";
if (File.Exists(filePath)) if (File.Exists(filePath))
{ {
// Read all lines from the file // Read all lines from the file
string fileName = Path.GetFileName(filePath);
string[] lines = File.ReadAllLines(filePath); string[] lines = File.ReadAllLines(filePath);
for (int i = 0; i < lines.Length; i++) bool verified = false;
switch (fileName)
{ {
string line = lines[i].Trim(); case "prod.keys":
verified = verifyKeys(lines, genericPattern);
// Check if the line matches the schema break;
if (!Regex.IsMatch(line, schemaPattern)) case "title.keys":
{ verified = verifyKeys(lines, titlePattern);
throw new FormatException("Keys file doesn't have a correct schema."); 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)
{
throw new FormatException($"Invalid \"{filePath}\" file format.");
} }
} else } else
{ {
throw new FileNotFoundException("Keys file not found at " + filePath); throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
} }
} }
private bool verifyKeys(string[] lines, string regex)
{
foreach (string line in lines)
{
if (!Regex.IsMatch(line, regex))
{
return false;
}
}
return true;
}
public bool AreKeysAlredyPresent(string pathToCheck) public bool AreKeysAlredyPresent(string pathToCheck)
{ {
string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" }; string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };