Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added UUID banning

Browse Source
This commit is contained in:
Anuken
2018-03-06 19:22:50 -05:00
parent 1038f35883
commit 686e526e8c
15 changed files with 242 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -1,6 +1,5 @@
package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.IntSet;
@@ -68,11 +67,20 @@ public class NetClient extends Module {
c.name = player.name;
c.android = android;
c.color = Color.rgba8888(player.color);
c.uuid = Platform.instance.getUUID();
if(c.uuid == null){
ui.showError("$text.invalidid");
ui.loadfrag.hide();
disconnectQuietly();
return;
}
Net.send(c, SendMode.tcp);
Timers.runTask(dataTimeout, () -> {
if (!gotData) {
Gdx.app.error("Mindustry", "Failed to load data!");
Log.err("Failed to load data!");
ui.loadfrag.hide();
Net.disconnect();
}

20
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -1,9 +1,6 @@
package io.anuke.mindustry.core;
import com.badlogic.gdx.utils.ByteArray;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.TimeUtils;
import com.badlogic.gdx.utils.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.SyncEntity;
@@ -51,18 +48,27 @@ public class NetServer extends Module{
Events.on(GameOverEvent.class, () -> weapons.clear());
Net.handleServer(Connect.class, (id, connect) -> {
if(admins.isBanned(connect.addressTCP)){
if(admins.isIPBanned(connect.addressTCP)){
Net.kickConnection(id, KickReason.banned);
}
});
Net.handleServer(ConnectPacket.class, (id, packet) -> {
String uuid = new String(Base64Coder.encode(packet.uuid));
if(Net.getConnection(id) == null ||
admins.isBanned(Net.getConnection(id).address)) return;
admins.isIPBanned(Net.getConnection(id).address)) return;
if(admins.isIDBanned(uuid)){
Net.kickConnection(id, KickReason.banned);
return;
}
String ip = Net.getConnection(id).address;
admins.setKnownName(ip, packet.name);
admins.setKnownIP(uuid, ip);
admins.getTrace(ip).uuid = uuid;
admins.getTrace(ip).android = packet.android;
if(packet.version != Version.build && Version.build != -1 && packet.version != -1){
Net.kickConnection(id, packet.version > Version.build ? KickReason.serverOutdated : KickReason.clientOutdated);
@@ -270,7 +276,7 @@ public class NetServer extends Module{
String ip = Net.getConnection(other.clientid).address;
if(packet.action == AdminAction.ban){
admins.banPlayer(ip);
admins.banPlayerIP(ip);
Net.kickConnection(other.clientid, KickReason.banned);
Log.info("&lc{0} has banned {1}.", player.name, other.name);
}else if(packet.action == AdminAction.kick){

2
core/src/io/anuke/mindustry/io/Platform.java
View File

@@ -30,6 +30,8 @@ public abstract class Platform {
return true;
}
public boolean isDebug(){return false;}
/**Must be 8 bytes in length.*/
public byte[] getUUID(){return null;}
public ThreadProvider getThreadProvider(){
return new ThreadProvider() {
@Override public boolean isOnThread() {return true;}

94
core/src/io/anuke/mindustry/net/Administration.java
View File

@@ -7,16 +7,20 @@ import io.anuke.ucore.core.Settings;
public class Administration {
private Json json = new Json();
private Array<String> bannedIPS = new Array<>();
private Array<String> bannedIPs = new Array<>();
private Array<String> bannedIDs = new Array<>();
private Array<String> admins = new Array<>();
private ObjectMap<String, String> known = new ObjectMap<>();
private ObjectMap<String, String> ipNames = new ObjectMap<>();
private ObjectMap<String, String> idIPs = new ObjectMap<>();
private ObjectMap<String, TraceInfo> traces = new ObjectMap<>();
public Administration(){
Settings.defaultList(
"bans", "{}",
"bannedIDs", "{}",
"admins", "{}",
"knownIPs", "{}"
"knownIPs", "{}",
"knownIDs", "{}"
);
load();
@@ -34,35 +38,81 @@ public class Administration {
/**Sets last known name for an IP.*/
public void setKnownName(String ip, String name){
known.put(ip, name);
ipNames.put(ip, name);
saveKnown();
}
/**Sets last known UUID for an IP.*/
public void setKnownIP(String id, String ip){
idIPs.put(id, ip);
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");
return ipNames.get(ip, "unknown");
}
/**Returns the last known IP for a UUID. Returns 'unknown' if this IP has an unknown IP.*/
public String getLastIP(String id){
return idIPs.get(id, "unknown");
}
/**Return the last known device ID associated with an IP. Returns 'unknown' if this IP has an unknown device.*/
public String getLastID(String ip){
for(String id : idIPs.keys()){
if(idIPs.get(id).equals(ip)){
return id;
}
}
return "unknown";
}
/**Returns list of banned IPs.*/
public Array<String> getBanned(){
return bannedIPS;
return bannedIPs;
}
/**Returns list of banned IDs.*/
public Array<String> getBannedIDs(){
return bannedIDs;
}
/**Bans a player by IP; returns whether this player was already banned.*/
public boolean banPlayer(String ip){
if(bannedIPS.contains(ip, false))
public boolean banPlayerIP(String ip){
if(bannedIPs.contains(ip, false))
return false;
bannedIPS.add(ip);
bannedIPs.add(ip);
saveBans();
return true;
}
/**Bans a player by UUID.*/
public boolean banPlayerID(String id){
if(bannedIDs.contains(id, false))
return false;
bannedIDs.add(id);
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))
public boolean unbanPlayerIP(String ip){
if(!bannedIPs.contains(ip, false))
return false;
bannedIPS.removeValue(ip, false);
bannedIPs.removeValue(ip, false);
saveBans();
return true;
}
/**Unbans a player by IP; returns whether this player was banned in the first place..*/
public boolean unbanPlayerID(String ip){
if(!bannedIDs.contains(ip, false))
return false;
bannedIDs.removeValue(ip, false);
saveBans();
return true;
@@ -93,8 +143,12 @@ public class Administration {
return true;
}
public boolean isBanned(String ip){
return bannedIPS.contains(ip, false);
public boolean isIPBanned(String ip){
return bannedIPs.contains(ip, false);
}
public boolean isIDBanned(String uuid){
return bannedIDs.contains(uuid, false);
}
public boolean isAdmin(String ip){
@@ -102,12 +156,14 @@ public class Administration {
}
private void saveKnown(){
Settings.putString("knownIPs", json.toJson(known));
Settings.putString("knownIPs", json.toJson(ipNames));
Settings.putString("knownIDs", json.toJson(idIPs));
Settings.save();
}
private void saveBans(){
Settings.putString("bans", json.toJson(bannedIPS));
Settings.putString("bans", json.toJson(bannedIPs));
Settings.putString("bannedIDs", json.toJson(bannedIDs));
Settings.save();
}
@@ -117,9 +173,11 @@ public class Administration {
}
private void load(){
bannedIPS = json.fromJson(Array.class, Settings.getString("bans"));
bannedIPs = json.fromJson(Array.class, Settings.getString("bans"));
bannedIDs = json.fromJson(Array.class, Settings.getString("bannedIDs"));
admins = json.fromJson(Array.class, Settings.getString("admins"));
known = json.fromJson(ObjectMap.class, Settings.getString("knownIPs"));
ipNames = json.fromJson(ObjectMap.class, Settings.getString("knownIPs"));
idIPs = json.fromJson(ObjectMap.class, Settings.getString("knownIDs"));
}
}

12
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.net;
import com.badlogic.gdx.utils.Base64Coder;
import com.badlogic.gdx.utils.reflect.ClassReflection;
import com.badlogic.gdx.utils.reflect.ReflectionException;
import io.anuke.mindustry.entities.Player;
@@ -56,6 +57,7 @@ public class Packets {
public String name;
public boolean android;
public int color;
public byte[] uuid;
@Override
public void write(ByteBuffer buffer) {
@@ -64,6 +66,7 @@ public class Packets {
buffer.put(name.getBytes());
buffer.put(android ? (byte)1 : 0);
buffer.putInt(color);
buffer.put(uuid);
}
@Override
@@ -75,6 +78,8 @@ public class Packets {
name = new String(bytes);
android = buffer.get() == 1;
color = buffer.getInt();
uuid = new byte[8];
buffer.get(uuid);
}
}
@@ -625,6 +630,7 @@ public class Packets {
buffer.putShort((short)info.ip.getBytes().length);
buffer.put(info.ip.getBytes());
buffer.put(info.modclient ? (byte)1 : 0);
buffer.put(info.android ? (byte)1 : 0);
buffer.putInt(info.totalBlocksBroken);
buffer.putInt(info.structureBlocksBroken);
@@ -632,6 +638,7 @@ public class Packets {
buffer.putInt(info.totalBlocksPlaced);
buffer.putInt(info.lastBlockPlaced.id);
buffer.put(Base64Coder.decode(info.uuid));
}
@Override
@@ -645,11 +652,16 @@ public class Packets {
info.playerid = id;
info.modclient = buffer.get() == 1;
info.android = buffer.get() == 1;
info.totalBlocksBroken = buffer.getInt();
info.structureBlocksBroken = buffer.getInt();
info.lastBlockBroken = Block.getByID(buffer.getInt());
info.totalBlocksPlaced = buffer.getInt();
info.lastBlockPlaced = Block.getByID(buffer.getInt());
byte[] uuid = new byte[8];
buffer.get(uuid);
info.uuid = new String(Base64Coder.encode(uuid));
}
}
}

3
core/src/io/anuke/mindustry/net/TraceInfo.java
View File

@@ -7,6 +7,7 @@ public class TraceInfo {
public int playerid;
public String ip;
public boolean modclient;
public boolean android;
public int totalBlocksBroken;
public int structureBlocksBroken;
@@ -15,6 +16,8 @@ public class TraceInfo {
public int totalBlocksPlaced;
public Block lastBlockPlaced = Blocks.air;
public String uuid;
public TraceInfo(String ip){
this.ip = ip;
}

2
core/src/io/anuke/mindustry/ui/dialogs/BansDialog.java
View File

@@ -41,7 +41,7 @@ public class BansDialog extends FloatingDialog {
res.add().growX();
res.addImageButton("icon-cancel", 14*3, () -> {
ui.showConfirm("$text.confirm", "$text.confirmunban", () -> {
netServer.admins.unbanPlayer(ip);
netServer.admins.unbanPlayerIP(ip);
setup();
});
}).size(h).pad(-14f);

4
core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java
View File

@@ -25,8 +25,12 @@ public class TraceDialog extends FloatingDialog {
table.row();
table.add(Bundles.format("text.trace.ip", info.ip));
table.row();
table.add(Bundles.format("text.trace.id", info.uuid));
table.row();
table.add(Bundles.format("text.trace.modclient", info.modclient));
table.row();
table.add(Bundles.format("text.trace.android", info.android));
table.row();
table.add().pad(5);
table.row();

2
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -129,7 +129,7 @@ public class PlayerListFragment implements Fragment{
t.addImageButton("icon-ban", 14*2, () -> {
ui.showConfirm("$text.confirm", "$text.confirmban", () -> {
if(Net.server()) {
netServer.admins.banPlayer(connection.address);
netServer.admins.banPlayerIP(connection.address);
Net.kickConnection(player.clientid, KickReason.banned);
}else{
NetEvents.handleAdministerRequest(player, AdminAction.ban);