Add native encryptConnection (bad write perf).

retrixe · Sep 14, 2022 · f5ca01a · f5ca01a
1 parent ae1a54b
commit f5ca01a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 13 deletions.
diff --git a/android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt b/android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt
@@ -15,6 +15,8 @@ import java.nio.ByteOrder
 import java.util.UUID
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
 import kotlin.concurrent.read
 import kotlin.concurrent.thread
 import kotlin.concurrent.write
@@ -26,7 +28,6 @@ class ConnectionModule(reactContext: ReactApplicationContext)
     private var connectionId: UUID? = null
     private var compressionThreshold = -1
     private var compressionEnabled = false
-    // TODO: Use AES ciphers for reading and writing. Maybe JS can initialise these? Or do we handle Encryption Request?
     private var aesDecipher: Cipher? = null
     private var aesCipher: Cipher? = null
     private var loggedIn = false
@@ -79,6 +80,33 @@ class ConnectionModule(reactContext: ReactApplicationContext)
         }
     }
 
+    @ReactMethod fun enableEncryption(
+        connId: String, secret: String, packet: String, promise: Promise
+    ) = runBlocking {
+        launch(Dispatchers.IO) {
+            lock.write {
+                if (connId == connectionId.toString()) {
+                    try {
+                        val packetBytes = Base64.decode(packet, Base64.DEFAULT)
+                        val secretBytes = Base64.decode(secret, Base64.DEFAULT)
+                        val secretKey = SecretKeySpec(secretBytes, "AES")
+                        val iv = IvParameterSpec(secretBytes)
+                        aesDecipher = Cipher.getInstance("AES/CFB8/PKCS5Padding").apply {
+                            init(Cipher.DECRYPT_MODE, secretKey, iv)
+                        }
+                        val result = directlyWritePacket(0x01, packetBytes)
+                        aesCipher = Cipher.getInstance("AES/CFB8/PKCS5Padding").apply {
+                            init(Cipher.ENCRYPT_MODE, secretKey, iv)
+                        }
+                        promise.resolve(result)
+                    } catch (e: Exception) {
+                        promise.reject(e)
+                    }
+                } else promise.resolve(false)
+            }
+        }
+    }
+
     @ReactMethod fun closeConnection(id: String) = lock.write {
         if (id == connectionId.toString()) directlyCloseConnection()
     }

diff --git a/src/minecraft/connection/native.ts b/src/minecraft/connection/native.ts
@@ -112,10 +112,9 @@ export class NativeServerConnection
             this,
             is119,
             async (secret: Buffer, response: Buffer) => {
-              // const AES_ALG = 'aes-128-cfb8'
-              // conn.aesDecipher = createDecipheriv(AES_ALG, secret, secret)
-              await this.writePacket(0x01, response)
-              // conn.aesCipher = createCipheriv(AES_ALG, secret, secret)
+              const eSecret = secret.toString('base64')
+              const eResp = response.toString('base64')
+              return ConnectionModule.enableEncryption(this.id, eSecret, eResp)
             }
           )
         }
@@ -130,12 +129,7 @@ export class NativeServerConnection
     })
     this.eventEmitter.addListener('ecm:close', (event: NativeEvent) => {
       if (event.connectionId !== this.id) return
-      this.eventEmitter.removeAllListeners('ecm:packet')
-      this.eventEmitter.removeAllListeners('ecm:error')
-      this.eventEmitter.removeAllListeners('ecm:close')
-      this.eventEmitter.removeAllListeners('ecm:log')
-      this.closed = true
-      this.emit('close')
+      this.internalClose(false)
     })
   }
 
@@ -144,14 +138,19 @@ export class NativeServerConnection
     return ConnectionModule.writePacket(this.id, packetId, toWrite)
   }
 
-  close() {
+  internalClose(closeConnection: boolean) {
     if (this.closed) return
     this.closed = true
-    ConnectionModule.closeConnection(this.id)
+    if (closeConnection) ConnectionModule.closeConnection(this.id)
     this.eventEmitter.removeAllListeners('ecm:packet')
     this.eventEmitter.removeAllListeners('ecm:error')
     this.eventEmitter.removeAllListeners('ecm:close')
     this.eventEmitter.removeAllListeners('ecm:log')
+    this.emit('close')
+  }
+
+  close() {
+    this.internalClose(true)
   }
 }