Allow own entity and client ids, make verify a task

FabianTerhorst · FabianTerhorst · commit 55f8901bf7b8 · 2019-06-11T16:54:08.000+02:00
diff --git a/api/AltV.Net.Networking.Example/NonePlayerAuthenticationProvider.cs b/api/AltV.Net.Networking.Example/NonePlayerAuthenticationProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using AltV.Net.NetworkingEntity;
 using AltV.Net.NetworkingEntity.Elements.Entities;
 using AltV.Net.NetworkingEntity.Elements.Providers;
@@ -15,13 +16,13 @@ public NonePlayerAuthenticationProvider(WebSocket webSocket)
             this.webSocket = webSocket;
         }
 
-        public bool Verify(ManagedWebSocket managedWebSocket, string token, out INetworkingClient client)
+        public Task<bool> Verify(ManagedWebSocket managedWebSocket, string token, out INetworkingClient client)
         {
             client = AltNetworking.CreateClient();
             client.Token = token;
             client.WebSocket = managedWebSocket; //TODO: maybe do that automatically, but we would lost freedom
             managedWebSocket.Extra.TryAdd("client", client);
-            return true;
+            return Task.FromResult(true);
         }
 
         public INetworkingClient GetClient(ManagedWebSocket managedWebSocket)
diff --git a/api/AltV.Net.NetworkingEntity/AltNetworking.cs b/api/AltV.Net.NetworkingEntity/AltNetworking.cs
@@ -32,14 +32,20 @@ public static void Init(NetworkingModule networkingModule)
 
         public static INetworkingEntity CreateEntity(Position position, int dimension, float range,
             IDictionary<string, object> data)
+        {
+            return CreateEntity(Module.IdProvider.GetNext(), position, dimension, range, data);
+        }
+
+        public static INetworkingEntity CreateEntity(ulong id, Position position, int dimension, float range,
+            IDictionary<string, object> data)
         {
             var entity = new Entity.Entity {Position = position, Dimension = dimension, Range = range};
             foreach (var (key, value) in data)
             {
                 entity.Data[key] = MValueUtils.ToMValue(value);
             }
-            
-            return Module.EntityPool.Create(Module.Streamer, entity);
+
+            return Module.EntityPool.Create(id, Module.Streamer, entity);
         }
 
         public static void RemoveEntity(INetworkingEntity entity)
@@ -49,7 +55,12 @@ public static void RemoveEntity(INetworkingEntity entity)
 
         public static INetworkingClient CreateClient()
         {
-            return Module.ClientPool.Create();
+            return Module.ClientPool.Create(Module.TokenProvider.GetNext());
+        }
+
+        public static INetworkingClient CreateClient(string token)
+        {
+            return Module.ClientPool.Create(token);
         }
 
         public static void RemoveClient(INetworkingClient client)
diff --git a/api/AltV.Net.NetworkingEntity/ClientEntityStreamingHandler.cs b/api/AltV.Net.NetworkingEntity/ClientEntityStreamingHandler.cs
@@ -28,7 +28,7 @@ public ClientEntityStreamingHandler(IAuthenticationProvider authenticationProvid
 
         public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult result, byte[] data)
         {
-            Task.Run(() =>
+            Task.Run(async () =>
             {
                 var clientEvent = ClientEvent.Parser.ParseFrom(data);
                 if (clientEvent == null) return;
@@ -39,7 +39,7 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult
                 {
                     var token = authEvent.Token;
                     if (token == null) return;
-                    var verified = authenticationProvider.Verify(managedWebSocket, token, out var client);
+                    var verified = await authenticationProvider.Verify(managedWebSocket, token, out var client);
                     if (!verified)
                     {
                         return;
@@ -56,7 +56,7 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult
                     }
 
                     sendEvent.Send = currSendEvent;
-                    managedWebSocket.SendAsync(sendEvent.ToByteArray(), true);
+                    await managedWebSocket.SendAsync(sendEvent.ToByteArray(), true);
                 }
                 else if (streamIn != null)
                 {
@@ -85,7 +85,7 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult
                             }
 
                             var serverEvent = new ServerEvent {MultipleDataChange = multipleDataChangeEvent};
-                            managedWebSocket.SendAsync(serverEvent.ToByteArray(), true);
+                            await managedWebSocket.SendAsync(serverEvent.ToByteArray(), true);
                         }
                     }
                 }
diff --git a/api/AltV.Net.NetworkingEntity/Elements/Pools/INetworkingClientPool.cs b/api/AltV.Net.NetworkingEntity/Elements/Pools/INetworkingClientPool.cs
@@ -7,6 +7,8 @@ public interface INetworkingClientPool
     {
         IDictionary<string, INetworkingClient> Clients { get; }
 
+        INetworkingClient Create(string token);
+        
         INetworkingClient Create();
 
         bool Add(INetworkingClient client);
diff --git a/api/AltV.Net.NetworkingEntity/Elements/Pools/INetworkingEntityPool.cs b/api/AltV.Net.NetworkingEntity/Elements/Pools/INetworkingEntityPool.cs
@@ -7,6 +7,8 @@ public interface INetworkingEntityPool
     {
         IDictionary<ulong, INetworkingEntity> Entities { get; }
 
+        INetworkingEntity Create(ulong id, IEntityStreamer entityStreamer, Entity.Entity streamedEntity);
+
         INetworkingEntity Create(IEntityStreamer entityStreamer, Entity.Entity streamedEntity);
 
         bool Add(INetworkingEntity entity);
diff --git a/api/AltV.Net.NetworkingEntity/Elements/Pools/NetworkingClientPool.cs b/api/AltV.Net.NetworkingEntity/Elements/Pools/NetworkingClientPool.cs
@@ -22,6 +22,13 @@ public NetworkingClientPool(IIdProvider<string> idProvider, INetworkingClientFac
             this.factory = factory;
         }
 
+        public INetworkingClient Create(string token)
+        {
+            var entity = factory.Create(token);
+            Add(entity);
+            return entity;
+        }
+
         public INetworkingClient Create()
         {
             var entity = factory.Create(idProvider.GetNext());
diff --git a/api/AltV.Net.NetworkingEntity/Elements/Pools/NetworkingEntityPool.cs b/api/AltV.Net.NetworkingEntity/Elements/Pools/NetworkingEntityPool.cs
@@ -21,9 +21,12 @@ public NetworkingEntityPool(IIdProvider<ulong> idProvider, INetworkingEntityFact
             this.factory = factory;
         }
 
-        public INetworkingEntity Create(IEntityStreamer entityStreamer, Entity.Entity streamedEntity)
+        public INetworkingEntity Create(IEntityStreamer entityStreamer, Entity.Entity streamedEntity) =>
+            Create(idProvider.GetNext(), entityStreamer, streamedEntity);
+
+        public INetworkingEntity Create(ulong id, IEntityStreamer entityStreamer, Entity.Entity streamedEntity)
         {
-            streamedEntity.Id = idProvider.GetNext();
+            streamedEntity.Id = id;
             var entity = factory.Create(entityStreamer, streamedEntity);
             Add(entity);
             return entity;
@@ -56,7 +59,7 @@ public void Remove(ulong id)
                     return;
                 }
             }
-            
+
             OnRemove(removedEntity);
 
             if (removedEntity is IInternalNetworkingEntity internalNetworkingEntity)
diff --git a/api/AltV.Net.NetworkingEntity/Elements/Providers/AuthenticationProvider.cs b/api/AltV.Net.NetworkingEntity/Elements/Providers/AuthenticationProvider.cs
@@ -21,7 +21,8 @@ public class AuthenticationProvider : IAuthenticationProvider
 
         private readonly Dictionary<IPlayer, string> playerTokenAccess = new Dictionary<IPlayer, string>();
 
-        public AuthenticationProvider(string ip, int port, WebSocket webSocket) : this("ws://" + (ip ?? GetIpAddress()) + $":{port}/",
+        public AuthenticationProvider(string ip, int port, WebSocket webSocket) : this(
+            "ws://" + (ip ?? GetIpAddress()) + $":{port}/",
             webSocket)
         {
         }
@@ -76,12 +77,12 @@ await webSocket.CloseWebSocketAsync(clientWebSocket, WebSocketCloseStatus.Normal
             };
         }
 
-        public bool Verify(ManagedWebSocket webSocket, string token, out INetworkingClient client)
+        public Task<bool> Verify(ManagedWebSocket webSocket, string token, out INetworkingClient client)
         {
-            if (!AltNetworking.Module.ClientPool.TryGet(token, out client)) return false;
+            if (!AltNetworking.Module.ClientPool.TryGet(token, out client)) return Task.FromResult(false);
             client.WebSocket = webSocket; //TODO: check if already has websocket ect.
             webSocket.Extra[ClientExtra] = client;
-            return true;
+            return Task.FromResult(true);
         }
 
         public INetworkingClient GetClient(ManagedWebSocket webSocket)
@@ -111,7 +112,7 @@ public bool VerifyPosition(INetworkingClient client, INetworkingEntity entity, b
             // Can be extended when more trustful position checking is needed 
             return true;
         }
-        
+
         private static string GetIpAddress()
         {
             var ipHostInfo = Dns.GetHostEntry(Dns.GetHostName()); // `Dns.Resolve()` method is deprecated.
diff --git a/api/AltV.Net.NetworkingEntity/Elements/Providers/IAuthenticationProvider.cs b/api/AltV.Net.NetworkingEntity/Elements/Providers/IAuthenticationProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using AltV.Net.NetworkingEntity.Elements.Entities;
 using net.vieapps.Components.WebSockets;
 
@@ -16,7 +17,7 @@ public interface IAuthenticationProvider
         /// <param name="token">Token received via AuthEvent</param>
         /// <param name="client">The client that matches the authentication</param>
         /// <returns></returns>
-        bool Verify(ManagedWebSocket webSocket, string token, out INetworkingClient client);
+        Task<bool> Verify(ManagedWebSocket webSocket, string token, out INetworkingClient client);
 
         /// <summary>
         /// Returns the client that is designated to a given websocket
diff --git a/api/AltV.Net.NetworkingEntity/NetworkingModule.cs b/api/AltV.Net.NetworkingEntity/NetworkingModule.cs
@@ -14,6 +14,10 @@ public class NetworkingModule
 
         public readonly IEntityStreamer Streamer;
 
+        public readonly IIdProvider<ulong> IdProvider;
+
+        public readonly IIdProvider<string> TokenProvider;
+
         public NetworkingModule(string ip = null, int port = 46429) : this(ip, port, new IdProvider(),
             new NetworkingEntityFactory(),
             new ClientTokenProvider(), new NetworkingClientFactory(), new AuthenticationProviderFactory(),
@@ -27,6 +31,8 @@ public NetworkingModule(string ip, int port, IIdProvider<ulong> idProvider,
             IAuthenticationProviderFactory authenticationProviderFactory,
             IStreamingHandlerFactory streamingHandlerFactory)
         {
+            IdProvider = idProvider;
+            TokenProvider = tokenProvider;
             EntityPool = new NetworkingEntityPool(idProvider, entityFactory);
             ClientPool = new NetworkingClientPool(tokenProvider, clientFactory);
             Streamer = new EntityStreamer();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`	`using AltV.Net.NetworkingEntity;`
`3`	`4`	`using AltV.Net.NetworkingEntity.Elements.Entities;`
`4`	`5`	`using AltV.Net.NetworkingEntity.Elements.Providers;`
`@@ -15,13 +16,13 @@ public NonePlayerAuthenticationProvider(WebSocket webSocket)`
`15`	`16`	`this.webSocket = webSocket;`
`16`	`17`	`}`
`17`	`18`
`18`		`- public bool Verify(ManagedWebSocket managedWebSocket, string token, out INetworkingClient client)`
	`19`	`+ public Task<bool> Verify(ManagedWebSocket managedWebSocket, string token, out INetworkingClient client)`
`19`	`20`	`{`
`20`	`21`	`client = AltNetworking.CreateClient();`
`21`	`22`	`client.Token = token;`
`22`	`23`	`client.WebSocket = managedWebSocket; //TODO: maybe do that automatically, but we would lost freedom`
`23`	`24`	`managedWebSocket.Extra.TryAdd("client", client);`
`24`		`- return true;`
	`25`	`+ return Task.FromResult(true);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public INetworkingClient GetClient(ManagedWebSocket managedWebSocket)`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,20 @@ public static void Init(NetworkingModule networkingModule)`
`32`	`32`
`33`	`33`	`public static INetworkingEntity CreateEntity(Position position, int dimension, float range,`
`34`	`34`	`IDictionary<string, object> data)`
	`35`	`+ {`
	`36`	`+ return CreateEntity(Module.IdProvider.GetNext(), position, dimension, range, data);`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ public static INetworkingEntity CreateEntity(ulong id, Position position, int dimension, float range,`
	`40`	`+ IDictionary<string, object> data)`
`35`	`41`	`{`
`36`	`42`	`var entity = new Entity.Entity {Position = position, Dimension = dimension, Range = range};`
`37`	`43`	`foreach (var (key, value) in data)`
`38`	`44`	`{`
`39`	`45`	`entity.Data[key] = MValueUtils.ToMValue(value);`
`40`	`46`	`}`
`41`		`-`
`42`		`- return Module.EntityPool.Create(Module.Streamer, entity);`
	`47`	`+`
	`48`	`+ return Module.EntityPool.Create(id, Module.Streamer, entity);`
`43`	`49`	`}`
`44`	`50`
`45`	`51`	`public static void RemoveEntity(INetworkingEntity entity)`
`@@ -49,7 +55,12 @@ public static void RemoveEntity(INetworkingEntity entity)`
`49`	`55`
`50`	`56`	`public static INetworkingClient CreateClient()`
`51`	`57`	`{`
`52`		`- return Module.ClientPool.Create();`
	`58`	`+ return Module.ClientPool.Create(Module.TokenProvider.GetNext());`
	`59`	`+ }`
	`60`	`+`
	`61`	`+ public static INetworkingClient CreateClient(string token)`
	`62`	`+ {`
	`63`	`+ return Module.ClientPool.Create(token);`
`53`	`64`	`}`
`54`	`65`
`55`	`66`	`public static void RemoveClient(INetworkingClient client)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public ClientEntityStreamingHandler(IAuthenticationProvider authenticationProvid`
`28`	`28`
`29`	`29`	`public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult result, byte[] data)`
`30`	`30`	`{`
`31`		`- Task.Run(() =>`
	`31`	`+ Task.Run(async () =>`
`32`	`32`	`{`
`33`	`33`	`var clientEvent = ClientEvent.Parser.ParseFrom(data);`
`34`	`34`	`if (clientEvent == null) return;`
`@@ -39,7 +39,7 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult`
`39`	`39`	`{`
`40`	`40`	`var token = authEvent.Token;`
`41`	`41`	`if (token == null) return;`
`42`		`- var verified = authenticationProvider.Verify(managedWebSocket, token, out var client);`
	`42`	`+ var verified = await authenticationProvider.Verify(managedWebSocket, token, out var client);`
`43`	`43`	`if (!verified)`
`44`	`44`	`{`
`45`	`45`	`return;`
`@@ -56,7 +56,7 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`sendEvent.Send = currSendEvent;`
`59`		`- managedWebSocket.SendAsync(sendEvent.ToByteArray(), true);`
	`59`	`+ await managedWebSocket.SendAsync(sendEvent.ToByteArray(), true);`
`60`	`60`	`}`
`61`	`61`	`else if (streamIn != null)`
`62`	`62`	`{`
`@@ -85,7 +85,7 @@ public void OnMessage(ManagedWebSocket managedWebSocket, WebSocketReceiveResult`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`var serverEvent = new ServerEvent {MultipleDataChange = multipleDataChangeEvent};`
`88`		`- managedWebSocket.SendAsync(serverEvent.ToByteArray(), true);`
	`88`	`+ await managedWebSocket.SendAsync(serverEvent.ToByteArray(), true);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ public interface INetworkingClientPool`
`7`	`7`	`{`
`8`	`8`	`IDictionary<string, INetworkingClient> Clients { get; }`
`9`	`9`
	`10`	`+ INetworkingClient Create(string token);`
	`11`	`+`
`10`	`12`	`INetworkingClient Create();`
`11`	`13`
`12`	`14`	`bool Add(INetworkingClient client);`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ public interface INetworkingEntityPool`
`7`	`7`	`{`
`8`	`8`	`IDictionary<ulong, INetworkingEntity> Entities { get; }`
`9`	`9`
	`10`	`+ INetworkingEntity Create(ulong id, IEntityStreamer entityStreamer, Entity.Entity streamedEntity);`
	`11`	`+`
`10`	`12`	`INetworkingEntity Create(IEntityStreamer entityStreamer, Entity.Entity streamedEntity);`
`11`	`13`
`12`	`14`	`bool Add(INetworkingEntity entity);`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,13 @@ public NetworkingClientPool(IIdProvider<string> idProvider, INetworkingClientFac`
`22`	`22`	`this.factory = factory;`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ public INetworkingClient Create(string token)`
	`26`	`+ {`
	`27`	`+ var entity = factory.Create(token);`
	`28`	`+ Add(entity);`
	`29`	`+ return entity;`
	`30`	`+ }`
	`31`	`+`
`25`	`32`	`public INetworkingClient Create()`
`26`	`33`	`{`
`27`	`34`	`var entity = factory.Create(idProvider.GetNext());`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,12 @@ public NetworkingEntityPool(IIdProvider<ulong> idProvider, INetworkingEntityFact`
`21`	`21`	`this.factory = factory;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public INetworkingEntity Create(IEntityStreamer entityStreamer, Entity.Entity streamedEntity)`
	`24`	`+ public INetworkingEntity Create(IEntityStreamer entityStreamer, Entity.Entity streamedEntity) =>`
	`25`	`+ Create(idProvider.GetNext(), entityStreamer, streamedEntity);`
	`26`	`+`
	`27`	`+ public INetworkingEntity Create(ulong id, IEntityStreamer entityStreamer, Entity.Entity streamedEntity)`
`25`	`28`	`{`
`26`		`- streamedEntity.Id = idProvider.GetNext();`
	`29`	`+ streamedEntity.Id = id;`
`27`	`30`	`var entity = factory.Create(entityStreamer, streamedEntity);`
`28`	`31`	`Add(entity);`
`29`	`32`	`return entity;`
`@@ -56,7 +59,7 @@ public void Remove(ulong id)`
`56`	`59`	`return;`
`57`	`60`	`}`
`58`	`61`	`}`
`59`		`-`
	`62`	`+`
`60`	`63`	`OnRemove(removedEntity);`
`61`	`64`
`62`	`65`	`if (removedEntity is IInternalNetworkingEntity internalNetworkingEntity)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public class AuthenticationProvider : IAuthenticationProvider`
`21`	`21`
`22`	`22`	`private readonly Dictionary<IPlayer, string> playerTokenAccess = new Dictionary<IPlayer, string>();`
`23`	`23`
`24`		`- public AuthenticationProvider(string ip, int port, WebSocket webSocket) : this("ws://" + (ip ?? GetIpAddress()) + $":{port}/",`
	`24`	`+ public AuthenticationProvider(string ip, int port, WebSocket webSocket) : this(`
	`25`	`+ "ws://" + (ip ?? GetIpAddress()) + $":{port}/",`
`25`	`26`	`webSocket)`
`26`	`27`	`{`
`27`	`28`	`}`
`@@ -76,12 +77,12 @@ await webSocket.CloseWebSocketAsync(clientWebSocket, WebSocketCloseStatus.Normal`
`76`	`77`	`};`
`77`	`78`	`}`
`78`	`79`
`79`		`- public bool Verify(ManagedWebSocket webSocket, string token, out INetworkingClient client)`
	`80`	`+ public Task<bool> Verify(ManagedWebSocket webSocket, string token, out INetworkingClient client)`
`80`	`81`	`{`
`81`		`- if (!AltNetworking.Module.ClientPool.TryGet(token, out client)) return false;`
	`82`	`+ if (!AltNetworking.Module.ClientPool.TryGet(token, out client)) return Task.FromResult(false);`
`82`	`83`	`client.WebSocket = webSocket; //TODO: check if already has websocket ect.`
`83`	`84`	`webSocket.Extra[ClientExtra] = client;`
`84`		`- return true;`
	`85`	`+ return Task.FromResult(true);`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`public INetworkingClient GetClient(ManagedWebSocket webSocket)`
`@@ -111,7 +112,7 @@ public bool VerifyPosition(INetworkingClient client, INetworkingEntity entity, b`
`111`	`112`	`// Can be extended when more trustful position checking is needed`
`112`	`113`	`return true;`
`113`	`114`	`}`
`114`		`-`
	`115`	`+`
`115`	`116`	`private static string GetIpAddress()`
`116`	`117`	`{`
`117`	`118`	var ipHostInfo = Dns.GetHostEntry(Dns.GetHostName()); // `Dns.Resolve()` method is deprecated.