Server security enhancement

Author: khodabande

Client/src/client/AI.java

@@ -6,6 +6,8 @@
 import util.Constants;
 import util.ServerConstants;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Random;
 
 /**
@@ -19,41 +21,27 @@
 public class AI {
 
     public void doTurn(World world) {
+        ArrayList<Cell> cells = world.getMyCells();
+        Object[] xs = cells.stream().map(Cell::getPos).toArray();
+        System.out.println(Arrays.toString(xs));
+
         long start = System.currentTimeMillis();
-        System.out.println(start);
-//        System.out.println(model.getTurnRemainingTime());
-        /*System.out.println(world.getMapSize().getWidth());
-        System.out.println(world.getMapSize().getHeight());
-        System.out.println(world.getMyId());
-        System.out.println(world.getMyName());
-        System.out.println(world.getTeams().length);
-        System.out.println(world.getTurn());*/
-        System.out.println(world.getMyCells().size());
         Random rnd = new Random();
-        for(Cell c : world.getMyCells())
-        {
+        for(Cell c : world.getMyCells()) {
             Block block = world.getMap().at(c.getPos());
-            if(c.getEnergy() >= Constants.CELL_MIN_ENERGY_FOR_MITOSIS && block.getType().equals(Constants.BLOCK_TYPE_MITOSIS))
-            {
+            if(c.getEnergy() >= Constants.CELL_MIN_ENERGY_FOR_MITOSIS && block.getType().equals(Constants.BLOCK_TYPE_MITOSIS)) {
                 System.out.println("mitosis");
                 System.out.println(c.getEnergy());
                 c.mitosis();
-            }
-            else if(c.getEnergy() < Constants.CELL_MAX_ENERGY && block.getType().equals(Constants.BLOCK_TYPE_RESOURCE) && block.getResource() > 0)
-            {
-                //System.out.println("gain");
-                //System.out.println(block.getResource());
-                //System.out.println(c.getEnergy());
+            } else if(c.getEnergy() < Constants.CELL_MAX_ENERGY && block.getType().equals(Constants.BLOCK_TYPE_RESOURCE) && block.getResource() > 0) {
                 c.gainResource();
             }
             else {
                 c.move(Direction.values()[rnd.nextInt(6)]);
             }
         }
-        //GameEvent event = new GameEvent();
-        //model.addEvent(event);
-        // you should fill this method
-        // an example is included here
+        long end = System.currentTimeMillis();
+        System.out.println(end - start);
     }
 
 }

Client/src/client/Main.java

@@ -9,4 +9,4 @@ public static void main(String[] args) {
         new Controller("resources/client/connection.conf").start();
     }
 
-}
+}

Mithosis/Mithosis.iml Mitosis/Mitosis.imlMithosis/Mithosis.iml renamed to Mitosis/Mitosis.iml

@@ -1,9 +1,13 @@
 package core;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import core.model.*;
 import model.*;
 import core.model.Map;
 import data.*;
+import server.core.model.Configs;
 import util.ServerConstants;
 import server.Server;
 import server.core.GameLogic;
@@ -12,16 +16,21 @@
 import network.data.Message;
 
 import javax.xml.bind.SchemaOutputResolver;
+import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.*;
 
 /**
  * Created by rajabzz on 2/2/15.
  */
 public class MitosisGameLogic implements GameLogic {
 
-    private final long GAME_LONG_TIME_TURN = 10;//TODO 500
+    private final long GAME_LONG_TIME_TURN;
 
+    private static final Charset CONFIG_ENCODING = Charset.forName("UTF-8");
+    private static final String RESOURCE_PATH_GAME = "resources/mitosis/game.conf";
     private static final String RESOURCE_PATH_CLIENTS = "resources/mitosis/clients.conf";
 
 
@@ -44,9 +53,10 @@ public static void main(String[] args) {
     public MitosisGameLogic(String[] options) throws IOException {
         super();
 
-        ctx = new Context(ServerConstants.TURN_INIT, options[0], RESOURCE_PATH_CLIENTS);
+        String gameConfig = new String(Files.readAllBytes(new File(RESOURCE_PATH_GAME).toPath()), CONFIG_ENCODING);
+        GAME_LONG_TIME_TURN = new Gson().fromJson(gameConfig, JsonObject.class).get("turn").getAsLong();
 
-        Map map = ctx.getMap();
+        ctx = new Context(ServerConstants.TURN_INIT, options[0], RESOURCE_PATH_CLIENTS);
 
         mTeams = ctx.getTeams();
     }
@@ -208,8 +218,7 @@ public void simulateEvents(Event[] terminalEvent, Event[] environmentEvent, Even
                     {
                         GameEvent event = new GameEvent(clientsEvent[i][j]);
                         //event.getGameObjectId() TODO CHECK OWNER
-                        if(ctx.getDynamicObject(event.getObjectId()).getTeamId() != i)
-                        {
+                        if(ctx.getDynamicObject(event.getObjectId()).getTeamId() != i) {
                             continue;
                         }
                         event.setTeamId(i);