Grasscutters/GCAuth
2
0
Fork 0
mirror of https://github.com/exzork/GCAuth.git synced 2024-11-24 00:23:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17 from omg-xtao/improve

Browse Source 
Improve some code
This commit is contained in:
Muhammad Eko Prasetyo 2022-05-15 09:38:49 +07:00 committed by GitHub
commit 9d991b2749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/me/exzork/gcauth/GCAuth.java
View File

@ -3,7 +3,10 @@ package me.exzork.gcauth;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.DefaultAuthentication;
import emu.grasscutter.plugin.Plugin;
import static emu.grasscutter.Configuration.ACCOUNT;
import me.exzork.gcauth.handler.*;
import me.exzork.gcauth.utils.Authentication;
@ -34,14 +37,14 @@ public class GCAuth extends Plugin {
getLogger().info("GCAuth Enabled!");
config.jwtSecret = Authentication.generateRandomString(32);
saveConfig();
if (Grasscutter.getConfig().account.autoCreate) {
if (ACCOUNT.autoCreate) {
getLogger().warn("GCAuth does not support automatic account creation. Please disable in the server's config.json or just ignore this warning.");
}
}
@Override
public void onDisable() {
Grasscutter.setAuthenticationSystem(new DefaultAuthentication());
}
public void loadConfig() {

15
src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java
View File

@ -1,9 +1,6 @@
package me.exzork.gcauth.handler;
import emu.grasscutter.auth.AuthenticationSystem;
import emu.grasscutter.auth.Authenticator;
import emu.grasscutter.auth.DefaultAuthenticators;
import emu.grasscutter.auth.ExternalAuthenticator;
import emu.grasscutter.auth.*;
import emu.grasscutter.server.http.objects.ComboTokenResJson;
import emu.grasscutter.server.http.objects.LoginResultJson;
@ -11,16 +8,16 @@ public class GCAuthAuthenticationHandler implements AuthenticationSystem {
private final Authenticator<LoginResultJson> gcAuthAuthenticator = new GCAuthenticators.GCAuthAuthenticator();
private final Authenticator<LoginResultJson> tokenAuthenticator = new DefaultAuthenticators.TokenAuthenticator();
private final Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new DefaultAuthenticators.SessionKeyAuthenticator();
private final GCAuthExternalAuthenticator handler = new GCAuthExternalAuthenticator();
private final GCAuthExternalAuthenticator externalAuthenticator = new GCAuthExternalAuthenticator();
@Override
public void createAccount(String username, String password) {
// Unhandled.
}
@Override
public void resetPassword(String s) {
public void resetPassword(String username) {
// Unhandled.
}
@Override
@ -45,6 +42,6 @@ public class GCAuthAuthenticationHandler implements AuthenticationSystem {
@Override
public ExternalAuthenticator getExternalAuthenticator() {
return handler;
return externalAuthenticator;
}
}

23
src/main/java/me/exzork/gcauth/handler/GCAuthExternalAuthenticator.java
View File

@ -6,6 +6,7 @@ import emu.grasscutter.auth.AuthenticationSystem;
import emu.grasscutter.auth.ExternalAuthenticator;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.Account;
import express.http.Response;
import me.exzork.gcauth.GCAuth;
import me.exzork.gcauth.json.AuthResponseJson;
import me.exzork.gcauth.json.ChangePasswordAccount;
@ -17,8 +18,11 @@ public class GCAuthExternalAuthenticator implements ExternalAuthenticator {
@Override
public void handleLogin(AuthenticationSystem.AuthenticationRequest authenticationRequest) {
AuthResponseJson authResponse = new AuthResponseJson();
Response response = authenticationRequest.getResponse();
assert response != null; // This should never be null.
try {
String requestBody = authenticationRequest.getRequest().ctx().body();
String requestBody = response.ctx().body();
if (requestBody.isEmpty()) {
authResponse.success = false;
authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request"
@ -55,15 +59,18 @@ public class GCAuthExternalAuthenticator implements ExternalAuthenticator {
Grasscutter.getLogger().error("[Dispatch] An error occurred while a user was logging in.");
e.printStackTrace();
}
authenticationRequest.getResponse().send(authResponse);
response.send(authResponse);
}
@Override
public void handleAccountCreation(AuthenticationSystem.AuthenticationRequest authenticationRequest) {
AuthResponseJson authResponse = new AuthResponseJson();
Response response = authenticationRequest.getResponse();
assert response != null; // This should never be null.
Account account = null;
try {
String requestBody = authenticationRequest.getRequest().ctx().body();
String requestBody = response.ctx().body();
if (requestBody.isEmpty()) {
authResponse.success = false;
authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request"
@ -129,14 +136,17 @@ public class GCAuthExternalAuthenticator implements ExternalAuthenticator {
}
}
}
authenticationRequest.getResponse().send(authResponse);
response.send(authResponse);
}
@Override
public void handlePasswordReset(AuthenticationSystem.AuthenticationRequest authenticationRequest) {
AuthResponseJson authResponse = new AuthResponseJson();
Response response = authenticationRequest.getResponse();
assert response != null; // This should never be null.
try {
String requestBody = authenticationRequest.getRequest().ctx().body();
String requestBody = response.ctx().body();
if (requestBody.isEmpty()) {
authResponse.success = false;
authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request"
@ -182,7 +192,6 @@ public class GCAuthExternalAuthenticator implements ExternalAuthenticator {
Grasscutter.getLogger().error("[Dispatch] Error while changing user password.");
e.printStackTrace();
}
authenticationRequest.getResponse().send(authResponse);
response.send(authResponse);
}
}

4
src/main/java/me/exzork/gcauth/handler/GCAuthenticators.java
View File

@ -3,7 +3,6 @@ package me.exzork.gcauth.handler;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.AuthenticationSystem;
import emu.grasscutter.auth.Authenticator;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.Account;
import emu.grasscutter.server.http.objects.LoginResultJson;
import me.exzork.gcauth.utils.Authentication;
@ -17,7 +16,8 @@ public class GCAuthenticators {
var response = new LoginResultJson();
var requestData = authenticationRequest.getPasswordRequest();
assert requestData != null;
assert requestData != null; // This should never be null.
Account account = Authentication.getAccountByOneTimeToken(requestData.account);
if(account == null) {
Grasscutter.getLogger().info("[GCAuth] Client " + requestData.account + " tried to login with invalid one time token.");

4
src/main/resources/plugin.json
View File

@ -1,7 +1,7 @@
{
"name": "GCAuth",
"description": "GCAuth is a plugin that allows you to implement authentication for your server.",
"version": "1.0.0",
"version": "2.2.0",
"author": ["ExZork"],
"mainClass": "me.exzork.gcauth.GCAuth"
}
}