Allow connections even if encryption failed to initialize post-1.16.2…

…20 (#2147) This allows Java 16 to still be compatible with Geyser.
GeyserMC · May 2, 2021 · e74fa6c · e74fa6c
1 parent 1301cd9
commit e74fa6c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/connector/pom.xml b/connector/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.github.CloudburstMC.Protocol</groupId>
             <artifactId>bedrock-v431</artifactId>
-            <version>f8ecf54</version>
+            <version>9947665</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>

diff --git a/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java b/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
@@ -60,6 +60,8 @@
 public class LoginEncryptionUtils {
     private static final ObjectMapper JSON_MAPPER = new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 
+    private static boolean HAS_SENT_ENCRYPTION_MESSAGE = false;
+
     private static boolean validateChainData(JsonNode data) throws Exception {
         ECPublicKey lastKey = null;
         boolean validChain = false;
@@ -133,7 +135,18 @@ private static void encryptConnectionWithCert(GeyserConnector connector, GeyserS
             session.setClientData(JSON_MAPPER.convertValue(JSON_MAPPER.readTree(clientJwt.getPayload().toBytes()), BedrockClientData.class));
 
             if (EncryptionUtils.canUseEncryption()) {
-                LoginEncryptionUtils.startEncryptionHandshake(session, identityPublicKey);
+                try {
+                    LoginEncryptionUtils.startEncryptionHandshake(session, identityPublicKey);
+                } catch (Throwable e) {
+                    // An error can be thrown on older Java 8 versions about an invalid key
+                    if (connector.getConfig().isDebugMode()) {
+                        e.printStackTrace();
+                    }
+
+                    sendEncryptionFailedMessage(connector);
+                }
+            } else {
+                sendEncryptionFailedMessage(connector);
             }
         } catch (Exception ex) {
             session.disconnect("disconnectionScreen.internalError.cantConnect");
@@ -155,6 +168,14 @@ private static void startEncryptionHandshake(GeyserSession session, PublicKey ke
         session.sendUpstreamPacketImmediately(packet);
     }
 
+    private static void sendEncryptionFailedMessage(GeyserConnector connector) {
+        if (!HAS_SENT_ENCRYPTION_MESSAGE) {
+            connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_1"));
+            connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.encryption.line_2", "https://geysermc.org/supported_java"));
+            HAS_SENT_ENCRYPTION_MESSAGE = true;
+        }
+    }
+
     private static final int AUTH_MSA_DETAILS_FORM_ID = 1334;
     private static final int AUTH_MSA_CODE_FORM_ID = 1335;
     private static final int AUTH_FORM_ID = 1336;

diff --git a/connector/src/main/resources/languages b/connector/src/main/resources/languages
+18 −0		run-help/be_BY.txt
+5 −6		run-help/hi_IN.txt
+192 −0		texts/be_BY.properties
+1 −1		texts/da_DK.properties
+50 −50		texts/de_DE.properties
+2 −0		texts/en_US.properties
+8 −8		texts/es_ES.properties
+8 −8		texts/es_MX.properties
+161 −161		texts/hi_IN.properties
+5 −5		texts/id_ID.properties
+1 −1		texts/ko_KR.properties
+44 −44		texts/pl_PL.properties