GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix regressions in handling invalid account cases

Browse source
This commit is contained in:
Camotoy 2021-09-28 09:46:12 -04:00
parent 4503991d37
commit 7d176cd669
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -25,6 +25,7 @@
package org.geysermc.connector.network.session; package org.geysermc.connector.network.session;
import com.github.steveice10.mc.auth.data.GameProfile;
import com.github.steveice10.mc.auth.exception.request.AuthPendingException; import com.github.steveice10.mc.auth.exception.request.AuthPendingException;
import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException; import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException;
import com.github.steveice10.mc.auth.exception.request.RequestException; import com.github.steveice10.mc.auth.exception.request.RequestException;
@ -593,7 +594,14 @@ public class GeyserSession implements CommandSender {
authenticationService.setPassword(password); authenticationService.setPassword(password);
authenticationService.login(); authenticationService.login();
protocol = new MinecraftProtocol(authenticationService.getSelectedProfile(), authenticationService.getAccessToken()); GameProfile profile = authenticationService.getSelectedProfile();
if (profile == null) {
// Java account is offline
disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
return null;
}
protocol = new MinecraftProtocol(profile, authenticationService.getAccessToken());
} else { } else {
// always replace spaces when using Floodgate, // always replace spaces when using Floodgate,
// as usernames with spaces cause issues with Bungeecord's login cycle. // as usernames with spaces cause issues with Bungeecord's login cycle.
@ -618,7 +626,9 @@ public class GeyserSession implements CommandSender {
disconnect(ex.toString()); disconnect(ex.toString());
} }
if (this.closed) { if (this.closed) {
connector.getLogger().error("", ex); if (ex != null) {
connector.getLogger().error("", ex);
}
// Client disconnected during the authentication attempt // Client disconnected during the authentication attempt
return; return;
} }
@ -657,6 +667,7 @@ public class GeyserSession implements CommandSender {
}).whenComplete((response, ex) -> { }).whenComplete((response, ex) -> {
if (ex != null) { if (ex != null) {
ex.printStackTrace(); ex.printStackTrace();
disconnect(ex.toString());
return; return;
} }
LoginEncryptionUtils.buildAndShowMicrosoftCodeWindow(this, response); LoginEncryptionUtils.buildAndShowMicrosoftCodeWindow(this, response);
@ -673,7 +684,14 @@ public class GeyserSession implements CommandSender {
} }
try { try {
msaAuthenticationService.login(); msaAuthenticationService.login();
protocol = new MinecraftProtocol(msaAuthenticationService.getSelectedProfile(), msaAuthenticationService.getAccessToken()); GameProfile profile = msaAuthenticationService.getSelectedProfile();
if (profile == null) {
// Java account is offline
disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
return;
}
protocol = new MinecraftProtocol(profile, msaAuthenticationService.getAccessToken());
connectDownstream(); connectDownstream();
} catch (RequestException e) { } catch (RequestException e) {
@ -773,11 +791,6 @@ public class GeyserSession implements CommandSender {
public void connected(ConnectedEvent event) { public void connected(ConnectedEvent event) {
loggingIn = false; loggingIn = false;
loggedIn = true; loggedIn = true;
if (protocol.getProfile() == null) {
// Java account is offline
disconnect(LanguageUtils.getPlayerLocaleString("geyser.network.remote.invalid_account", clientData.getLanguageCode()));
return;
}
if (downstream.isInternallyConnecting()) { if (downstream.isInternallyConnecting()) {
// Connected directly to the server // Connected directly to the server