Merge pull request #52 from bdach/disallow-old-osu-versions

Disallow uploads of beatmaps with file version below v14

Author: peppy

osu.Server.BeatmapSubmission.Tests/BeatmapSubmissionControllerTest.cs

@@ -1163,6 +1163,31 @@ public async Task TestUploadFullPackage_FailsIfMetadataTooLong()
             Assert.Contains("Beatmap difficulty names must not exceed 80 characters.", (await response.Content.ReadFromJsonAsync<ErrorResponse>())!.Error);
         }
 
+        [Fact]
+        public async Task TestUploadFullPackage_FailsIfOsuFileFormatVersionTooOld()
+        {
+            using var db = await DatabaseAccess.GetConnectionAsync();
+            await db.ExecuteAsync("INSERT INTO `phpbb_users` (`user_id`, `username`, `username_clean`, `country_acronym`, `user_permissions`, `user_sig`, `user_occ`, `user_interests`) VALUES (1000, 'test', 'test', 'JP', '', '', '', '')");
+
+            await db.ExecuteAsync(@"INSERT INTO `osu_beatmapsets` (`beatmapset_id`, `user_id`, `creator`, `approved`, `thread_id`, `active`, `submit_date`) VALUES (241526, 1000, 'test user', -1, 0, -1, CURRENT_TIMESTAMP)");
+
+            foreach (uint beatmapId in new uint[] { 557810 })
+                await db.ExecuteAsync(@"INSERT INTO `osu_beatmaps` (`beatmap_id`, `user_id`, `beatmapset_id`, `approved`) VALUES (@beatmapId, 1000, 241526, -1)", new { beatmapId = beatmapId });
+
+            var request = new HttpRequestMessage(HttpMethod.Put, "/beatmapsets/241526");
+
+            using var content = new MultipartFormDataContent($"{Guid.NewGuid()}----");
+            using var stream = TestResources.GetResource("old-osu-version.osz")!;
+            content.Add(new StreamContent(stream), "beatmapArchive", osz_filename);
+            request.Content = content;
+            request.Headers.Add(HeaderBasedAuthenticationHandler.USER_ID_HEADER, "1000");
+
+            var response = await Client.SendAsync(request);
+            Assert.False(response.IsSuccessStatusCode);
+            Assert.Equal(HttpStatusCode.UnprocessableEntity, response.StatusCode);
+            Assert.Contains("Version of file \"Soleily - Renatus (test) [old version].osu\" is too old (should be v14 or higher)", (await response.Content.ReadFromJsonAsync<ErrorResponse>())!.Error);
+        }
+
         [Fact]
         public async Task TestPatchPackage()
         {

osu.Server.BeatmapSubmission.Tests/Resources/241526 Soleily - Renatus.osz

@@ -1,4 +1,4 @@
-osu file format v13
+osu file format v14
 
 [General]
 AudioFilename: 03. Renatus - Soleily 192kbps.mp3

osu.Server.BeatmapSubmission.Tests/Resources/Soleily - Renatus (test) [Platter 2].osu

@@ -88,10 +88,15 @@ public BeatmapPackageParseResult Parse(uint beatmapSetId, ArchiveReader archiveR
 
         private static BeatmapContent getBeatmapContent(string filePath, Stream contents)
         {
-            var decoder = new LegacyBeatmapDecoder();
-            var beatmap = decoder.Decode(new LineBufferedReader(contents));
+            string fileName = Path.GetFileName(filePath);
+            using var reader = new LineBufferedReader(contents, leaveOpen: true);
+            var decoder = Decoder.GetDecoder<Beatmap>(reader);
+            var beatmap = decoder.Decode(reader);
 
-            return new BeatmapContent(Path.GetFileName(filePath), contents.ComputeMD5Hash(), beatmap);
+            if (beatmap.BeatmapVersion < LegacyBeatmapDecoder.LATEST_VERSION)
+                throw new InvariantException($"Version of file \"{fileName}\" is too old (should be v14 or higher)");
+
+            return new BeatmapContent(fileName, contents.ComputeMD5Hash(), beatmap);
         }
 
         private osu_beatmapset constructDatabaseRowForBeatmapset(uint beatmapSetId, ArchiveReader archiveReader, ICollection<BeatmapContent> beatmaps)