Merge ee369ef86d into ce4aac4184

Fix strong drum rolls being counted for double the combo in legacy scoring attributes

osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs

@@ -144,6 +144,13 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                     foreach (var nested in hitObject.NestedHitObjects)
                         simulateHit(nested, ref attributes);
                     return;
+
+                case StrongNestedHitObject:
+                    // we never need to deal with these directly.
+                    // the only thing strong hits do in terms of scoring is double their object's score increase,
+                    // which is already handled at the parent object level via the `strongable.IsStrong` check lower down in this method.
+                    // not handling these here can lead to them falsely being counted as combo-increasing when handling strong drum rolls!
+                    return;
             }
 
             if (hitObject is DrumRollTick tick)

osu.Game.Tests/Visual/Online/TestSceneImageProxying.cs

@@ -0,0 +1,47 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Graphics.Containers.Markdown;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public partial class TestSceneImageProxying : OsuTestScene
+    {
+        [Resolved]
+        private GameHost host { get; set; } = null!;
+
+        [Test]
+        public void TestExternalImageLink()
+        {
+            AddStep("load image", () => Child = new OsuMarkdownContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Text = "![](https://github.com/ppy/osu-wiki/blob/master/wiki/Announcement_messages/img/notification.png?raw=true)",
+            });
+        }
+
+        [Test]
+        public void TestLocalImageLink()
+        {
+            AddStep("load image", () => Child = new OsuMarkdownContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Text = "![](https://osu.ppy.sh/help/wiki/shared/news/banners/monthly-beatmapping-contest.png)",
+            });
+        }
+
+        [Test]
+        public void TestInvalidImageLink()
+        {
+            AddStep("load image", () => Child = new OsuMarkdownContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Text = "![](https://this-site-does-not-exist.com/img.png)",
+            });
+        }
+    }
+}

osu.Game/Audio/PreviewTrackManager.cs

@@ -6,9 +6,10 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
+using osu.Game.Online;
+using osu.Game.Online.API;
 
 namespace osu.Game.Audio
 {
@@ -28,9 +29,9 @@ namespace osu.Game.Audio
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audioManager)
+        private void load(AudioManager audioManager, IAPIProvider api)
         {
-            trackStore = audioManager.GetTrackStore(new OnlineStore());
+            trackStore = audioManager.GetTrackStore(new OsuOnlineStore(api.APIEndpointUrl));
         }
 
         /// <summary>

osu.Game/Graphics/Containers/Markdown/OsuMarkdownImage.cs

@@ -17,5 +17,8 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             TooltipText = linkInline.Title;
         }
+
+        protected override ImageContainer CreateImageContainer(string url)
+            => base.CreateImageContainer($@"https://osu.ppy.sh/media-url?url={url}");
     }
 }

osu.Game/Online/OsuOnlineStore.cs

@@ -0,0 +1,31 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.IO.Stores;
+using osu.Framework.Logging;
+
+namespace osu.Game.Online
+{
+    public class OsuOnlineStore : OnlineStore
+    {
+        private readonly string apiEndpointUrl;
+
+        public OsuOnlineStore(string apiEndpointUrl)
+        {
+            this.apiEndpointUrl = apiEndpointUrl;
+        }
+
+        protected override string GetLookupUrl(string url)
+        {
+            // add leading dot to avoid matching hosts named "<anything>ppy.sh"
+            if (!Uri.TryCreate(url, UriKind.Absolute, out Uri? uri) || !uri.Host.EndsWith(@".ppy.sh", StringComparison.OrdinalIgnoreCase))
+            {
+                Logger.Log($@"Blocking resource lookup from external website: {url}", LoggingTarget.Network, LogLevel.Important);
+                return string.Empty;
+            }
+
+            return url;
+        }
+    }
+}

osu.Game/OsuGame.cs

@@ -29,6 +29,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.IO.Stores;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -824,6 +825,8 @@ namespace osu.Game
 
         protected override Container CreateScalingContainer() => new ScalingContainer(ScalingMode.Everything);
 
+        protected override OnlineStore CreateOnlineStore() => new OsuOnlineStore(CreateEndpoints().APIEndpointUrl);
+
         #region Beatmap progression
 
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap)

osu.Game/OsuGameBase.cs

@@ -277,7 +277,7 @@ namespace osu.Game
             dependencies.CacheAs(Storage);
 
             var largeStore = new LargeTextureStore(Host.Renderer, Host.CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")));
-            largeStore.AddTextureSource(Host.CreateTextureLoaderStore(new OnlineStore()));
+            largeStore.AddTextureSource(Host.CreateTextureLoaderStore(CreateOnlineStore()));
             dependencies.Cache(largeStore);
 
             dependencies.CacheAs(LocalConfig);