epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for hashing partial IDFiles.

Browse Source
This commit is contained in:
Paul Chote
2016-12-17 17:24:04 +00:00
parent f8d0dcad4f
commit e30ca88797
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/ModContent.cs
View File

@@ -48,13 +48,18 @@ namespace OpenRA
public readonly string RegistryValue; public readonly string RegistryValue;
public readonly string Title; public readonly string Title;
public readonly Dictionary<string, string> IDFiles;
[FieldLoader.Ignore] public readonly MiniYaml IDFiles;
[FieldLoader.Ignore] public readonly List<MiniYamlNode> Install; [FieldLoader.Ignore] public readonly List<MiniYamlNode> Install;
public ModSource(MiniYaml yaml) public ModSource(MiniYaml yaml)
{ {
Title = yaml.Value; Title = yaml.Value;
var idFiles = yaml.Nodes.FirstOrDefault(n => n.Key == "IDFiles");
if (idFiles != null)
IDFiles = idFiles.Value;
var installNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Install"); var installNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Install");
if (installNode != null) if (installNode != null)
Install = installNode.Value.Nodes; Install = installNode.Value.Nodes;

25
OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromDiscLogic.cs
View File

@@ -505,15 +505,34 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
try try
{ {
foreach (var kv in source.IDFiles) foreach (var kv in source.IDFiles.Nodes)
{ {
var filePath = Path.Combine(path, kv.Key); var filePath = Path.Combine(path, kv.Key);
if (!File.Exists(filePath)) if (!File.Exists(filePath))
return false; return false;
using (var fileStream = File.OpenRead(filePath)) using (var fileStream = File.OpenRead(filePath))
if (CryptoUtil.SHA1Hash(fileStream) != kv.Value) {
return false; var offsetNode = kv.Value.Nodes.FirstOrDefault(n => n.Key == "Offset");
var lengthNode = kv.Value.Nodes.FirstOrDefault(n => n.Key == "Length");
if (offsetNode != null || lengthNode != null)
{
var offset = 0L;
if (offsetNode != null)
offset = FieldLoader.GetValue<long>("Offset", offsetNode.Value.Value);
var length = fileStream.Length - offset;
if (lengthNode != null)
length = FieldLoader.GetValue<long>("Length", lengthNode.Value.Value);
fileStream.Position = offset;
var data = fileStream.ReadBytes((int)length);
if (CryptoUtil.SHA1Hash(data) != kv.Value.Value)
return false;
}
else if (CryptoUtil.SHA1Hash(fileStream) != kv.Value.Value)
return false;
}
} }
} }
catch (Exception) catch (Exception)