h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 10:17:19 +08:00
Code Issues 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> /// </remarks>
protected virtual string ComputeHash(TModel item, ArchiveReader reader = null) protected virtual string ComputeHash(TModel item, ArchiveReader reader = null)
{ {
if (reader != null) var hashableFiles = item.Files
// fast hashing for cases where the item's files may not be populated. .Where(f => HashableFileTypes.Any(ext => f.Filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
return computeHashFast(reader); .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. // for now, concatenate all hashable files in the set to create a unique hash.
MemoryStream hashable = new MemoryStream(); 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)) using (Stream s = Files.Store.GetStream(file.FileInfo.StoragePath))
s.CopyTo(hashable); s.CopyTo(hashable);
@ -700,10 +704,10 @@ namespace osu.Game.Database
s.CopyTo(hashable); s.CopyTo(hashable);
} }
if (hashable.Length > 0) if (hashable.Length == 0)
return hashable.ComputeSHA2Hash(); throw new InvalidOperationException("Attempted to hash an archive with no files");
return reader.Name.ComputeSHA2Hash(); return hashable.ComputeSHA2Hash();
} }
/// <summary> /// <summary>