ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some more validation to `{FFmpeg,RAIntegration}DownloaderForm` 

see #4275
This commit is contained in:
YoshiRulz 2025-04-10 21:17:03 +10:00
parent 15cdf2d49d
commit 1983966d18
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.EmuHawk/AVOut/FFmpegDownloaderForm.cs
View File

@ -1,6 +1,7 @@
using System.IO;
using BizHawk.Common;
using BizHawk.Common.IOExtensions;
namespace BizHawk.Client.EmuHawk
{
@ -30,5 +31,8 @@ namespace BizHawk.Client.EmuHawk
protected override bool PostChmodCheck()
=> FFmpegService.QueryServiceAvailable();
protected override bool PreChmodCheck(FileStream extracted)
=> SHA256Checksum.ComputeDigestHex(extracted.ReadAllBytes()) == FFmpegService.DownloadSHA256Checksum;
}
}

7
src/BizHawk.Client.EmuHawk/DownloaderForm.cs
View File

@ -104,6 +104,8 @@ namespace BizHawk.Client.EmuHawk
//last chance. exiting, don't dump the new file
if (_exiting) return;
exStream.CopyTo(fs);
fs.Position = 0L;
if (!PreChmodCheck(fs)) throw new Exception("download failed (pre-chmod validation)");
fs.Dispose();
if (OSTailoredCode.IsUnixHost)
{
@ -113,7 +115,7 @@ namespace BizHawk.Client.EmuHawk
}
//make sure it worked
if (!PostChmodCheck()) throw new Exception("download failed");
if (!PostChmodCheck()) throw new Exception("download failed (post-chmod validation)");
_succeeded = true;
}
@ -141,6 +143,9 @@ namespace BizHawk.Client.EmuHawk
protected virtual bool PostChmodCheck()
=> true;
protected virtual bool PreChmodCheck(FileStream extracted)
=> true;
private void btnDownload_Click(object sender, EventArgs e)
{
btnDownload.Text = "Downloading...";

6
src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegrationDownloaderForm.cs
View File

@ -2,6 +2,7 @@ using System.IO;
using BizHawk.Common;
using BizHawk.Common.PathExtensions;
using BizHawk.Common.StringExtensions;
namespace BizHawk.Client.EmuHawk
{
@ -15,6 +16,11 @@ namespace BizHawk.Client.EmuHawk
public RAIntegrationDownloaderForm(string downloadFrom)
{
var downloadDomainName = downloadFrom.RemovePrefix("https://").SubstringBefore('/');
if (!(downloadDomainName is "retroachievements.org" || downloadDomainName.EndsWith(".retroachievements.org")))
{
throw new ArgumentException(paramName: nameof(downloadFrom), message: "untrusted hostname");
}
Description = string.Empty;
DownloadFrom = downloadFrom;
DownloadTo = Path.Combine(PathUtils.DataDirectoryPath, "dll", "RA_Integration-x64.dll");

7
src/BizHawk.Common/FFmpegService.cs
View File

@ -17,8 +17,15 @@ namespace BizHawk.Common
private const string BIN_HOST_URI_WIN_X64 = "https://github.com/TASEmulators/ffmpeg-binaries/raw/master/ffmpeg-4.4.1-static-windows-x64.7z";
private const string BIN_SHA256_LINUX_X64 = "3EA58083710F63BF920B16C7D5D24AE081E7D731F57A656FED11AF0410D4EB48";
private const string BIN_SHA256_WIN_X64 = "8436760AF8F81C95EFF92D854A7684E6D3CEDB872888420359FC45C8EB2664AC";
private const string VERSION = "ffmpeg version 4.4.1";
public static string DownloadSHA256Checksum
=> OSTailoredCode.IsUnixHost ? BIN_SHA256_LINUX_X64 : BIN_SHA256_WIN_X64;
public static string FFmpegPath => Path.Combine(PathUtils.DataDirectoryPath, "dll", OSTailoredCode.IsUnixHost ? "ffmpeg" : "ffmpeg.exe");
public static readonly string Url = OSTailoredCode.IsUnixHost ? BIN_HOST_URI_LINUX_X64 : BIN_HOST_URI_WIN_X64;