Added RSA to login for custom protocol

ipkpjersi · Hubcapp · commit 73f365b345f1 · 2024-09-22T04:59:10.000Z
diff --git a/Client_Base/src/orsc/Config.java b/Client_Base/src/orsc/Config.java
@@ -18,7 +18,7 @@ public class Config {
 	public static String WELCOME_TEXT = "You need a members account to use this server";
 	public static String SERVER_IP = null; // Modify this to override "Cache/ip.txt"
 	public static int SERVER_PORT; // Modify SERVER_IP above to override "Cache/port.txt" with this value
-	public static final int CLIENT_VERSION = 10009;
+	public static final int CLIENT_VERSION = 10010;
 	private static final int CACHE_VERSION = 4;
 	public static boolean MEMBER_WORLD = false;
 	public static boolean DISPLAY_LOGO_SPRITE = false;
diff --git a/Client_Base/src/orsc/MiscFunctions.java b/Client_Base/src/orsc/MiscFunctions.java
@@ -5,9 +5,8 @@
 import orsc.util.GenUtil;
 
 public final class MiscFunctions {
-	public static final BigInteger RSA_MODULUS = new BigInteger(
-		"120553535534604110920450760502772983886474996352454951528826209241321739073070541065736996931396402671853619219844292625227994972012232687659966972603887946951318606732409243729781965910432692806353709960600356722700558734565129892087142295493761639344537209286019991702122529293841694419415125046632027858457");
-	public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
+	public static BigInteger RSA_MODULUS;
+	public static BigInteger RSA_EXPONENT;
 	private static byte[][] s_j = new byte[1000][];
 	public static int cachingFile_s_g = 0;
 	public static int frustumNearZ;
diff --git a/Client_Base/src/orsc/PacketHandler.java b/Client_Base/src/orsc/PacketHandler.java
@@ -19,6 +19,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.util.HashMap;
@@ -1036,6 +1037,8 @@ private void setServerConfiguration() {
 			disableMinimapRotation = this.getClientStream().getUnsignedByte(); // 84
 			allowBeardedLadies = this.getClientStream().getUnsignedByte(); // 85
 			prideMonth = this.getClientStream().getUnsignedByte(); // 86
+			MiscFunctions.RSA_EXPONENT = new BigInteger(this.getClientStream().readString()); // 87
+			MiscFunctions.RSA_MODULUS = new BigInteger(this.getClientStream().readString()); // 88
 		} else {
 			serverName = packetsIncoming.readString(); // 1
 			serverNameWelcome = packetsIncoming.readString(); // 2
@@ -1123,6 +1126,8 @@ private void setServerConfiguration() {
 			disableMinimapRotation = packetsIncoming.getUnsignedByte(); // 84
 			allowBeardedLadies = packetsIncoming.getUnsignedByte(); // 85
 			prideMonth = packetsIncoming.getUnsignedByte(); // 86
+			MiscFunctions.RSA_EXPONENT = new BigInteger(packetsIncoming.readString()); // 87
+			MiscFunctions.RSA_MODULUS = new BigInteger(packetsIncoming.readString()); // 88
 		}
 
 		if (Config.DEBUG) {
@@ -1212,7 +1217,9 @@ private void setServerConfiguration() {
 					"\nS_SHOW_UNDERGROUND_FLICKER_TOGGLE " + showUndergroundFlickerToggle + // 83
 					"\nS_DISABLE_MINIMAP_ROTATION " + disableMinimapRotation + // 84
 					"\nS_ALLOW_BEARDED_LADIES " + allowBeardedLadies + // 85
-					"\nS_PRIDE_MONTH " + prideMonth // 86
+					"\nS_PRIDE_MONTH " + prideMonth + // 86
+					"\nRSA_EXPONENT " + MiscFunctions.RSA_EXPONENT + // 87
+					"\nRSA_MODULUS " + MiscFunctions.RSA_MODULUS // 88
 			);
 		}
 
diff --git a/Client_Base/src/orsc/buffers/RSBuffer.java b/Client_Base/src/orsc/buffers/RSBuffer.java
@@ -72,7 +72,7 @@ public final boolean isCRCValid() {
 		}
 	}
 
-	private void readBytes(int count, byte[] out) {
+	public void readBytes(int count, byte[] out) {
 		try {
 			for (int i = 0; i < count; ++i) {
 				out[i] = this.dataBuffer[this.packetEnd++];
@@ -84,7 +84,7 @@ private void readBytes(int count, byte[] out) {
 		}
 	}
 
-	private void writeBytes(byte[] src, int count) {
+	public void writeBytes(byte[] src, int count) {
 		try {
 			for (int i = 0; i < count; ++i) {
 				this.dataBuffer[this.packetEnd++] = src[i];
@@ -322,7 +322,7 @@ public final void encodeWithRSA(BigInteger var1, BigInteger var3) {
 
 			this.readBytes(pointerPosition, encodedBuffer);
 			BigInteger var7 = new BigInteger(encodedBuffer);
-			BigInteger var8 = var7.modPow(var3, var1);
+			BigInteger var8 = var7.modPow(var1, var3);
 			byte[] var9 = var8.toByteArray();
 			this.packetEnd = 0;
 			this.putShort(var9.length);
diff --git a/Client_Base/src/orsc/mudclient.java b/Client_Base/src/orsc/mudclient.java
@@ -17,6 +17,7 @@
 import com.openrsc.interfaces.misc.*;
 import com.openrsc.interfaces.misc.clan.Clan;
 import com.openrsc.interfaces.misc.party.Party;
+import orsc.buffers.RSBuffer;
 import orsc.buffers.RSBufferUtils;
 import orsc.buffers.RSBuffer_Bits;
 import orsc.enumerations.*;
@@ -39,6 +40,9 @@
 import orsc.util.Utils;
 
 import java.io.*;
+//import java.lang.management.ManagementFactory; //Commented out for Android
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -72,6 +76,10 @@ public final class mudclient implements Runnable {
 	private static final ArrayList<String> skillNamesArray = new ArrayList<String>();
 	private static String[] skillNameLong;
 	private static String[] skillNames;
+	private static String[] programArgs;
+	public void setProgramArgs(String[] progArgs) {
+		this.programArgs = progArgs;
+	}
 	public final int[] bankItemOnTab = new int[500];
 	public final int[] equipIconXLocations = new int[]{98, 98, 98, 153, 43, 43, 98, 98, 43, 153, 153};
 	public final int[] equipIconYLocations = new int[]{5, 85, 125, 85, 85, 165, 165, 45, 45, 45, 165};
@@ -14472,8 +14480,65 @@ private void login(int var1, String pass, String user, boolean reconnecting) {
 						}
 						this.packetHandler.getClientStream().bufferBits.putInt(CLIENT_VERSION);
 						this.packetHandler.getClientStream().bufferBits.putString(getUsername());
-						// TODO: This strips special chars to underscore. We may want to in the future allow special chars.
-						this.packetHandler.getClientStream().bufferBits.putString(DataOperations.addCharacters(password, 20));
+						//TODO: Add encryption version as server variable sent to client so we can read it here instead of hardcoding it so server operators can control the encryption version.
+						byte loginEncryptionVersion = 1; //0 = none, 1 = RSA, 2 = SSL/TLS --TODO: maybe "RSA enhanced" with a larger key size?
+						this.packetHandler.getClientStream().bufferBits.putByte(loginEncryptionVersion);
+						//TODO: This strips special chars to underscore. We may want to in the future allow special chars.
+						//this.packetHandler.getClientStream().bufferBits.putString(DataOperations.addCharacters(password, 20));
+
+						RSBuffer rsBuffer = new RSBuffer(500);
+						rsBuffer.putString(DataOperations.addCharacters(password, 20));
+						rsBuffer.encodeWithRSA(MiscFunctions.RSA_EXPONENT, MiscFunctions.RSA_MODULUS);
+						this.packetHandler.getClientStream().bufferBits.writeBytes(rsBuffer.dataBuffer, rsBuffer.packetEnd);
+
+						boolean runningFromJar = false;
+						String jarName = "";
+						try {
+							String className = this.getClass().getName().replace('.', '/');
+							String classJar = this.getClass().getResource("/" + className + ".class") != null ? this.getClass().getResource("/" + className + ".class").toString() : "unknown";
+							if (classJar.startsWith("jar:")) {
+								runningFromJar = true;
+								String path = classJar.substring(4, classJar.indexOf("!"));
+								jarName = Paths.get(path).getFileName().toString();
+								if (jarName.length() > 19) {
+									jarName = jarName.substring(0, 19);
+								}
+							}
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+
+						//List<String> jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments();
+						//String jvmArgsStr = String.join(" ", jvmArgs);
+
+						String programArgsStr = programArgs != null && programArgs.length > 1 ? String.join(" ", programArgs) : "";
+
+						String workingDir = System.getProperty("user.dir");
+						if (workingDir.length() > 38) {
+							String[] pathParts = workingDir.split(Pattern.quote(File.separator));
+							if (pathParts.length > 2) {
+								String truncatedPath = String.join(File.separator, Arrays.copyOfRange(pathParts, pathParts.length - 3, pathParts.length));
+								workingDir = truncatedPath;
+								if (workingDir.length() > 38) {
+									workingDir = truncatedPath.substring(truncatedPath.length() - 38);
+								}
+							}
+						}
+						if (jarName.isEmpty() && workingDir.length() < 2) {
+							workingDir = "Unknown";
+						}
+						String osName = System.getProperty("os.name").toLowerCase();
+						String javaVendor = System.getProperty("java.vendor").toLowerCase();
+						boolean isAndroid = osName.contains("android") || javaVendor.contains("android");
+						if (isAndroid) { 
+							workingDir = "Android";
+						}
+						//Ideally, we want this string to be less than 60 characters, and it must be less than 63 characters to be encrypted with RSA.
+						String loginDetails = String.format("%s/%s", workingDir, jarName);
+						RSBuffer rsDetailsBuffer = new RSBuffer(100);
+						rsDetailsBuffer.putString(loginDetails);
+						rsDetailsBuffer.encodeWithRSA(MiscFunctions.RSA_EXPONENT, MiscFunctions.RSA_MODULUS);
+						this.packetHandler.getClientStream().bufferBits.writeBytes(rsDetailsBuffer.dataBuffer, rsDetailsBuffer.packetEnd);
 
 						this.packetHandler.getClientStream().bufferBits.putLong(getUID());
 
diff --git a/server/default.conf b/server/default.conf
@@ -16,7 +16,7 @@ world:
 	want_custom_walking_speed: false # Do we want to enable custom walking speed?
 	idle_timer: 300000 # 5 minute player idle alert, 0 disables
 	auto_save: 30000 # 30 second autosave interval
-	client_version: 10009
+	client_version: 10010
 	enforce_custom_client_version: true
 	server_port: 43594 # 43593 2001scape / 43594 preservation / 43595 cabbage / 43596 openrsc / 43597 openpk / 43598 wk / 43599 dev
 	ws_server_port: 43494 # 43493 2001scape / 43494 preservation / 43495 cabbage / 43496 openrsc / 43497 openpk / 43498 wk / 43499 dev
diff --git a/server/openpk.conf b/server/openpk.conf
@@ -17,7 +17,7 @@ world:
 	want_custom_walking_speed: false # Do we want to enable custom walking speed?
 	idle_timer: 300000 # 5 minute player idle alert, 0 disables
 	auto_save: 30000 # 30 second autosave interval
-	client_version: 10009
+	client_version: 10010
 	enforce_custom_client_version: false
 	server_port: 43597 # 43594 preservation / 43595 cabbage / 43596 openrsc / 43597 openpk / 43598 wk / 43599 dev
 	ws_server_port: 43497 # MODIFIED
diff --git a/server/preservation.conf b/server/preservation.conf
@@ -18,7 +18,7 @@ world:
 	want_custom_walking_speed: false # Do we want to enable custom walking speed?
 	idle_timer: 300000 # 5 minute player idle alert, 0 disables
 	auto_save: 120000 # 120 second autosave interval
-	client_version: 10009
+	client_version: 10010
 	enforce_custom_client_version: false
 	server_port: 43596 # MODIFIED
 	ws_server_port: 43496 # MODIFIED
diff --git a/server/rsccabbage.conf b/server/rsccabbage.conf
@@ -15,7 +15,7 @@ world:
 	want_custom_walking_speed: false # Do we want to enable custom walking speed?
 	idle_timer: 600000 # MODIFIED 10 minute player idle alert, 0 disables
 	auto_save: 30000 # 30 second autosave interval
-	client_version: 10009
+	client_version: 10010
 	enforce_custom_client_version: false
 	server_port: 43595 # MODIFIED
 	ws_server_port: 43495 # MODIFIED
diff --git a/server/rsccoleslaw.conf b/server/rsccoleslaw.conf
@@ -16,7 +16,7 @@ world:
 	want_custom_walking_speed: false # Do we want to enable custom walking speed?
 	idle_timer: 600000 # MODIFIED 10 minute player idle alert, 0 disables
 	auto_save: 30000 # 30 second autosave interval
-	client_version: 10009
+	client_version: 10010
 	enforce_custom_client_version: false
 	server_port: 43599 # MODIFIED
 	ws_server_port: 43499 # MODIFIED
diff --git a/server/src/com/openrsc/server/net/rsc/ActionSender.java b/server/src/com/openrsc/server/net/rsc/ActionSender.java
@@ -770,6 +770,8 @@ public static void sendInitialServerConfigs(Server server, Channel channel) {
 			LOGGER.info(server.getConfig().DISABLE_MINIMAP_ROTATION + " 84");
 			LOGGER.info(server.getConfig().ALLOW_BEARDED_LADIES + " 85");
 			LOGGER.info(server.getConfig().PRIDE_MONTH + " 86");
+			LOGGER.info(Crypto.getPublicExponent() + " 87");
+			LOGGER.info(Crypto.getPublicModulus() + " 88");
 		}
 		Packet p = prepareServerConfigs(server);
 		// ConnectionAttachment attachment = new ConnectionAttachment();
@@ -882,6 +884,8 @@ private static Packet prepareServerConfigs(Server server) {
 		configs.add((byte) (server.getConfig().DISABLE_MINIMAP_ROTATION ? 1 : 0)); // 84
 		configs.add((byte) (server.getConfig().ALLOW_BEARDED_LADIES ? 1 : 0)); // 85
 		configs.add((byte) (server.getConfig().PRIDE_MONTH ? 1 : 0)); // 86
+		configs.add(Crypto.getPublicExponent().toString()); // 87
+		configs.add(Crypto.getPublicModulus().toString()); // 88
 
 		struct.configs = configs;
 		struct.setOpcode(OpcodeOut.SEND_SERVER_CONFIGS);
diff --git a/server/src/com/openrsc/server/net/rsc/LoginPacketHandler.java b/server/src/com/openrsc/server/net/rsc/LoginPacketHandler.java
@@ -473,7 +473,36 @@ public void loadingComplete(Player loadedPlayer) {
 					int clientVersion = packet.readInt();
 
 					final String username = getString(packet.getBuffer()).trim();
-					final String password = getString(packet.getBuffer()).trim();
+					String password = "";
+					if (clientVersion < 10010 || clientVersion == 10069) {
+						password = getString(packet.getBuffer()).trim();
+					} else {
+						byte loginEncryptionVersion = packet.readByte(); //0 = none, 1 = RSA, 2 = SSL/TLS
+						if (loginEncryptionVersion == 0) {
+							password = getString(packet.getBuffer()).trim();
+						} else if (loginEncryptionVersion == 1) {
+							int rsaLength = packet.readUnsignedShort();
+							byte[] loginBlock = Crypto.decryptRSA(packet.readBytes(rsaLength), 0, rsaLength);
+							try {
+								// Fun fact: password is always 20 characters long, with spaces at the end.
+								// Spaces in your password are converted to underscores.
+								password = new String(loginBlock, 0, 20, "UTF8").trim();
+							} catch (Exception e) {
+								LOGGER.info("error parsing password in login block");
+								LOGGER.catching(e);
+							}
+							String loginDetails = "";
+							int rsaDetailsLength = packet.readUnsignedShort();
+							byte[] loginDetailsBlock = Crypto.decryptRSA(packet.readBytes(rsaDetailsLength), 0, rsaDetailsLength);
+							try {
+								 loginDetails = new String(loginDetailsBlock, "UTF8").trim();
+							} catch (Exception e) {
+								LOGGER.info("error parsing details in login block");
+								LOGGER.catching(e);
+							}
+							LOGGER.info("Login details for " + username + ": " + loginDetails);
+						}
+					}
 
 					long uid = packet.readLong(); // random data, not used...
 
diff --git a/server/uranium.conf b/server/uranium.conf
@@ -16,7 +16,7 @@ world:
 	want_custom_walking_speed: false # Do we want to enable custom walking speed?
 	idle_timer: 300000 # 5 minute player idle alert, 0 disables
 	auto_save: 300000 # 300 second autosave interval # MODIFIED 10x higher
-	client_version: 10009
+	client_version: 10010
 	enforce_custom_client_version: false
 	server_port: 43235 # MODIFIED
 	ws_server_port: 43435 # MODIFIED

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public final boolean isCRCValid() {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- private void readBytes(int count, byte[] out) {`
	`75`	`+ public void readBytes(int count, byte[] out) {`
`76`	`76`	`try {`
`77`	`77`	`for (int i = 0; i < count; ++i) {`
`78`	`78`	`out[i] = this.dataBuffer[this.packetEnd++];`
`@@ -84,7 +84,7 @@ private void readBytes(int count, byte[] out) {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`- private void writeBytes(byte[] src, int count) {`
	`87`	`+ public void writeBytes(byte[] src, int count) {`
`88`	`88`	`try {`
`89`	`89`	`for (int i = 0; i < count; ++i) {`
`90`	`90`	`this.dataBuffer[this.packetEnd++] = src[i];`
`@@ -322,7 +322,7 @@ public final void encodeWithRSA(BigInteger var1, BigInteger var3) {`
`322`	`322`
`323`	`323`	`this.readBytes(pointerPosition, encodedBuffer);`
`324`	`324`	`BigInteger var7 = new BigInteger(encodedBuffer);`
`325`		`- BigInteger var8 = var7.modPow(var3, var1);`
	`325`	`+ BigInteger var8 = var7.modPow(var1, var3);`
`326`	`326`	`byte[] var9 = var8.toByteArray();`
`327`	`327`	`this.packetEnd = 0;`
`328`	`328`	`this.putShort(var9.length);`