alterwain/XCraftAuth
alterwain/XCraftAuth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bungeecord support added

Browse Source
This commit is contained in:
Michael Wain 2025-03-20 22:24:19 +03:00
parent 681de108a1
commit f5569b2346
24 changed files with 341 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
bungee/pom.xml Normal file
View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.alterdekim.xcraft.auth</groupId>
<artifactId>xcraft-auth</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<repositories>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<artifactId>bungee</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>${bungee.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alterdekim.xcraft.auth</groupId>
<artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
</build>
</project>

84
bungee/src/main/java/com/alterdekim/xcraft/auth/bungee/XCraft.java Normal file
View File

@ -0,0 +1,84 @@
package com.alterdekim.xcraft.auth.bungee;
import com.alterdekim.xcraft.auth.SaltNic;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import static com.alterdekim.xcraft.auth.lib.Patcher.patchAuthLib;
public class XCraft extends Plugin {
private static SaltNic server = null;
public static int SERVER_PORT = 8999;
public static int INTERNAL_PORT = 8999;
public static String PUBLIC_DOMAIN = "localhost";
public static Boolean USE_HTTPS = false;
@Override
public void onEnable() {
try {
Configuration config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
SERVER_PORT = config.getInt("public_port");
INTERNAL_PORT = config.getInt("internal_port");
PUBLIC_DOMAIN = config.getString("public_domain");
USE_HTTPS = config.getBoolean("use_https");
} catch (IOException e) {
getLogger().info("No config file present");
makeConfig();
}
if( server == null ) {
try {
getLogger().info("Starting SaltNic server...");
server = new SaltNic(getLogger(), INTERNAL_PORT, USE_HTTPS, PUBLIC_DOMAIN, SERVER_PORT);
} catch (IOException e) {
getLogger().severe("Failed to start SaltNic server: " + e.getMessage());
}
}
getLogger().info("Patching AuthLib URLs...");
while(true) {
try {
patchAuthLib(getLogger(), INTERNAL_PORT);
getLogger().info("AuthLib URLs patched successfully!");
return;
} catch (Exception e) {
e.printStackTrace();
getLogger().severe("Failed to patch AuthLib: " + e.getMessage());
}
}
}
@Override
public void onDisable() {
if (server != null) {
server.stop();
getLogger().info("SaltNic session server stopped.");
server = null;
}
}
public void makeConfig() {
if (!getDataFolder().exists()) {
getDataFolder().mkdir();
}
File file = new File(getDataFolder(), "config.yml");
if (!file.exists()) {
try (InputStream in = getResourceAsStream("config.yml")) {
Files.copy(in, file.toPath());
} catch (IOException e) {
e.printStackTrace();
}
}
}
}

5
bungee/src/main/resources/bungee.yml Normal file
View File

@ -0,0 +1,5 @@
name: XCraftAuth
main: com.alterdekim.xcraft.auth.bungee.XCraft
version: 1.0
author: Michael Wain
description: XCraft authentication system for Spigot

0
src/main/resources/config.yml → bungee/src/main/resources/config.yml
View File

43
common/pom.xml Normal file
View File

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.alterdekim.xcraft.auth</groupId>
<artifactId>xcraft-auth</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.nanohttpd</groupId>
<artifactId>nanohttpd</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
<version>0.4</version>
</dependency>
<dependency>
<groupId>com.jsoniter</groupId>
<artifactId>jsoniter</artifactId>
<version>0.9.23</version>
</dependency>
<dependency>
<groupId>org.mapdb</groupId>
<artifactId>mapdb</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

0
src/main/java/com/alterdekim/xcraft/auth/PasswordHasher.java → common/src/main/java/com/alterdekim/xcraft/auth/PasswordHasher.java
View File

15
src/main/java/com/alterdekim/xcraft/auth/SaltNic.java → common/src/main/java/com/alterdekim/xcraft/auth/SaltNic.java
View File

@ -22,8 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.logging.Logger; import java.util.logging.Logger;
import static com.alterdekim.xcraft.auth.XCraft.*;
public class SaltNic extends NanoHTTPD { public class SaltNic extends NanoHTTPD {
private final Logger logger; private final Logger logger;
@ -36,13 +34,20 @@ public class SaltNic extends NanoHTTPD {
private static final String CAPE_DIRECTORY = "plugins/XCraftAuth/capes"; private static final String CAPE_DIRECTORY = "plugins/XCraftAuth/capes";
private static final int MAX_FILE_SIZE = 1024 * 1024; private static final int MAX_FILE_SIZE = 1024 * 1024;
public SaltNic(Logger logger) throws IOException { private final boolean USE_HTTPS;
super(INTERNAL_PORT); private final String PUBLIC_DOMAIN;
private final int SERVER_PORT;
public SaltNic(Logger logger, int internal_port, boolean use_https, String public_domain, int server_port) throws IOException {
super(internal_port);
this.logger = logger; this.logger = logger;
this.USE_HTTPS = use_https;
this.PUBLIC_DOMAIN = public_domain;
this.SERVER_PORT = server_port;
this.storage = new UserStorage(); this.storage = new UserStorage();
this.sessions = new ConcurrentHashMap<>(); this.sessions = new ConcurrentHashMap<>();
start(NanoHTTPD.SOCKET_READ_TIMEOUT, false); start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);
logger.info("SaltNic session server started on http://localhost:"+INTERNAL_PORT); logger.info("SaltNic session server started on http://localhost:"+ internal_port);
} }
@Override @Override

0
src/main/java/com/alterdekim/xcraft/auth/UserId.java → common/src/main/java/com/alterdekim/xcraft/auth/UserId.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/database/User.java → common/src/main/java/com/alterdekim/xcraft/auth/database/User.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/database/UserStorage.java → common/src/main/java/com/alterdekim/xcraft/auth/database/UserStorage.java
View File

28
common/src/main/java/com/alterdekim/xcraft/auth/lib/Patcher.java Normal file
View File

@ -0,0 +1,28 @@
package com.alterdekim.xcraft.auth.lib;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.util.logging.Logger;
public class Patcher {
public static void patchAuthLib(Logger logger, int internal_port) throws Exception {
Class<?> clazz = Class.forName("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService");
modifyFinalField(clazz, "BASE_URL", "http://localhost:"+internal_port+"/api/", logger);
modifyFinalField(clazz, "JOIN_URL", new URL("http://localhost:"+internal_port+"/api/join"), logger);
modifyFinalField(clazz, "CHECK_URL", new URL("http://localhost:"+internal_port+"/api/hasJoined"), logger);
}
private static void modifyFinalField(Class<?> clazz, String fieldName, Object newValue, Logger logger) throws Exception {
Field field = clazz.getDeclaredField(fieldName);
field.setAccessible(true);
Field modifiersField = Field.class.getDeclaredField("modifiers");
modifiersField.setAccessible(true);
modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
field.set(null, newValue);
logger.info(fieldName + " patched to: " + newValue);
}
}

0
src/main/java/com/alterdekim/xcraft/auth/request/JoinMinecraftServerRequest.java → common/src/main/java/com/alterdekim/xcraft/auth/request/JoinMinecraftServerRequest.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/request/SignUpRequest.java → common/src/main/java/com/alterdekim/xcraft/auth/request/SignUpRequest.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/response/MinecraftProfilePropertiesResponse.java → common/src/main/java/com/alterdekim/xcraft/auth/response/MinecraftProfilePropertiesResponse.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/response/MinecraftProfileTexture.java → common/src/main/java/com/alterdekim/xcraft/auth/response/MinecraftProfileTexture.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/response/MinecraftProperty.java → common/src/main/java/com/alterdekim/xcraft/auth/response/MinecraftProperty.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/response/MinecraftTexturesPayload.java → common/src/main/java/com/alterdekim/xcraft/auth/response/MinecraftTexturesPayload.java
View File

0
src/main/java/com/alterdekim/xcraft/auth/response/SignUpResponse.java → common/src/main/java/com/alterdekim/xcraft/auth/response/SignUpResponse.java
View File

88
pom.xml
View File

@ -7,89 +7,19 @@
<groupId>com.alterdekim.xcraft.auth</groupId> <groupId>com.alterdekim.xcraft.auth</groupId>
<artifactId>xcraft-auth</artifactId> <artifactId>xcraft-auth</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>common</module>
<module>spigot</module>
<module>bungee</module>
</modules>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spigot.api.version>1.12.2-R0.1-SNAPSHOT</spigot.api.version>
<bungee.api.version>1.12-SNAPSHOT</bungee.api.version>
</properties> </properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nanohttpd</groupId>
<artifactId>nanohttpd</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
<version>0.4</version>
</dependency>
<dependency>
<groupId>com.jsoniter</groupId>
<artifactId>jsoniter</artifactId>
<version>0.9.23</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mapdb</groupId>
<artifactId>mapdb</artifactId>
<version>3.0.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

73
spigot/pom.xml Normal file
View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.alterdekim.xcraft.auth</groupId>
<artifactId>xcraft-auth</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<artifactId>spigot</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>${spigot.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alterdekim.xcraft.auth</groupId>
<artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
</build>
</project>

28
src/main/java/com/alterdekim/xcraft/auth/XCraft.java → spigot/src/main/java/com/alterdekim/xcraft/auth/spigot/XCraft.java
View File

@ -1,6 +1,7 @@
package com.alterdekim.xcraft.auth; package com.alterdekim.xcraft.auth.spigot;
import com.alterdekim.xcraft.auth.SaltNic;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.IOException; import java.io.IOException;
@ -8,6 +9,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.net.URL; import java.net.URL;
import static com.alterdekim.xcraft.auth.lib.Patcher.patchAuthLib;
public class XCraft extends JavaPlugin { public class XCraft extends JavaPlugin {
private static SaltNic server = null; private static SaltNic server = null;
@ -27,7 +30,7 @@ public class XCraft extends JavaPlugin {
INTERNAL_PORT = getConfig().getInt("internal_port"); INTERNAL_PORT = getConfig().getInt("internal_port");
PUBLIC_DOMAIN = getConfig().getString("public_domain"); PUBLIC_DOMAIN = getConfig().getString("public_domain");
USE_HTTPS = getConfig().getBoolean("use_https"); USE_HTTPS = getConfig().getBoolean("use_https");
server = new SaltNic(getLogger()); server = new SaltNic(getLogger(), INTERNAL_PORT, USE_HTTPS, PUBLIC_DOMAIN, SERVER_PORT);
} catch (IOException e) { } catch (IOException e) {
getLogger().severe("Failed to start SaltNic server: " + e.getMessage()); getLogger().severe("Failed to start SaltNic server: " + e.getMessage());
} }
@ -35,7 +38,7 @@ public class XCraft extends JavaPlugin {
getLogger().info("Patching AuthLib URLs..."); getLogger().info("Patching AuthLib URLs...");
while(true) { while(true) {
try { try {
patchAuthLib(); patchAuthLib(getLogger(), INTERNAL_PORT);
getLogger().info("AuthLib URLs patched successfully!"); getLogger().info("AuthLib URLs patched successfully!");
return; return;
} catch (Exception e) { } catch (Exception e) {
@ -45,25 +48,6 @@ public class XCraft extends JavaPlugin {
} }
} }
private void patchAuthLib() throws Exception {
Class<?> clazz = Class.forName("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService");
modifyFinalField(clazz, "BASE_URL", "http://localhost:"+INTERNAL_PORT+"/api/");
modifyFinalField(clazz, "JOIN_URL", new URL("http://localhost:"+INTERNAL_PORT+"/api/join"));
modifyFinalField(clazz, "CHECK_URL", new URL("http://localhost:"+INTERNAL_PORT+"/api/hasJoined"));
}
private void modifyFinalField(Class<?> clazz, String fieldName, Object newValue) throws Exception {
Field field = clazz.getDeclaredField(fieldName);
field.setAccessible(true);
Field modifiersField = Field.class.getDeclaredField("modifiers");
modifiersField.setAccessible(true);
modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
field.set(null, newValue);
getLogger().info(fieldName + " patched to: " + newValue);
}
@Override @Override
public void onDisable() { public void onDisable() {
if (server != null) { if (server != null) {

4
spigot/src/main/resources/config.yml Normal file
View File

@ -0,0 +1,4 @@
public_domain: "localhost"
public_port: 8999
internal_port: 8999
use_https: false

6
spigot/src/main/resources/plugin.yml Normal file
View File

@ -0,0 +1,6 @@
name: XCraftAuth
main: com.alterdekim.xcraft.auth.spigot.XCraft
version: 1.0
author: Michael Wain
api-version: 1.12.2
description: XCraft authentication system for Spigot

6
src/main/resources/plugin.yml
View File

@ -1,6 +0,0 @@
name: XCraftAuth
main: com.alterdekim.xcraft.auth.XCraft
version: 1.0
author: Michael Wain
api-version: 1.12.2
description: XCraft authentication system for Spigot