MV Auth: Pass IP to content

Space-Station-Multiverse · Aug 15, 2024 · 6f8a9a1 · 6f8a9a1
1 parent 3836157
commit 6f8a9a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Robust.Shared/Network/IServerUserDataAssociation.cs b/Robust.Shared/Network/IServerUserDataAssociation.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Net;
 using System.Threading.Tasks;
 
 namespace Robust.Shared.Network;
@@ -12,7 +13,8 @@ namespace Robust.Shared.Network;
 /// </summary>
 public interface IServerUserDataAssociation
 {
-    public Task<AssociationResult> AttemptUserDataFromPublicKey(ImmutableArray<byte> publicKey, ImmutableArray<byte> hWId, string requestedUserName);
+    public Task<AssociationResult> AttemptUserDataFromPublicKey(ImmutableArray<byte> publicKey,
+        ImmutableArray<byte> hWId, string requestedUserName, IPAddress connectingAddress);
 
     public struct AssociationResult
     {

diff --git a/Robust.Shared/Network/NetManager.ServerAuth.cs b/Robust.Shared/Network/NetManager.ServerAuth.cs
@@ -235,7 +235,7 @@ private async void HandleHandshake(NetPeerData peer, NetConnection connection)
 
                     var serverUserDataAssociation = IoCManager.Resolve<IServerUserDataAssociation>();
                     var associationResult = await serverUserDataAssociation.AttemptUserDataFromPublicKey(
-                        userPublicKeyImmutableBytes, msgLogin.HWId, msgLogin.PreferredUserName);
+                        userPublicKeyImmutableBytes, msgLogin.HWId, msgLogin.PreferredUserName, ip);
 
                     if (associationResult.success && associationResult.userData != null)
                     {