feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

style: ProxyAgnosticMojangResolver: Extracted the URL into a constant

Browse Source 
The URL of the mojang session server call in ProxyAgnosticMojangResolver was extracted into a constant in order to mitigate the "magic constants" problem.

Additionally, the 204 in the response code check was replaced by a constant from HttpURLConnection, again, in order to not use any magic numbers.
This commit is contained in:
Enginecrafter77
2022-06-10 11:28:59 +02:00
parent 6413ca4d10
commit edd82f7978
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/com/github/games647/fastlogin/core/mojang/ProxyAgnosticMojangResolver.java
View File

@ -42,21 +42,34 @@ import java.util.Optional;
* @author games647, Enginecrafter77 * @author games647, Enginecrafter77
*/ */
public class ProxyAgnosticMojangResolver extends MojangResolver { public class ProxyAgnosticMojangResolver extends MojangResolver {
/**
* A formatting string containing an URL used to call the {@code hasJoined} method on mojang session servers.
*
* Formatting parameters:
* 1. The username of the player in question
* 2. The serverId of this server
*/
public static final String MOJANG_SESSIONSERVER_HASJOINED_CALL_URLFMT = "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=%s&serverId=%s";
@Override @Override
public Optional<Verification> hasJoined(String username, String serverHash, InetAddress hostIp) throws IOException public Optional<Verification> hasJoined(String username, String serverHash, InetAddress hostIp) throws IOException
{ {
String url = String.format("https://sessionserver.mojang.com/session/minecraft/hasJoined?username=%s&serverId=%s", username, serverHash); String url = String.format(MOJANG_SESSIONSERVER_HASJOINED_CALL_URLFMT, username, serverHash);
HttpURLConnection conn = this.getConnection(url); HttpURLConnection conn = this.getConnection(url);
int responseCode = conn.getResponseCode(); int responseCode = conn.getResponseCode();
Verification verification = null; Verification verification = null;
if(responseCode != 204)
// Mojang session servers send HTTP 204 (NO CONTENT) when the authentication seems invalid
// If that's not our case, the authentication is valid, and so we can parse the response.
if(responseCode != HttpURLConnection.HTTP_NO_CONTENT)
verification = this.parseRequest(conn, this::parseVerification); verification = this.parseRequest(conn, this::parseVerification);
return Optional.ofNullable(verification); return Optional.ofNullable(verification);
} }
// Functional implementation of InputStreamAction // Functional implementation of InputStreamAction, used in hasJoined method in parseRequest call
protected Verification parseVerification(InputStream input) throws IOException protected Verification parseVerification(InputStream input) throws IOException
{ {
return this.readJson(input, Verification.class); return this.readJson(input, Verification.class);