RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 02:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow archive imports with no hashable files

Browse Source
This commit is contained in:
Dean Herbert 2021-10-20 15:51:14 +09:00
parent fa542f2547
commit 439e90fce3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Database/ArchiveModelManager.cs
View File

@ -317,14 +317,18 @@ namespace osu.Game.Database
/// </remarks>
protected virtual string ComputeHash(TModel item, ArchiveReader reader = null)
{
if (reader != null)
// fast hashing for cases where the item's files may not be populated.
return computeHashFast(reader);
var hashableFiles = item.Files
.Where(f => HashableFileTypes.Any(ext => f.Filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
.OrderBy(f => f.Filename)
.ToArray();
if (hashableFiles.Length == 0)
throw new InvalidOperationException("Attempted to hash an archive with no files");
// for now, concatenate all hashable files in the set to create a unique hash.
MemoryStream hashable = new MemoryStream();
foreach (TFileModel file in item.Files.Where(f => HashableFileTypes.Any(ext => f.Filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase))).OrderBy(f => f.Filename))
foreach (TFileModel file in hashableFiles)
{
using (Stream s = Files.Store.GetStream(file.FileInfo.StoragePath))
s.CopyTo(hashable);
@ -700,10 +704,10 @@ namespace osu.Game.Database
s.CopyTo(hashable);
}
if (hashable.Length > 0)
return hashable.ComputeSHA2Hash();
if (hashable.Length == 0)
throw new InvalidOperationException("Attempted to hash an archive with no files");
return reader.Name.ComputeSHA2Hash();
return hashable.ComputeSHA2Hash();
}
/// <summary>