hot fix, change class name

This commit is contained in:
muhammadeko 2022-05-15 09:21:08 +07:00
parent 21b0a44ce7
commit 181cb7d9f4
No known key found for this signature in database
GPG Key ID: 51366716C10E98B1
5 changed files with 225 additions and 226 deletions

View File

@ -16,7 +16,7 @@ Grasscutter Authentication System
- To use access control, you need set the `ACCESS_KEY` in config.json inside plugins/GCAuth. (Optional) - To use access control, you need set the `ACCESS_KEY` in config.json inside plugins/GCAuth. (Optional)
- All payload must be send with `application/json` and Compact JSON format ( without unnecessary spaces ) - All payload must be send with `application/json` and Compact JSON format ( without unnecessary spaces )
- Auth endpoint is: - Auth endpoint is:
- Authentication Checking : `/authentication/type` (GET) , it'll return `GCAuthAuthentication` if GCAuth is loaded and enabled. - Authentication Checking : `/authentication/type` (GET) , it'll return `GCAuthAuthenticationHanlder` if GCAuth is loaded and enabled.
- Register: `/authentication/register` (POST) - Register: `/authentication/register` (POST)
``` ```
{"username":"username","password":"password","password_confirmation":"password_confirmation"} {"username":"username","password":"password","password_confirmation":"password_confirmation"}

View File

@ -12,7 +12,6 @@ import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.logging.Logger;
public class GCAuth extends Plugin { public class GCAuth extends Plugin {
@ -31,7 +30,7 @@ public class GCAuth extends Plugin {
} }
} }
loadConfig(); loadConfig();
Grasscutter.setAuthenticationSystem(new GCAuthAuthentication()); Grasscutter.setAuthenticationSystem(new GCAuthAuthenticationHandler());
getLogger().info("GCAuth Enabled!"); getLogger().info("GCAuth Enabled!");
config.jwtSecret = Authentication.generateRandomString(32); config.jwtSecret = Authentication.generateRandomString(32);
saveConfig(); saveConfig();

View File

@ -1,50 +0,0 @@
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.server.http.objects.ComboTokenResJson;
import emu.grasscutter.server.http.objects.LoginResultJson;
public class GCAuthAuthentication 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 GCAuthAuthenticationHandler handler = new GCAuthAuthenticationHandler();
@Override
public void createAccount(String username, String password) {
}
@Override
public void resetPassword(String s) {
}
@Override
public boolean verifyUser(String s) {
return false;
}
@Override
public Authenticator<LoginResultJson> getPasswordAuthenticator() {
return gcAuthAuthenticator;
}
@Override
public Authenticator<LoginResultJson> getTokenAuthenticator() {
return tokenAuthenticator;
}
@Override
public Authenticator<ComboTokenResJson> getSessionKeyAuthenticator() {
return sessionKeyAuthenticator;
}
@Override
public ExternalAuthenticator getExternalAuthenticator() {
return handler;
}
}

View File

@ -1,188 +1,50 @@
package me.exzork.gcauth.handler; package me.exzork.gcauth.handler;
import com.google.gson.Gson;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.AuthenticationSystem; import emu.grasscutter.auth.AuthenticationSystem;
import emu.grasscutter.auth.Authenticator;
import emu.grasscutter.auth.DefaultAuthenticators;
import emu.grasscutter.auth.ExternalAuthenticator; import emu.grasscutter.auth.ExternalAuthenticator;
import emu.grasscutter.database.DatabaseHelper; import emu.grasscutter.server.http.objects.ComboTokenResJson;
import emu.grasscutter.game.Account; import emu.grasscutter.server.http.objects.LoginResultJson;
import me.exzork.gcauth.GCAuth;
import me.exzork.gcauth.json.AuthResponseJson; public class GCAuthAuthenticationHandler implements AuthenticationSystem {
import me.exzork.gcauth.json.ChangePasswordAccount; private final Authenticator<LoginResultJson> gcAuthAuthenticator = new GCAuthenticators.GCAuthAuthenticator();
import me.exzork.gcauth.json.LoginGenerateToken; private final Authenticator<LoginResultJson> tokenAuthenticator = new DefaultAuthenticators.TokenAuthenticator();
import me.exzork.gcauth.json.RegisterAccount; private final Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new DefaultAuthenticators.SessionKeyAuthenticator();
import me.exzork.gcauth.utils.Authentication; private final GCAuthExternalAuthenticator handler = new GCAuthExternalAuthenticator();
public class GCAuthAuthenticationHandler implements ExternalAuthenticator {
@Override @Override
public void handleLogin(AuthenticationSystem.AuthenticationRequest authenticationRequest) { public void createAccount(String username, String password) {
AuthResponseJson authResponse = new AuthResponseJson();
try {
String requestBody = authenticationRequest.getRequest().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();
}
authenticationRequest.getResponse().send(authResponse);
} }
@Override @Override
public void handleAccountCreation(AuthenticationSystem.AuthenticationRequest authenticationRequest) { public void resetPassword(String s) {
AuthResponseJson authResponse = new AuthResponseJson();
Account account = null;
try {
String requestBody = authenticationRequest.getRequest().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);
}
}
}
authenticationRequest.getResponse().send(authResponse);
} }
@Override @Override
public void handlePasswordReset(AuthenticationSystem.AuthenticationRequest authenticationRequest) { public boolean verifyUser(String s) {
AuthResponseJson authResponse = new AuthResponseJson(); return false;
try { }
String requestBody = authenticationRequest.getRequest().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();
}
authenticationRequest.getResponse().send(authResponse); @Override
public Authenticator<LoginResultJson> getPasswordAuthenticator() {
return gcAuthAuthenticator;
}
@Override
public Authenticator<LoginResultJson> getTokenAuthenticator() {
return tokenAuthenticator;
}
@Override
public Authenticator<ComboTokenResJson> getSessionKeyAuthenticator() {
return sessionKeyAuthenticator;
}
@Override
public ExternalAuthenticator getExternalAuthenticator() {
return handler;
} }
} }

View File

@ -0,0 +1,188 @@
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 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();
try {
String requestBody = authenticationRequest.getRequest().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();
}
authenticationRequest.getResponse().send(authResponse);
}
@Override
public void handleAccountCreation(AuthenticationSystem.AuthenticationRequest authenticationRequest) {
AuthResponseJson authResponse = new AuthResponseJson();
Account account = null;
try {
String requestBody = authenticationRequest.getRequest().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);
}
}
}
authenticationRequest.getResponse().send(authResponse);
}
@Override
public void handlePasswordReset(AuthenticationSystem.AuthenticationRequest authenticationRequest) {
AuthResponseJson authResponse = new AuthResponseJson();
try {
String requestBody = authenticationRequest.getRequest().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();
}
authenticationRequest.getResponse().send(authResponse);
}
}