added direct user-addressing

Author: USE-TO

Dockerfile

@@ -12,4 +12,4 @@ ADD . /app/
 
 RUN mvn clean install
 
-CMD java -jar target/server-0.0.3-SNAPSHOT-jar-with-dependencies.jar
+CMD java -jar target/server-0.0.4-SNAPSHOT-jar-with-dependencies.jar

README.md

@@ -11,7 +11,7 @@ Build the game-server by using `mvn clean install` .
 
 ### Execute
 
-Run it with `java -jar target/server-0.0.3-SNAPSHOT.jar` .
+Run it with `java -jar target/server-0.0.4-SNAPSHOT.jar` .
 
 ### Environment variables
 

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>net.cryptic-game</groupId>
 	<artifactId>server</artifactId>
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.4-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>cryptic-game-server</name>

src/main/java/net/cryptic_game/server/client/Client.java

@@ -68,7 +68,7 @@ public static Client getClient(Channel channel) {
 
 	public static Client getClient(User user) {
 		for (Client client : clients) {
-			if (client.getUser().equals(user)) {
+			if (client.getUser().getUUID().equals(user.getUUID())) {
 				return client;
 			}
 		}

src/main/java/net/cryptic_game/server/http/HTTPServerHandler.java

@@ -50,55 +50,64 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 				return;
 			}
 
-			String auth = request.headers().get("Authorization");
+			boolean authSuccess = false;
 
-			if (auth == null) {
-				error(channel, "permissions denied");
-				return;
-			} else if (auth.split(" ").length != 2 || !auth.split(" ")[0].equals("Basic")) {
-				error(channel, "invalid authorization");
-			}
+			if (!Config.getBoolean(DefaultConfig.AUTH_ENABLED)) {
+				String auth = request.headers().get("Authorization");
 
-			String tuple = Base64.decode(Unpooled.copiedBuffer(auth.split(" ")[1].getBytes(Charset.forName("utf-8")))).toString(Charset.forName("utf-8"));
+				if (auth == null) {
+					error(channel, "permissions denied");
+					return;
+				} else if (auth.split(" ").length != 2 || !auth.split(" ")[0].equals("Basic")) {
+					error(channel, "invalid authorization");
+				}
 
-			if (tuple.contains(":")) {
-				String name = tuple.split(":")[0];
-				String password = tuple.substring(name.length() + 1, tuple.length());
+				String tuple = Base64
+						.decode(Unpooled.copiedBuffer(auth.split(" ")[1].getBytes(Charset.forName("utf-8"))))
+						.toString(Charset.forName("utf-8"));
 
-				User user = User.get(name);
+				if (tuple.contains(":")) {
+					String name = tuple.split(":")[0];
+					String password = tuple.substring(name.length() + 1, tuple.length());
 
-				if (user != null && user.checkPassword(password) || !Config.getBoolean(DefaultConfig.AUTH_ENABLED)) {
-					client.setUser(user);
+					User user = User.get(name);
 
-					String payload = request.content().toString(Charset.forName("utf-8"));
+					if (user.checkPassword(password)) {
+						authSuccess = true;
+						client.setUser(user);
+					}
+				}
+			}
 
-					try {
-						JSONObject input = (JSONObject) new JSONParser().parse(payload);
+			if (authSuccess || !Config.getBoolean(DefaultConfig.AUTH_ENABLED)) {
+				String payload = request.content().toString(Charset.forName("utf-8"));
 
-						if (request.uri().length() > 1) {
-							String[] args = request.uri().substring(1).split("/");
+				try {
+					JSONObject input = (JSONObject) new JSONParser().parse(payload);
 
-							if (args.length > 0) {
-								MicroService ms = MicroService.get(args[0]);
+					if (request.uri().length() > 1) {
+						String[] args = request.uri().substring(1).split("/");
 
-								if (ms != null) {
-									JSONArray endpoint = new JSONArray();
+						if (args.length > 0) {
+							MicroService ms = MicroService.get(args[0]);
 
-									for (int i = 1; i < args.length; i++) {
-										endpoint.add(args[i]);
-									}
+							if (ms != null) {
+								JSONArray endpoint = new JSONArray();
 
-									ms.receive(client, endpoint, input);
-									return;
+								for (int i = 1; i < args.length; i++) {
+									endpoint.add(args[i]);
 								}
+
+								ms.receive(client, endpoint, input);
+								return;
 							}
 						}
-					} catch (ParseException e) {
 					}
-				} else {
-					error(channel, "permissions denied");
-					return;
+				} catch (ParseException e) {
 				}
+			} else {
+				error(channel, "permissions denied");
+				return;
 			}
 
 			error(channel, "unsupportet format");

src/main/java/net/cryptic_game/server/microservice/MicroService.java

@@ -14,6 +14,7 @@
 import net.cryptic_game.server.config.Config;
 import net.cryptic_game.server.config.DefaultConfig;
 import net.cryptic_game.server.socket.SocketServerUtils;
+import net.cryptic_game.server.user.User;
 
 /**
  * microservice wrapper
@@ -68,7 +69,7 @@ public void receive(Client client, JSONArray endpoint, JSONObject input) {
 				jsonMap.put("user", client.getUser().getUUID().toString());
 			}
 		} else {
-			jsonMap.put("user", "");
+			jsonMap.put("user", UUID.fromString("00000000-0000-0000-0000-000000000000").toString());
 		}
 
 		SocketServerUtils.sendJson(this.getChannel(), new JSONObject(jsonMap));
@@ -175,4 +176,16 @@ public static MicroService get(Channel channel) {
 		return null;
 	}
 
+	public static void sendToUser(UUID user, JSONObject data) {
+		User userAccount = User.get(user);
+
+		if (userAccount != null) {
+			Client clientOfUser = Client.getClient(userAccount);
+			
+			if (clientOfUser != null) {
+				clientOfUser.send(data);
+			}
+		}
+	}
+
 }

src/main/java/net/cryptic_game/server/microservice/MicroServiceHandler.java

@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -26,11 +27,19 @@ protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Except
 					String action = (String) obj.get("action");
 
 					if (action.equals("register")) {
-						if (obj.containsKey("name") && obj.get("name") instanceof String) {							
+						if (obj.containsKey("name") && obj.get("name") instanceof String) {
 							MicroService.register((String) obj.get("name"), ctx.channel());
 						} else {
 							this.error(ctx.channel(), "name not found");
 						}
+					} else if (action.equals("address")) {
+						if (obj.containsKey("user") && obj.get("user") instanceof String && obj.containsKey("data")
+								&& obj.get("data") instanceof JSONObject) {
+							MicroService.sendToUser(UUID.fromString((String) obj.get("user")),
+									(JSONObject) obj.get("data"));
+						} else {
+							this.error(ctx.channel(), "name not found");
+						}
 					} else {
 						this.error(ctx.channel(), "unknown action");
 					}