wonderking/continuity
2
0
Fork 0
Code Issues Pull requests 16 Projects 1 Releases Packages 1 Wiki Activity Actions

chore: dependency upgrade & missing refactor from Server to AuthServer
Some checks failed
Build, Package and Push Images / preprocess (push) Successful in 2s
Details
Build, Package and Push Images / build (push) Successful in 25s
Details
Build, Package and Push Images / sbom-scan (push) Successful in 36s
Details
Build, Package and Push Images / sonarqube (push) Failing after 1m36s
Details
Build, Package and Push Images / container-build (push) Successful in 2m4s
Details
Build, Package and Push Images / container-sbom-scan (push) Successful in 39s
Details

Browse source
This commit is contained in:
Timothy Schenk 2024-01-29 08:39:18 +01:00
parent 2d90059418
commit 6d9a72ded4
45 changed files with 94 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Benchmarks/Benchmarks.csproj
View file

@ -13,10 +13,11 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="BenchmarkDotNet" Version="0.13.10"/> <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="DotNext.Unsafe" Version="0.13.12" />
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" /> <PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
<PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0" /> <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.112"> <PackageReference Include="Meziantou.Analyzer" Version="2.0.139">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

4
Continuity.AuthServer/AuthSession.cs
View file

@ -2,13 +2,13 @@
using System.Net.Sockets; using System.Net.Sockets;
using System.Reflection; using System.Reflection;
using Continuity.AuthServer.Packets;
using MassTransit.Mediator; using MassTransit.Mediator;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NetCoreServer; using NetCoreServer;
using Server.Packets;
using Wonderking.Packets; using Wonderking.Packets;
namespace Server; namespace Continuity.AuthServer;
public class AuthSession : TcpSession public class AuthSession : TcpSession
{ {

2
Continuity.AuthServer/ChannelSession.cs
View file

@ -6,7 +6,7 @@ using MassTransit.Mediator;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NetCoreServer; using NetCoreServer;
namespace Server; namespace Continuity.AuthServer;
public class ChannelSession : TcpSession public class ChannelSession : TcpSession
{ {

6
Continuity.AuthServer/Consumers/PacketConsumer.cs
View file

@ -1,10 +1,10 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.Packets;
using Continuity.AuthServer.Services;
using MassTransit; using MassTransit;
using Server.Packets;
using Server.Services;
namespace Server.Consumers; namespace Continuity.AuthServer.Consumers;
public class PacketConsumer : IConsumer<RawPacket> public class PacketConsumer : IConsumer<RawPacket>
{ {

46
Continuity.AuthServer/Continuity.AuthServer.csproj
View file

@ -40,20 +40,20 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="DotNext" Version="4.15.2"/> <PackageReference Include="DotNext" Version="5.0.1" />
<PackageReference Include="DotNext.IO" Version="4.15.0"/> <PackageReference Include="DotNext.IO" Version="5.0.1" />
<PackageReference Include="DotNext.Metaprogramming" Version="4.15.0"/> <PackageReference Include="DotNext.Metaprogramming" Version="5.0.1" />
<PackageReference Include="DotNext.Reflection" Version="4.9.0"/> <PackageReference Include="DotNext.Reflection" Version="4.9.0"/>
<PackageReference Include="DotNext.Threading" Version="4.15.2"/> <PackageReference Include="DotNext.Threading" Version="5.0.1" />
<PackageReference Include="DotNext.Unsafe" Version="4.14.0"/> <PackageReference Include="DotNext.Unsafe" Version="5.0.1" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/> <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
<PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0"/> <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0"/>
<PackageReference Include="MassTransit" Version="8.1.2"/> <PackageReference Include="MassTransit" Version="8.1.3" />
<PackageReference Include="MassTransit.Analyzers" Version="8.1.2"> <PackageReference Include="MassTransit.Analyzers" Version="8.1.3">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.112"> <PackageReference Include="Meziantou.Analyzer" Version="2.0.139">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@ -61,11 +61,11 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@ -80,23 +80,23 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="NetCoreServer" Version="8.0.3"/> <PackageReference Include="NetCoreServer" Version="8.0.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/> <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.0" /> <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.1" />
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539"> <PackageReference Include="Nullable.Extended.Analyzer" Version="1.15.6169">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="OpenTelemetry" Version="1.7.0-alpha.1"/> <PackageReference Include="OpenTelemetry" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0-alpha.1"/> <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1"/> <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0-alpha.1"/> <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1"/> <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.8"/> <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.8"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.3"/> <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.0.0-alpha.6" /> <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.0.0-alpha.6" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1"/> <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.0"/> <PackageReference Include="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.0"/>
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.4"/> <PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.4"/>
<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0"/> <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0"/>

2
Continuity.AuthServer/DB/Documents/Account.cs
View file

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
[Index(nameof(Username), IsUnique = true)] [Index(nameof(Username), IsUnique = true)]
[Index(nameof(Id), IsUnique = true)] [Index(nameof(Id), IsUnique = true)]

2
Continuity.AuthServer/DB/Documents/Character.cs
View file

@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore;
using Wonderking.Game.Data.Character; using Wonderking.Game.Data.Character;
using Wonderking.Packets.Outgoing.Data; using Wonderking.Packets.Outgoing.Data;
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
[Index(nameof(Name), IsUnique = true)] [Index(nameof(Name), IsUnique = true)]
[Index(nameof(Id), IsUnique = true)] [Index(nameof(Id), IsUnique = true)]

2
Continuity.AuthServer/DB/Documents/Guild.cs
View file

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
[Index(nameof(Name), IsUnique = true)] [Index(nameof(Name), IsUnique = true)]
[Index(nameof(Id), IsUnique = true)] [Index(nameof(Id), IsUnique = true)]

2
Continuity.AuthServer/DB/Documents/GuildMember.cs
View file

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
[Index(nameof(Id), IsUnique = true)] [Index(nameof(Id), IsUnique = true)]
public class GuildMember public class GuildMember

2
Continuity.AuthServer/DB/Documents/GuildRank.cs
View file

@ -1,6 +1,6 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
public enum GuildRank : byte public enum GuildRank : byte
{ {

2
Continuity.AuthServer/DB/Documents/InventoryItem.cs
View file

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
public class InventoryItem public class InventoryItem
{ {

2
Continuity.AuthServer/DB/Documents/InventoryTab.cs
View file

@ -1,6 +1,6 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
namespace Server.DB.Documents; namespace Continuity.AuthServer.DB.Documents;
public enum InventoryTab : byte public enum InventoryTab : byte
{ {

1
Continuity.AuthServer/DB/Migrations/20230814114414_Initial.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231114203409_AddGuildData.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs generated
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;

1
Continuity.AuthServer/DB/Migrations/WonderkingContextModelSnapshot.cs
View file

@ -1,5 +1,6 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

4
Continuity.AuthServer/DB/WonderkingContext.cs
View file

@ -1,10 +1,10 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.DB.Documents;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Server.DB.Documents;
namespace Server.DB; namespace Continuity.AuthServer.DB;
public class WonderkingContext : DbContext public class WonderkingContext : DbContext
{ {

4
Continuity.AuthServer/Dockerfile
View file

@ -9,9 +9,9 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
RUN echo "Target: $TARGETARCH" && echo "Build: $BUILDPLATFORM" RUN echo "Target: $TARGETARCH" && echo "Build: $BUILDPLATFORM"
WORKDIR /src WORKDIR /src
COPY ["Wonderking/Wonderking.csproj", "Wonderking/"]
COPY ["Continuity.AuthServer/Continuity.AuthServer.csproj", "Continuity.AuthServer/"] COPY ["Continuity.AuthServer/Continuity.AuthServer.csproj", "Continuity.AuthServer/"]
RUN dotnet restore "Wonderking/Wonderking.csproj" -a $TARGETARCH && dotnet restore "Server/Server.csproj" -a $TARGETARCH COPY ["Wonderking/Wonderking.csproj", "Wonderking/"]
RUN dotnet restore "Wonderking/Wonderking.csproj" -a $TARGETARCH && dotnet restore "Continuity.AuthServer/Continuity.AuthServer.csproj" -a $TARGETARCH
COPY . . COPY . .
FROM build AS publish FROM build AS publish

4
Continuity.AuthServer/LoggerMessages/LoginHandlerLoggerMessages.cs
View file

@ -1,9 +1,9 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.PacketHandlers;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Server.PacketHandlers;
namespace Server.LoggerMessages; namespace Continuity.AuthServer.LoggerMessages;
internal static partial class LoginHandlerLoggerMessages internal static partial class LoginHandlerLoggerMessages
{ {

2
Continuity.AuthServer/LoggerMessages/PacketLoggerMessages.cs
View file

@ -4,7 +4,7 @@ using JetBrains.Annotations;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Wonderking.Packets; using Wonderking.Packets;
namespace Server.LoggerMessages; namespace Continuity.AuthServer.LoggerMessages;
internal static partial class PacketLoggerMessages internal static partial class PacketLoggerMessages
{ {

4
Continuity.AuthServer/PacketHandlers/ChannelSelectionHandler.Projections.cs
View file

@ -1,10 +1,10 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Server.DB.Documents; using Continuity.AuthServer.DB.Documents;
using Wonderking.Game.Data.Character; using Wonderking.Game.Data.Character;
using Wonderking.Packets.Outgoing.Data; using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
public partial class ChannelSelectionHandler public partial class ChannelSelectionHandler
{ {

6
Continuity.AuthServer/PacketHandlers/ChannelSelectionHandler.cs
View file

@ -1,15 +1,15 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.DB;
using Continuity.AuthServer.DB.Documents;
using DotNext.Collections.Generic; using DotNext.Collections.Generic;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NetCoreServer; using NetCoreServer;
using Server.DB;
using Server.DB.Documents;
using Wonderking.Packets.Incoming; using Wonderking.Packets.Incoming;
using Wonderking.Packets.Outgoing; using Wonderking.Packets.Outgoing;
using Wonderking.Packets.Outgoing.Data; using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
public partial class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPacket> public partial class ChannelSelectionHandler : IPacketHandler<ChannelSelectionPacket>
{ {

8
Continuity.AuthServer/PacketHandlers/CharacterCreationHandler.cs
View file

@ -1,17 +1,17 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.DB;
using Continuity.AuthServer.DB.Documents;
using Continuity.AuthServer.Services;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NetCoreServer; using NetCoreServer;
using Server.DB;
using Server.DB.Documents;
using Server.Services;
using Wonderking.Game.Data.Character; using Wonderking.Game.Data.Character;
using Wonderking.Game.Mapping; using Wonderking.Game.Mapping;
using Wonderking.Packets.Incoming; using Wonderking.Packets.Incoming;
using Wonderking.Packets.Outgoing; using Wonderking.Packets.Outgoing;
using Wonderking.Packets.Outgoing.Data; using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
public class CharacterCreationHandler : IPacketHandler<CharacterCreationPacket> public class CharacterCreationHandler : IPacketHandler<CharacterCreationPacket>
{ {

4
Continuity.AuthServer/PacketHandlers/CharacterDeletionHandler.cs
View file

@ -1,12 +1,12 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NetCoreServer; using NetCoreServer;
using Server.DB;
using Wonderking.Packets.Incoming; using Wonderking.Packets.Incoming;
using Wonderking.Packets.Outgoing; using Wonderking.Packets.Outgoing;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
public class CharacterDeletionHandler : IPacketHandler<CharacterDeletePacket> public class CharacterDeletionHandler : IPacketHandler<CharacterDeletePacket>
{ {

2
Continuity.AuthServer/PacketHandlers/CharacterMappingItemEntry.cs
View file

@ -2,7 +2,7 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
[StructLayout(LayoutKind.Auto)] [StructLayout(LayoutKind.Auto)]
public struct CharacterMappingItemEntry public struct CharacterMappingItemEntry

4
Continuity.AuthServer/PacketHandlers/CharacterNameCheckHandler.cs
View file

@ -1,12 +1,12 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using Continuity.AuthServer.DB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NetCoreServer; using NetCoreServer;
using Server.DB;
using Wonderking.Packets.Incoming; using Wonderking.Packets.Incoming;
using Wonderking.Packets.Outgoing; using Wonderking.Packets.Outgoing;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
public class CharacterNameCheckHandler : IPacketHandler<CharacterNameCheckPacket> public class CharacterNameCheckHandler : IPacketHandler<CharacterNameCheckPacket>
{ {

2
Continuity.AuthServer/PacketHandlers/IPacketHandler.cs
View file

@ -5,7 +5,7 @@ using JetBrains.Annotations;
using NetCoreServer; using NetCoreServer;
using Wonderking.Packets; using Wonderking.Packets;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
[UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)] [UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
public interface IPacketHandler<in T> : IPacketHandler where T : IPacket public interface IPacketHandler<in T> : IPacketHandler where T : IPacket

11
Continuity.AuthServer/PacketHandlers/LoginHandler.cs
View file

@ -3,20 +3,19 @@
using System.Diagnostics; using System.Diagnostics;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using DotNext; using Continuity.AuthServer.DB;
using Continuity.AuthServer.DB.Documents;
using Continuity.AuthServer.LoggerMessages;
using Konscious.Security.Cryptography; using Konscious.Security.Cryptography;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NetCoreServer; using NetCoreServer;
using Server.DB;
using Server.DB.Documents;
using Server.LoggerMessages;
using Wonderking.Packets.Incoming; using Wonderking.Packets.Incoming;
using Wonderking.Packets.Outgoing; using Wonderking.Packets.Outgoing;
using Wonderking.Packets.Outgoing.Data; using Wonderking.Packets.Outgoing.Data;
namespace Server.PacketHandlers; namespace Continuity.AuthServer.PacketHandlers;
public class LoginHandler : IPacketHandler<LoginInfoPacket> public class LoginHandler : IPacketHandler<LoginInfoPacket>
{ {
@ -55,7 +54,7 @@ public class LoginHandler : IPacketHandler<LoginInfoPacket>
{ {
var salt = account.Salt; var salt = account.Salt;
var tempPasswordBytes = await GetPasswordHashAsync(packet.Password, salt, account.Id); var tempPasswordBytes = await GetPasswordHashAsync(packet.Password, salt, account.Id);
loginResponseReason = tempPasswordBytes.BitwiseEquals(account.Password) loginResponseReason = tempPasswordBytes.SequenceEqual(account.Password)
? LoginResponseReason.Ok ? LoginResponseReason.Ok
: LoginResponseReason.WrongPassword; : LoginResponseReason.WrongPassword;
} }

2
Continuity.AuthServer/Packets/RawPacket.cs
View file

@ -3,7 +3,7 @@
using MassTransit; using MassTransit;
using Wonderking.Packets; using Wonderking.Packets;
namespace Server.Packets; namespace Continuity.AuthServer.Packets;
[MessageUrn("packets")] [MessageUrn("packets")]
public class RawPacket public class RawPacket

4
Continuity.AuthServer/Program.cs
View file

@ -3,6 +3,8 @@
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Text.Json; using System.Text.Json;
using Continuity.AuthServer.DB;
using Continuity.AuthServer.Services;
using MassTransit; using MassTransit;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -15,8 +17,6 @@ using OpenTelemetry.Logs;
using OpenTelemetry.Metrics; using OpenTelemetry.Metrics;
using OpenTelemetry.Resources; using OpenTelemetry.Resources;
using OpenTelemetry.Trace; using OpenTelemetry.Trace;
using Server.DB;
using Server.Services;
using Wonderking.Game.Mapping; using Wonderking.Game.Mapping;
var builder = Host.CreateApplicationBuilder(); var builder = Host.CreateApplicationBuilder();

4
Continuity.AuthServer/Services/ItemObjectPoolService.cs
View file

@ -1,14 +1,14 @@
// Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License. // Copyright (c) 2023 Timothy Schenk. Subject to the GNU AGPL Version 3 License.
using System.Collections.Concurrent; using System.Collections.Concurrent;
using Continuity.AuthServer.DB.Documents;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Server.DB.Documents;
using Wonderking.Game.Data; using Wonderking.Game.Data;
using Wonderking.Game.Reader; using Wonderking.Game.Reader;
namespace Server.Services; namespace Continuity.AuthServer.Services;
public class ItemObjectPoolService : IHostedService public class ItemObjectPoolService : IHostedService
{ {

8
Continuity.AuthServer/Services/PacketDistributorService.cs
View file

@ -4,6 +4,9 @@ using System.Collections.Concurrent;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Diagnostics; using System.Diagnostics;
using System.Reflection; using System.Reflection;
using Continuity.AuthServer.LoggerMessages;
using Continuity.AuthServer.PacketHandlers;
using Continuity.AuthServer.Packets;
using DotNext.Collections.Generic; using DotNext.Collections.Generic;
using DotNext.Linq.Expressions; using DotNext.Linq.Expressions;
using DotNext.Metaprogramming; using DotNext.Metaprogramming;
@ -13,12 +16,9 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.VisualBasic.CompilerServices; using Microsoft.VisualBasic.CompilerServices;
using Newtonsoft.Json; using Newtonsoft.Json;
using Server.LoggerMessages;
using Server.PacketHandlers;
using Server.Packets;
using Wonderking.Packets; using Wonderking.Packets;
namespace Server.Services; namespace Continuity.AuthServer.Services;
using static CodeGenerator; using static CodeGenerator;
using static ExpressionBuilder; using static ExpressionBuilder;

2
Continuity.AuthServer/Services/WonderkingAuthServer.cs
View file

@ -7,7 +7,7 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NetCoreServer; using NetCoreServer;
namespace Server.Services; namespace Continuity.AuthServer.Services;
public class WonderkingAuthServer : TcpServer, IHostedService public class WonderkingAuthServer : TcpServer, IHostedService
{ {

6
Wonderking/Wonderking.csproj
View file

@ -14,7 +14,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/> <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.112"> <PackageReference Include="Meziantou.Analyzer" Version="2.0.139">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@ -22,12 +22,12 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.0"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14"> <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539"> <PackageReference Include="Nullable.Extended.Analyzer" Version="1.15.6169">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

2
global.json
View file

@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "8.0.100", "version": "8.0.101",
"rollForward": "latestMinor", "rollForward": "latestMinor",
"allowPrerelease": false "allowPrerelease": false
} }