mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-28 06:27:28 +02:00
25ecd402f3
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 1a807731 #3567: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 772ad995 #3566: Bump actions/setup-java from 3 to 4 2431c40a #3562: Bump io.netty:netty-bom from 4.1.100.Final to 4.1.101.Final 8144ae8d #3555: Bump com.mysql:mysql-connector-j from 8.1.0 to 8.2.0 0757c39a Attempt upgrade of resolver libraries
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
From 9f02acf8b272fc63840c758087213c5d464abcf1 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sun, 8 May 2022 12:04:30 +0100
|
|
Subject: [PATCH] Improve login state transition
|
|
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
index 97fcd106..9c322fb5 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
@@ -472,6 +472,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
{
|
|
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
|
|
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
|
|
+ thisState = State.FINISHING; // Waterfall - move earlier - There is no verification of this later (and this is not API)
|
|
|
|
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
|
|
// Waterfall start
|
|
@@ -526,7 +527,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
}
|
|
}
|
|
};
|
|
- thisState = State.FINISHING;
|
|
+ //thisState = State.FINISHING; // Waterfall - move earlier
|
|
HttpClient.get( authURL, ch.getHandle().eventLoop(), handler );
|
|
}
|
|
|
|
--
|
|
2.43.0
|
|
|