diff --git a/pom.xml b/pom.xml index 37a5ce6..1bd7e49 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.openautonomousconnection WebServer - 1.0.0-BETA.1.7 + 1.0.0-BETA.1.8 Open Autonomous Connection https://open-autonomous-connection.org/ @@ -112,7 +112,7 @@ org.openautonomousconnection Protocol - 1.0.0-BETA.7.4 + 1.0.0-BETA.7.5 org.projectlombok diff --git a/src/main/java/org/openautonomousconnection/webserver/Main.java b/src/main/java/org/openautonomousconnection/webserver/Main.java index a481b41..51ad5c7 100644 --- a/src/main/java/org/openautonomousconnection/webserver/Main.java +++ b/src/main/java/org/openautonomousconnection/webserver/Main.java @@ -6,6 +6,7 @@ import dev.unlegitdqrk.unlegitlibrary.command.CommandPermission; import dev.unlegitdqrk.unlegitlibrary.event.EventManager; import dev.unlegitdqrk.unlegitlibrary.file.ConfigurationManager; import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; +import dev.unlegitdqrk.unlegitlibrary.network.system.utils.ClientAuthMode; import lombok.Getter; import org.openautonomousconnection.protocol.ProtocolBridge; import org.openautonomousconnection.protocol.ProtocolValues; @@ -57,12 +58,21 @@ public class Main { config.saveProperties(); } + if (!config.isSet("clientauth")) { + config.set("clientauth.info", "Select between NONE, OPTIONAL and REQUIRED"); + config.set("clientauth", ClientAuthMode.OPTIONAL.name()); + config.saveProperties(); + } + int tcpPort = config.getInt("port.tcp"); int udpPort = config.getInt("port.udp"); int sessionExpire = config.getInt("sessionexpiremin"); int maxUpload = config.getInt("maxuploadmb"); + ClientAuthMode authMode = ClientAuthMode.valueOf(config.getString("clientauth").toUpperCase()); + values.authMode = authMode; + protocolBridge = new ProtocolBridge(new WebServer( new File("auth.ini"), new File("rules.ini"), sessionExpire, maxUpload),