Skip to content

Commit f449df1

Browse files
Copilotwinnerspiros
andcommitted
Fix AutoMapper vulnerability (13.0.1→16.1.1), update SharpCompress, fix iOS MAUI Essentials
- AutoMapper 13.0.1→16.1.1: fixes HIGH severity CVE GHSA-rvv3-g6hj-g44x (DoS via uncontrolled recursion) - Migrate MapperConfiguration to new 2-arg constructor (NullLoggerFactory.Instance) - SharpCompress 0.47.0→0.47.3 (patch bugfixes) - iOS Microsoft.Maui.Essentials 8.0.3→10.0.51 (.NET 10 compat) Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/124e253f-a180-470b-855f-ff235f45e2cd Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent 9c5d3b4 commit f449df1

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

osu.Game/Database/RealmObjectExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Runtime.Serialization;
99
using AutoMapper;
1010
using AutoMapper.Internal;
11+
using Microsoft.Extensions.Logging.Abstractions;
1112
using osu.Framework.Logging;
1213
using osu.Game.Beatmaps;
1314
using osu.Game.Collections;
@@ -97,7 +98,7 @@ public static class RealmObjectExtensions
9798
m.Ignore();
9899
});
99100
});
100-
}).CreateMapper();
101+
}, NullLoggerFactory.Instance).CreateMapper();
101102

102103
private static readonly IMapper mapper = new MapperConfiguration(c =>
103104
{
@@ -127,7 +128,7 @@ public static class RealmObjectExtensions
127128
}
128129
}
129130
});
130-
}).CreateMapper();
131+
}, NullLoggerFactory.Instance).CreateMapper();
131132

132133
/// <summary>
133134
/// A slightly optimised mapper that avoids double-fetches in cyclic reference.
@@ -150,7 +151,7 @@ public static class RealmObjectExtensions
150151
.MaxDepth(1)
151152
// This is not required as it will be populated in the `AfterMap` call from the `BeatmapInfo`'s parent.
152153
.ForMember(b => b.BeatmapSet, cc => cc.Ignore());
153-
}).CreateMapper();
154+
}, NullLoggerFactory.Instance).CreateMapper();
154155

155156
private static void applyCommonConfiguration(IMapperConfigurationExpression c)
156157
{

osu.Game/osu.Game.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020
<ItemGroup Label="Package References">
2121
<!-- Held back due to licencing change stupidness. Silenced vulnerability does not affect us. -->
22-
<PackageReference Include="AutoMapper" Version="13.0.1">
22+
<PackageReference Include="AutoMapper" Version="16.1.1">
2323
<NoWarn>NU1903</NoWarn>
2424
</PackageReference>
2525
<PackageReference Include="DiffPlex" Version="1.9.0" />
@@ -42,7 +42,7 @@
4242
<PackageReference Include="ppy.osu.Game.Resources" Version="2026.312.0" />
4343
<PackageReference Include="Sentry" Version="6.2.0" />
4444
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
45-
<PackageReference Include="SharpCompress" Version="0.47.0" />
45+
<PackageReference Include="SharpCompress" Version="0.47.3" />
4646
<PackageReference Include="NUnit" Version="4.5.1" />
4747
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
4848
<PackageReference Include="TagLibSharp" Version="2.3.0" />

osu.iOS/osu.iOS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.3" />
23+
<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.51" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<BundleResource Include="Assets.car" />

0 commit comments

Comments
 (0)