Security changes: placement verification, banning, unfinished admins

core/src/io/anuke/mindustry/net/Administration.java

@@ -0,0 +1,114 @@
+package io.anuke.mindustry.net;
+
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.ObjectMap;
+import io.anuke.ucore.core.Settings;
+
+public class Administration {
+    private Json json = new Json();
+    private Array<String> bannedIPS = new Array<>();
+    private Array<String> admins = new Array<>();
+    private ObjectMap<String, String> known = new ObjectMap<>();
+
+    public Administration(){
+        Settings.defaultList(
+            "bans", "{}",
+            "admins", "{}",
+            "knownIPs", "{}"
+        );
+
+        load();
+    }
+
+    /**Sets last known name for an IP.*/
+    public void setKnownName(String ip, String name){
+        known.put(ip, name);
+        saveKnown();
+    }
+
+    /**Returns the last known name for an IP. Returns 'unknown' if this IP has an unknown username.*/
+    public String getLastName(String ip){
+        return known.get(ip, "unknown");
+    }
+
+    /**Returns list of banned IPs.*/
+    public Array<String> getBanned(){
+        return bannedIPS;
+    }
+
+    /**Bans a player by IP; returns whether this player was already banned.*/
+    public boolean banPlayer(String ip){
+        if(bannedIPS.contains(ip, false))
+            return false;
+        bannedIPS.add(ip);
+        saveBans();
+
+        return true;
+    }
+
+    /**Unbans a player by IP; returns whether this player was banned in the first place..*/
+    public boolean unbanPlayer(String ip){
+        if(!bannedIPS.contains(ip, false))
+            return false;
+        bannedIPS.removeValue(ip, false);
+        saveBans();
+
+        return true;
+    }
+
+    /**Returns list of banned IPs.*/
+    public Array<String> getAdmins(){
+        return admins;
+    }
+
+    /**Makes a player an admin. Returns whether this player was already an admin.*/
+    public boolean adminPlayer(String ip){
+        if(admins.contains(ip, false))
+            return false;
+        admins.add(ip);
+        saveAdmins();
+
+        return true;
+    }
+
+    /**Makes a player no longer an admin. Returns whether this player was an admin in the first place.*/
+    public boolean unAdminPlayer(String ip){
+        if(!admins.contains(ip, false))
+            return false;
+        admins.removeValue(ip, false);
+        saveAdmins();
+
+        return true;
+    }
+
+    public boolean isBanned(String ip){
+        return bannedIPS.contains(ip, false);
+    }
+
+    public boolean isAdmin(String ip){
+        return admins.contains(ip, false);
+    }
+
+    private void saveKnown(){
+        Settings.putString("knownIPs", json.toJson(known));
+        Settings.save();
+    }
+
+    private void saveBans(){
+        Settings.putString("bans", json.toJson(bannedIPS));
+        Settings.save();
+    }
+
+    private void saveAdmins(){
+        Settings.putString("admins", json.toJson(admins));
+        Settings.save();
+    }
+
+    private void load(){
+        bannedIPS = json.fromJson(Array.class, Settings.getString("bans"));
+        admins = json.fromJson(Array.class, Settings.getString("admins"));
+        known = json.fromJson(ObjectMap.class, Settings.getString("knownIPs"));
+    }
+
+}

core/src/io/anuke/mindustry/net/Host.java

@@ -3,11 +3,15 @@ package io.anuke.mindustry.net;
 public class Host {
     public final String name;
     public final String address;
+    public final String mapname;
+    public final int wave;
     public final int players;
 
-    public Host(String name, String address, int players){
+    public Host(String name, String address, String mapname, int wave, int players){
         this.name = name;
         this.address = address;
         this.players = players;
+        this.mapname = mapname;
+        this.wave = wave;
     }
 }

core/src/io/anuke/mindustry/net/NetEvents.java

@@ -13,7 +13,6 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.entities.Entity;
 
 import static io.anuke.mindustry.Vars.netCommon;
-import static io.anuke.mindustry.Vars.ui;
 
 public class NetEvents {
 
@@ -99,8 +98,6 @@ public class NetEvents {
         packet.name = Vars.player.name;
         packet.id = Vars.player.id;
         Net.send(packet, SendMode.tcp);
-
-        ui.chatfrag.addMessage(packet.text, netCommon.colorizeName(Vars.player.id, Vars.player.name));
     }
 
     public static void handleShoot(Weapon weapon, float x, float y, float angle){

core/src/io/anuke/mindustry/net/Packets.java

@@ -371,7 +371,7 @@ public class Packets {
     }
 
     public enum KickReason{
-        kick, invalidPassword, clientOutdated, serverOutdated
+        kick, invalidPassword, clientOutdated, serverOutdated, banned
     }
 
     public static class UpgradePacket implements Packet{
@@ -558,4 +558,22 @@ public class Packets {
             itemid = buffer.get();
         }
     }
+
+    public static class NetErrorPacket implements Packet{
+        public String message;
+
+        @Override
+        public void write(ByteBuffer buffer) {
+            buffer.putShort((short)message.getBytes().length);
+            buffer.put(message.getBytes());
+        }
+
+        @Override
+        public void read(ByteBuffer buffer) {
+            short length = buffer.getShort();
+            byte[] bytes = new byte[length];
+            buffer.get(bytes);
+            message = new String(bytes);
+        }
+    }
 }

core/src/io/anuke/mindustry/net/Registrator.java

@@ -40,7 +40,8 @@ public class Registrator {
             EntitySpawnPacket.class,
             ItemTransferPacket.class,
             ItemSetPacket.class,
-            ItemOffloadPacket.class
+            ItemOffloadPacket.class,
+            NetErrorPacket.class,
     };
     private static ObjectIntMap<Class<?>> ids = new ObjectIntMap<>();