From 2c0fd486e11863d57b253d80cf04d523eba609b6 Mon Sep 17 00:00:00 2001 From: muhammadeko Date: Sun, 15 May 2022 09:30:08 +0700 Subject: [PATCH] change class name --- src/main/java/me/exzork/gcauth/GCAuth.java | 2 +- .../gcauth/handler/GCAuthAuthentication.java | 47 ---- .../handler/GCAuthAuthenticationHandler.java | 217 +++--------------- .../handler/GCAuthExternalAuthenticator.java | 198 ++++++++++++++++ 4 files changed, 232 insertions(+), 232 deletions(-) delete mode 100644 src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java create mode 100644 src/main/java/me/exzork/gcauth/handler/GCAuthExternalAuthenticator.java diff --git a/src/main/java/me/exzork/gcauth/GCAuth.java b/src/main/java/me/exzork/gcauth/GCAuth.java index a0390b4..330ab10 100644 --- a/src/main/java/me/exzork/gcauth/GCAuth.java +++ b/src/main/java/me/exzork/gcauth/GCAuth.java @@ -33,7 +33,7 @@ public class GCAuth extends Plugin { } } loadConfig(); - Grasscutter.setAuthenticationSystem(new GCAuthAuthentication()); + Grasscutter.setAuthenticationSystem(new GCAuthAuthenticationHandler()); getLogger().info("GCAuth Enabled!"); config.jwtSecret = Authentication.generateRandomString(32); saveConfig(); diff --git a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java deleted file mode 100644 index fcecaa8..0000000 --- a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthentication.java +++ /dev/null @@ -1,47 +0,0 @@ -package me.exzork.gcauth.handler; - -import emu.grasscutter.auth.*; -import emu.grasscutter.server.http.objects.ComboTokenResJson; -import emu.grasscutter.server.http.objects.LoginResultJson; - -public class GCAuthAuthentication implements AuthenticationSystem { - private final Authenticator gcAuthAuthenticator = new GCAuthenticators.GCAuthAuthenticator(); - private final Authenticator tokenAuthenticator = new DefaultAuthenticators.TokenAuthenticator(); - private final Authenticator sessionKeyAuthenticator = new DefaultAuthenticators.SessionKeyAuthenticator(); - private final GCAuthAuthenticationHandler externalAuthenticator = new GCAuthAuthenticationHandler(); - - @Override - public void createAccount(String username, String password) { - // Unhandled. - } - - @Override - public void resetPassword(String username) { - // Unhandled. - } - - @Override - public boolean verifyUser(String s) { - return false; - } - - @Override - public Authenticator getPasswordAuthenticator() { - return gcAuthAuthenticator; - } - - @Override - public Authenticator getTokenAuthenticator() { - return tokenAuthenticator; - } - - @Override - public Authenticator getSessionKeyAuthenticator() { - return sessionKeyAuthenticator; - } - - @Override - public ExternalAuthenticator getExternalAuthenticator() { - return externalAuthenticator; - } -} diff --git a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java index 61e9ecf..8bef388 100644 --- a/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java +++ b/src/main/java/me/exzork/gcauth/handler/GCAuthAuthenticationHandler.java @@ -1,198 +1,47 @@ package me.exzork.gcauth.handler; -import com.google.gson.Gson; -import emu.grasscutter.Grasscutter; -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; -import me.exzork.gcauth.json.LoginGenerateToken; -import me.exzork.gcauth.json.RegisterAccount; -import me.exzork.gcauth.utils.Authentication; +import emu.grasscutter.auth.*; +import emu.grasscutter.server.http.objects.ComboTokenResJson; +import emu.grasscutter.server.http.objects.LoginResultJson; + +public class GCAuthAuthenticationHandler implements AuthenticationSystem { + private final Authenticator gcAuthAuthenticator = new GCAuthenticators.GCAuthAuthenticator(); + private final Authenticator tokenAuthenticator = new DefaultAuthenticators.TokenAuthenticator(); + private final Authenticator sessionKeyAuthenticator = new DefaultAuthenticators.SessionKeyAuthenticator(); + private final GCAuthExternalAuthenticator externalAuthenticator = new GCAuthExternalAuthenticator(); -public class GCAuthAuthenticationHandler 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 = response.ctx().body(); - if (requestBody.isEmpty()) { - authResponse.success = false; - authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" - authResponse.jwt = ""; - } else { - LoginGenerateToken loginGenerateToken = new Gson().fromJson(requestBody, LoginGenerateToken.class); - if (!GCAuth.getConfigStatic().ACCESS_KEY.isEmpty() && !GCAuth.getConfigStatic().ACCESS_KEY.equals(loginGenerateToken.access_key)){ - authResponse.success = false; - authResponse.message = "ERROR_ACCESS_KEY"; // ENG = "Error access key was sent with the request" - authResponse.jwt = ""; - } else { - Account account = Authentication.getAccountByUsernameAndPassword(loginGenerateToken.username, loginGenerateToken.password); - if (account == null) { - authResponse.success = false; - authResponse.message = "INVALID_ACCOUNT"; // ENG = "Invalid username or password" - authResponse.jwt = ""; - } else { - if (account.getPassword() != null && !account.getPassword().isEmpty()) { - authResponse.success = true; - authResponse.message = ""; - authResponse.jwt = Authentication.generateJwt(account); - } else { - authResponse.success = false; - authResponse.message = "NO_PASSWORD"; // ENG = "There is no account password set. Please create a password by resetting it." - authResponse.jwt = ""; - } - } - } - } - } catch (Exception e) { - authResponse.success = false; - authResponse.message = "UNKNOWN"; // ENG = "An unknown error has occurred..." - authResponse.jwt = ""; - Grasscutter.getLogger().error("[Dispatch] An error occurred while a user was logging in."); - e.printStackTrace(); - } - response.send(authResponse); + public void createAccount(String username, String password) { + // Unhandled. } @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 = response.ctx().body(); - if (requestBody.isEmpty()) { - authResponse.success = false; - authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" - authResponse.jwt = ""; - } else { - RegisterAccount registerAccount = new Gson().fromJson(requestBody, RegisterAccount.class); - if (!GCAuth.getConfigStatic().ACCESS_KEY.isEmpty() && !GCAuth.getConfigStatic().ACCESS_KEY.equals(registerAccount.access_key)){ - authResponse.success = false; - authResponse.message = "ERROR_ACCESS_KEY"; // ENG = "Error access key was sent with the request" - authResponse.jwt = ""; - } else { - if (registerAccount.password.equals(registerAccount.password_confirmation)) { - if (registerAccount.password.length() >= 8) { - String password = Authentication.generateHash(registerAccount.password); - try{ - account = Authentication.getAccountByUsernameAndPassword(registerAccount.username, ""); - if (account != null) { - account.setPassword(password); - account.save(); - authResponse.success = true; - authResponse.message = ""; - authResponse.jwt = ""; - } else { - account = DatabaseHelper.createAccountWithPassword(registerAccount.username, password); - if (account == null) { - authResponse.success = false; - authResponse.message = "USERNAME_TAKEN"; // ENG = "Username has already been taken by another user." - authResponse.jwt = ""; - } else { - authResponse.success = true; - authResponse.message = ""; - authResponse.jwt = ""; - } - } - }catch (Exception ignored){ - authResponse.success = false; - authResponse.message = "UNKNOWN"; // ENG = "Username has already been taken by another user." - authResponse.jwt = ""; - } - } else { - authResponse.success = false; - authResponse.message = "PASSWORD_INVALID"; // ENG = "Password must be at least 8 characters long" - authResponse.jwt = ""; - } - } else { - authResponse.success = false; - authResponse.message = "PASSWORD_MISMATCH"; // ENG = "Passwords do not match." - authResponse.jwt = ""; - } - } - } - } catch (Exception e) { - authResponse.success = false; - authResponse.message = "UNKNOWN"; // ENG = "An unknown error has occurred..." - authResponse.jwt = ""; - Grasscutter.getLogger().error("[Dispatch] An error occurred while creating an account."); - e.printStackTrace(); - } - if (authResponse.success) { - if (GCAuth.getConfigStatic().defaultPermissions.length > 0) { - for (String permission : GCAuth.getConfigStatic().defaultPermissions) { - account.addPermission(permission); - } - } - } - response.send(authResponse); + public void resetPassword(String username) { + // Unhandled. } @Override - public void handlePasswordReset(AuthenticationSystem.AuthenticationRequest authenticationRequest) { - AuthResponseJson authResponse = new AuthResponseJson(); - Response response = authenticationRequest.getResponse(); - assert response != null; // This should never be null. + public boolean verifyUser(String s) { + return false; + } - try { - String requestBody = response.ctx().body(); - if (requestBody.isEmpty()) { - authResponse.success = false; - authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" - authResponse.jwt = ""; - } else { - ChangePasswordAccount changePasswordAccount = new Gson().fromJson(requestBody, ChangePasswordAccount.class); - if (!GCAuth.getConfigStatic().ACCESS_KEY.isEmpty() && !GCAuth.getConfigStatic().ACCESS_KEY.equals(changePasswordAccount.access_key)){ - authResponse.success = false; - authResponse.message = "ERROR_ACCESS_KEY"; // ENG = "Error access key was sent with the request" - authResponse.jwt = ""; - } else { - if (changePasswordAccount.new_password.equals(changePasswordAccount.new_password_confirmation)) { - Account account = Authentication.getAccountByUsernameAndPassword(changePasswordAccount.username, changePasswordAccount.old_password); - if (account == null) { - authResponse.success = false; - authResponse.message = "INVALID_ACCOUNT"; // ENG = "Invalid username or password" - authResponse.jwt = ""; - } else { - if (changePasswordAccount.new_password.length() >= 8) { - String newPassword = Authentication.generateHash(changePasswordAccount.new_password); - account.setPassword(newPassword); - account.save(); - authResponse.success = true; - authResponse.message = ""; - authResponse.jwt = ""; - } else { - authResponse.success = false; - authResponse.message = "PASSWORD_INVALID"; // ENG = "Password must be at least 8 characters long" - authResponse.jwt = ""; - } - } - } else { - authResponse.success = false; - authResponse.message = "PASSWORD_MISMATCH"; // ENG = "Passwords do not match." - authResponse.jwt = ""; - } - } - } - } catch (Exception e) { - authResponse.success = false; - authResponse.message = "UNKNOWN"; // ENG = "An unknown error has occurred..." - authResponse.jwt = ""; - Grasscutter.getLogger().error("[Dispatch] Error while changing user password."); - e.printStackTrace(); - } + @Override + public Authenticator getPasswordAuthenticator() { + return gcAuthAuthenticator; + } - response.send(authResponse); + @Override + public Authenticator getTokenAuthenticator() { + return tokenAuthenticator; + } + + @Override + public Authenticator getSessionKeyAuthenticator() { + return sessionKeyAuthenticator; + } + + @Override + public ExternalAuthenticator getExternalAuthenticator() { + return externalAuthenticator; } } diff --git a/src/main/java/me/exzork/gcauth/handler/GCAuthExternalAuthenticator.java b/src/main/java/me/exzork/gcauth/handler/GCAuthExternalAuthenticator.java new file mode 100644 index 0000000..b02a624 --- /dev/null +++ b/src/main/java/me/exzork/gcauth/handler/GCAuthExternalAuthenticator.java @@ -0,0 +1,198 @@ +package me.exzork.gcauth.handler; + +import com.google.gson.Gson; +import emu.grasscutter.Grasscutter; +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; +import me.exzork.gcauth.json.LoginGenerateToken; +import me.exzork.gcauth.json.RegisterAccount; +import me.exzork.gcauth.utils.Authentication; + +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 = response.ctx().body(); + if (requestBody.isEmpty()) { + authResponse.success = false; + authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" + authResponse.jwt = ""; + } else { + LoginGenerateToken loginGenerateToken = new Gson().fromJson(requestBody, LoginGenerateToken.class); + if (!GCAuth.getConfigStatic().ACCESS_KEY.isEmpty() && !GCAuth.getConfigStatic().ACCESS_KEY.equals(loginGenerateToken.access_key)){ + authResponse.success = false; + authResponse.message = "ERROR_ACCESS_KEY"; // ENG = "Error access key was sent with the request" + authResponse.jwt = ""; + } else { + Account account = Authentication.getAccountByUsernameAndPassword(loginGenerateToken.username, loginGenerateToken.password); + if (account == null) { + authResponse.success = false; + authResponse.message = "INVALID_ACCOUNT"; // ENG = "Invalid username or password" + authResponse.jwt = ""; + } else { + if (account.getPassword() != null && !account.getPassword().isEmpty()) { + authResponse.success = true; + authResponse.message = ""; + authResponse.jwt = Authentication.generateJwt(account); + } else { + authResponse.success = false; + authResponse.message = "NO_PASSWORD"; // ENG = "There is no account password set. Please create a password by resetting it." + authResponse.jwt = ""; + } + } + } + } + } catch (Exception e) { + authResponse.success = false; + authResponse.message = "UNKNOWN"; // ENG = "An unknown error has occurred..." + authResponse.jwt = ""; + Grasscutter.getLogger().error("[Dispatch] An error occurred while a user was logging in."); + e.printStackTrace(); + } + 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 = response.ctx().body(); + if (requestBody.isEmpty()) { + authResponse.success = false; + authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" + authResponse.jwt = ""; + } else { + RegisterAccount registerAccount = new Gson().fromJson(requestBody, RegisterAccount.class); + if (!GCAuth.getConfigStatic().ACCESS_KEY.isEmpty() && !GCAuth.getConfigStatic().ACCESS_KEY.equals(registerAccount.access_key)){ + authResponse.success = false; + authResponse.message = "ERROR_ACCESS_KEY"; // ENG = "Error access key was sent with the request" + authResponse.jwt = ""; + } else { + if (registerAccount.password.equals(registerAccount.password_confirmation)) { + if (registerAccount.password.length() >= 8) { + String password = Authentication.generateHash(registerAccount.password); + try{ + account = Authentication.getAccountByUsernameAndPassword(registerAccount.username, ""); + if (account != null) { + account.setPassword(password); + account.save(); + authResponse.success = true; + authResponse.message = ""; + authResponse.jwt = ""; + } else { + account = DatabaseHelper.createAccountWithPassword(registerAccount.username, password); + if (account == null) { + authResponse.success = false; + authResponse.message = "USERNAME_TAKEN"; // ENG = "Username has already been taken by another user." + authResponse.jwt = ""; + } else { + authResponse.success = true; + authResponse.message = ""; + authResponse.jwt = ""; + } + } + }catch (Exception ignored){ + authResponse.success = false; + authResponse.message = "UNKNOWN"; // ENG = "Username has already been taken by another user." + authResponse.jwt = ""; + } + } else { + authResponse.success = false; + authResponse.message = "PASSWORD_INVALID"; // ENG = "Password must be at least 8 characters long" + authResponse.jwt = ""; + } + } else { + authResponse.success = false; + authResponse.message = "PASSWORD_MISMATCH"; // ENG = "Passwords do not match." + authResponse.jwt = ""; + } + } + } + } catch (Exception e) { + authResponse.success = false; + authResponse.message = "UNKNOWN"; // ENG = "An unknown error has occurred..." + authResponse.jwt = ""; + Grasscutter.getLogger().error("[Dispatch] An error occurred while creating an account."); + e.printStackTrace(); + } + if (authResponse.success) { + if (GCAuth.getConfigStatic().defaultPermissions.length > 0) { + for (String permission : GCAuth.getConfigStatic().defaultPermissions) { + account.addPermission(permission); + } + } + } + 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 = response.ctx().body(); + if (requestBody.isEmpty()) { + authResponse.success = false; + authResponse.message = "EMPTY_BODY"; // ENG = "No data was sent with the request" + authResponse.jwt = ""; + } else { + ChangePasswordAccount changePasswordAccount = new Gson().fromJson(requestBody, ChangePasswordAccount.class); + if (!GCAuth.getConfigStatic().ACCESS_KEY.isEmpty() && !GCAuth.getConfigStatic().ACCESS_KEY.equals(changePasswordAccount.access_key)){ + authResponse.success = false; + authResponse.message = "ERROR_ACCESS_KEY"; // ENG = "Error access key was sent with the request" + authResponse.jwt = ""; + } else { + if (changePasswordAccount.new_password.equals(changePasswordAccount.new_password_confirmation)) { + Account account = Authentication.getAccountByUsernameAndPassword(changePasswordAccount.username, changePasswordAccount.old_password); + if (account == null) { + authResponse.success = false; + authResponse.message = "INVALID_ACCOUNT"; // ENG = "Invalid username or password" + authResponse.jwt = ""; + } else { + if (changePasswordAccount.new_password.length() >= 8) { + String newPassword = Authentication.generateHash(changePasswordAccount.new_password); + account.setPassword(newPassword); + account.save(); + authResponse.success = true; + authResponse.message = ""; + authResponse.jwt = ""; + } else { + authResponse.success = false; + authResponse.message = "PASSWORD_INVALID"; // ENG = "Password must be at least 8 characters long" + authResponse.jwt = ""; + } + } + } else { + authResponse.success = false; + authResponse.message = "PASSWORD_MISMATCH"; // ENG = "Passwords do not match." + authResponse.jwt = ""; + } + } + } + } catch (Exception e) { + authResponse.success = false; + authResponse.message = "UNKNOWN"; // ENG = "An unknown error has occurred..." + authResponse.jwt = ""; + Grasscutter.getLogger().error("[Dispatch] Error while changing user password."); + e.printStackTrace(); + } + + response.send(authResponse); + } +}