sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

make access password mandatory

Browse source
This commit is contained in:
Sen 2025-05-26 20:29:08 +02:00
parent 5f49d6c036
commit 435e3f3e29
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
5 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/main/java/client/gui/GuiConnect.java
View file

@ -132,7 +132,9 @@ public class GuiConnect extends GuiList<GuiConnect.ServerInfo> implements Button
for(int z = 0; z <= lines.length; z++) { for(int z = 0; z <= lines.length; z++) {
String line = z == lines.length ? null : lines[z]; String line = z == lines.length ? null : lines[z];
if(line == null || (line.startsWith("[") && line.endsWith("]"))) { if(line == null || (line.startsWith("[") && line.endsWith("]"))) {
if(!name.isEmpty() && !address.isEmpty() && !user.isEmpty() && user.length() < IPlayer.MAX_USER_LENGTH && IPlayer.isValidUser(user) && password.length() < IPlayer.MAX_PASS_LENGTH && access.length() < IPlayer.MAX_PASS_LENGTH && address.length() < 128 && name.length() < 128 && port >= 1024 && port <= 32767) if(!name.isEmpty() && !address.isEmpty() && !user.isEmpty() && user.length() < IPlayer.MAX_USER_LENGTH && IPlayer.isValidUser(user) &&
password.length() < IPlayer.MAX_PASS_LENGTH && access.length() < IPlayer.MAX_PASS_LENGTH && address.length() < 128 && name.length() < 128 &&
port >= 1024 && port <= 32767 && password.length() >= 8 && access.length() >= 8)
this.elements.add(new ServerInfo(name, address, port, user, password, access, time)); this.elements.add(new ServerInfo(name, address, port, user, password, access, time));
if(line != null) { if(line != null) {
address = ""; address = "";

16
client/src/main/java/client/gui/GuiServer.java
View file

@ -69,8 +69,8 @@ public class GuiServer extends Gui implements FieldCallback {
this.portLabel = this.add(new Label(404, 0, 76, 20, "Port", true)); this.portLabel = this.add(new Label(404, 0, 76, 20, "Port", true));
this.rangeLabel = this.add(new Label(370, 44, 110, 20, "[1024..32767]", true)); this.rangeLabel = this.add(new Label(370, 44, 110, 20, "[1024..32767]", true));
this.userLabel = this.add(new Label(0, 50, 220, 20, "Nutzer", true)); this.userLabel = this.add(new Label(0, 50, 220, 20, "Nutzer", true));
this.passLabel = this.add(new Label(0, 100, 480, 20, "Passwort", true)); this.passLabel = this.add(new Label(0, 100, 480, 20, "Passwort (mind. 8 Zeichen)", true));
this.accLabel = this.add(new Label(0, 150, 480, 20, "Zugang", true)); this.accLabel = this.add(new Label(0, 150, 480, 20, "Zugang (mind. 8 Zeichen)", true));
this.shift(); this.shift();
} }
@ -118,7 +118,15 @@ public class GuiServer extends Gui implements FieldCallback {
return; return;
} }
String pass = this.passBox.getText(); String pass = this.passBox.getText();
if(pass.length() < 8) {
this.passLabel.setText(pass.isEmpty() ? TextColor.RED + "Passwort (mind. 8 Zeichen)" : "Passwort (" + TextColor.RED + "mind. 8 Zeichen" + TextColor.RESET + ")");
return;
}
String acc = this.accBox.getText(); String acc = this.accBox.getText();
if(acc.length() < 8) {
this.accLabel.setText(acc.isEmpty() ? TextColor.RED + "Zugang (mind. 8 Zeichen)" : "Zugang (" + TextColor.RED + "mind. 8 Zeichen" + TextColor.RESET + ")");
return;
}
if(this.server == null) { if(this.server == null) {
this.lastAddr = addr; this.lastAddr = addr;
this.lastPort = port; this.lastPort = port;
@ -148,6 +156,10 @@ public class GuiServer extends Gui implements FieldCallback {
} }
else if(elem == this.userBox) else if(elem == this.userBox)
this.userLabel.setText("Nutzer"); this.userLabel.setText("Nutzer");
else if(elem == this.passBox)
this.passLabel.setText("Passwort (mind. 8 Zeichen)");
else if(elem == this.accBox)
this.accLabel.setText("Zugang (mind. 8 Zeichen)");
else if(this.server != null && elem == this.nameBox) else if(this.server != null && elem == this.nameBox)
this.nameLabel.setText("Name"); this.nameLabel.setText("Name");
} }

4
common/src/main/java/common/init/Config.java
View file

@ -435,7 +435,7 @@ public abstract class Config {
public static int eggTimer = 6000; public static int eggTimer = 6000;
@Var(name = "connectionTimeout", min = 10, max = 300) @Var(name = "connectionTimeout", min = 10, max = 300)
public static int timeout = 30; public static int timeout = 30;
@Var(name = "passwordMinLength", min = 1, max = 32) @Var(name = "passwordMinLength", min = 8, max = 32)
public static int minPassLength = 8; public static int minPassLength = 8;
@Var(name = "port", min = 1024, max = 32767, nonDefault = true) @Var(name = "port", min = 1024, max = 32767, nonDefault = true)
public static int port = -1; public static int port = -1;
@ -459,7 +459,7 @@ public abstract class Config {
@Var(name = "spawnPitch", min = -89.0f, max = 89.0f) @Var(name = "spawnPitch", min = -89.0f, max = 89.0f)
public static float spawnPitch = 0.0f; public static float spawnPitch = 0.0f;
@Var(name = "password") @Var(name = "password", nonDefault = true)
public static String password = ""; public static String password = "";
static { static {

12
server/src/main/java/server/Server.java
View file

@ -252,6 +252,14 @@ public final class Server implements IThreadListener {
Server.this.bind(Config.port); Server.this.bind(Config.port);
} }
}, "port"); }, "port");
Config.setCallback(new Runnable() {
public void run() {
if(Config.password.length() < 8 || Config.password.length() > IPlayer.MAX_PASS_LENGTH) {
Log.IO.error("Passwort muss aus 8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen bestehen");
Config.set("password", "", false);
}
}
}, "password");
this.keyPair = EncryptUtil.generateKeyPair(); this.keyPair = EncryptUtil.generateKeyPair();
} }
@ -440,7 +448,7 @@ public final class Server implements IThreadListener {
} }
} }
Config.set(args[0], value, true); Config.set(args[0], value, true);
exec.logConsole(TextColor.YELLOW + "%s" + TextColor.GRAY + " -> " + ((cv.type == ValueType.BOOLEAN ? (cv.getValue().equals("true") ? TextColor.GREEN : TextColor.RED) : (cv.type == ValueType.STRING ? TextColor.NEON : TextColor.BLUE))) + "%s", args[0], cv.type == ValueType.STRING ? ("'" + cv.getValue() + "'") : cv.getValue()); exec.logConsole(TextColor.YELLOW + "%s" + TextColor.GRAY + " -> " + (cv.noDef && cv.def.equals(cv.getValue()) ? TextColor.DGRAY + "[ - ]" : ((cv.type == ValueType.BOOLEAN ? (cv.getValue().equals("true") ? TextColor.GREEN : TextColor.RED) : (cv.type == ValueType.STRING ? TextColor.NEON : TextColor.BLUE))) + "%s"), args[0], cv.type == ValueType.STRING ? ("'" + cv.getValue() + "'") : cv.getValue());
} }
return true; return true;
} }
@ -504,6 +512,8 @@ public final class Server implements IThreadListener {
this.bind(Config.port); this.bind(Config.port);
else else
Log.SYSTEM.warn("Kein Port definiert, verwende 'port <1024-32767>' um einen Hosting-Port festzulegen"); Log.SYSTEM.warn("Kein Port definiert, verwende 'port <1024-32767>' um einen Hosting-Port festzulegen");
if(Config.password.length() < 8)
Log.SYSTEM.warn("Kein Passwort definiert, verwende 'password <8-" + IPlayer.MAX_PASS_LENGTH + " Zeichen>' um ein Zugangspasswort festzulegen");
Thread con = new Thread(new Runnable() { Thread con = new Thread(new Runnable() {
private final BufferedReader reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(System.in))); private final BufferedReader reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(System.in)));

6
server/src/main/java/server/network/LoginHandler.java
View file

@ -133,7 +133,11 @@ public class LoginHandler extends NetHandler implements ILoginHandler
throw new IllegalStateException("Ungültiger Nutzername!"); throw new IllegalStateException("Ungültiger Nutzername!");
// if(!this.checkConnect(packetIn.getAccess())) // if(!this.checkConnect(packetIn.getAccess()))
// return; // return;
if(!Config.password.isEmpty() && !Config.password.equals(packetIn.getAccess())) { if(Config.password.length() < 8) {
this.closeConnection("Es ist kein Zugangspasswort für diesen Server konfiguriert");
return;
}
if(!Config.password.equals(packetIn.getAccess())) {
this.closeConnection("Falsches Zugangspasswort"); this.closeConnection("Falsches Zugangspasswort");
return; return;
} }