2022-11-14 20:14:25 +01:00
|
|
|
From 109cbe179f1d34fe5da186c8ea3e32f2a7236053 Mon Sep 17 00:00:00 2001
|
2022-05-08 13:04:46 +02:00
|
|
|
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
|
2022-11-14 20:14:25 +01:00
|
|
|
index 80d8843f..e8ceddf7 100644
|
2022-05-08 13:04:46 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
2022-11-14 20:14:25 +01:00
|
|
|
@@ -473,6 +473,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
2022-05-08 13:04:46 +02:00
|
|
|
{
|
|
|
|
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
|
2022-06-07 19:12:20 +02:00
|
|
|
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
|
2022-05-08 13:04:46 +02:00
|
|
|
+ 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
|
2022-11-14 20:14:25 +01:00
|
|
|
@@ -527,7 +528,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
2022-05-08 13:04:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
- thisState = State.FINISHING;
|
|
|
|
+ //thisState = State.FINISHING; // Waterfall - move earlier
|
|
|
|
HttpClient.get( authURL, ch.getHandle().eventLoop(), handler );
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2022-11-14 20:14:25 +01:00
|
|
|
2.38.1
|
2022-05-08 13:04:46 +02:00
|
|
|
|