Skip to content

Commit

Permalink
v1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jianxingxuejian
jianxingxuejian committed Oct 2, 2022
1 parent d9ae248 commit f8d4be4
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 93 deletions.
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

<groupId>org.hff</groupId>
<artifactId>grasscutter-plugin</artifactId>
<version>1.2.2</version>
<version>1.4.0</version>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grasscutter.version>1.2.3</grasscutter.version>
<grasscutter.version>1.3.2</grasscutter.version>
<jjwt.version>0.11.5</jjwt.version>
<expiringMap.version>0.5.10</expiringMap.version>
<lombok.version>1.18.24</lombok.version>
Expand All @@ -25,7 +25,7 @@
<artifactId>grasscutter</artifactId>
<version>${grasscutter.version}</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/grasscutter-1.2.3-dev.jar</systemPath>
<systemPath>${project.basedir}/lib/grasscutter-1.3.2-dev.jar</systemPath>
</dependency>
<!-- jwt start -->
<dependency>
Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>net.jodah</groupId>
<artifactId>expiringmap</artifactId>
<version>${expiringmap.version}</version>
<version>${expiringMap.version}</version>
</dependency>
<!-- lombok -->
<dependency>
Expand Down
87 changes: 42 additions & 45 deletions src/main/java/org/hff/PluginHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
import emu.grasscutter.utils.Position;
import express.http.Request;
import express.http.Response;
import io.javalin.http.Context;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
import org.hff.api.ApiCode;
Expand All @@ -39,29 +38,27 @@

public final class PluginHandler {

private final Request request;
private final Response response;
private final Context ctx;
private final Locale locale;
private final String token;
private final String adminToken;

public PluginHandler(@NotNull Request request, @NotNull Response response) {
this.request = request;
this.response = response;
this.locale = LanguageManager.getLocale(request.get("locale"));
this.token = request.get("token");
this.adminToken = request.get("admin_token");
public PluginHandler(@NotNull Context ctx) {
this.ctx = ctx;
this.locale = LanguageManager.getLocale(ctx.req.getHeader("locale"));
this.token = ctx.req.getHeader("token");
this.adminToken = ctx.req.getHeader("admin_token");
}

public void adminAuth() {
String adminVoucher = request.body().get("adminVoucher").toString();
String adminVoucher = ctx.queryParam("adminVoucher");
if (adminVoucher == null) {
response.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
return;
}

if (!AuthUtil.checkAdminVoucher(adminVoucher)) {
response.json(ApiResult.result(ApiCode.AUTH_FAIL, locale));
ctx.json(ApiResult.result(ApiCode.AUTH_FAIL, locale));
return;
}

Expand All @@ -74,19 +71,19 @@ public void adminCreateAccount() {
return;
}

AccountParam param = request.body(AccountParam.class);
AccountParam param = ctx.bodyAsClass(AccountParam.class);
if (checkParamFail(param)) {
return;
}

Account account = DatabaseHelper.getAccountByName(param.getUsername());
if (account != null) {
response.json(ApiResult.result(ApiCode.ACCOUNT_IS_EXIST, locale));
ctx.json(ApiResult.result(ApiCode.ACCOUNT_IS_EXIST, locale));
return;
}

getAuthenticationSystem().createAccount(param.getUsername(), param.getPassword());
response.json(ApiResult.success(locale));
ctx.json(ApiResult.success(locale));
}

public void adminCommand() {
Expand All @@ -95,19 +92,19 @@ public void adminCommand() {
return;
}

String command = request.body().get("command").toString();
String command = ctx.queryParam("command");
if (command == null) {
response.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
return;
}

invokeCommand(null, command, "admin");
}

public void mailVerifyCode() {
String username = request.body().get("username").toString();
String username = ctx.queryParam("username");
if (username == null) {
response.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
return;
}

Expand All @@ -118,15 +115,15 @@ public void mailVerifyCode() {

boolean flag = MailUtil.sendVerifyCodeMail(player, locale);
if (!flag) {
response.json(ApiResult.result(ApiCode.MAIL_TIME_LIMIT, locale));
ctx.json(ApiResult.result(ApiCode.MAIL_TIME_LIMIT, locale));
return;
}

response.json(ApiResult.success(locale));
ctx.json(ApiResult.success(locale));
}

public void playerAuthByVerifyCode() {
AuthByVerifyCodeParam param = request.body(AuthByVerifyCodeParam.class);
AuthByVerifyCodeParam param = ctx.bodyAsClass(AuthByVerifyCodeParam.class);
if (checkParamFail(param)) {
return;
}
Expand All @@ -136,7 +133,7 @@ public void playerAuthByVerifyCode() {
return;
}

boolean flag = MailUtil.checkVerifyCode(account.getId(), param.getVerifyCode(), locale, response);
boolean flag = MailUtil.checkVerifyCode(account.getId(), param.getVerifyCode(), locale, ctx);
if (!flag) {
return;
}
Expand All @@ -145,7 +142,7 @@ public void playerAuthByVerifyCode() {
}

public void playerAuthByPassword() {
AccountParam param = request.body(AccountParam.class);
AccountParam param = ctx.bodyAsClass(AccountParam.class);
if (checkParamFail(param)) {
return;
}
Expand All @@ -156,7 +153,7 @@ public void playerAuthByPassword() {
}

if (!param.getPassword().equals(account.getPassword())) {
response.json(ApiResult.result(ApiCode.AUTH_FAIL, locale));
ctx.json(ApiResult.result(ApiCode.AUTH_FAIL, locale));
return;
}

Expand All @@ -169,9 +166,9 @@ public void playerCommand() {
return;
}

String command = request.body().get("command").toString();
String command = ctx.queryParam("command");
if (command == null) {
response.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
return;
}

Expand Down Expand Up @@ -242,7 +239,7 @@ public void levelUpAllSkill() {
}
}

response.json(ApiResult.success(locale));
ctx.json(ApiResult.success(locale));
}

public void getProps() {
Expand Down Expand Up @@ -279,7 +276,7 @@ public void getProps() {
.setConstellation(avatar.getCoreProudSkillLevel())
.setFetterLevel(avatar.getFetterLevel());

response.json(ApiResult.success(locale, propsVo));
ctx.json(ApiResult.success(locale, propsVo));
}

public void cdr() {
Expand All @@ -306,29 +303,29 @@ public void cdr() {
avatar.save();
}

response.json(ApiResult.success(locale));
ctx.json(ApiResult.success(locale));
}


private Claims parseAdminToken() {
if (adminToken == null) {
response.json(ApiResult.result(ApiCode.TOKEN_NOT_FOUND, locale));
ctx.json(ApiResult.result(ApiCode.TOKEN_NOT_FOUND, locale));
return null;
}
Claims claims = parseToken(adminToken);
if (claims == null) {
return null;
}
if (!RoleEnum.ADMIN.getDesc().equals(claims.get("role").toString())) {
response.json(ApiResult.result(ApiCode.ROLE_ERROR, locale));
ctx.json(ApiResult.result(ApiCode.ROLE_ERROR, locale));
return null;
}
return claims;
}

private Claims parsePlayerToken() {
if (token == null) {
response.json(ApiResult.result(ApiCode.TOKEN_NOT_FOUND, locale));
ctx.json(ApiResult.result(ApiCode.TOKEN_NOT_FOUND, locale));
return null;
}
return parseToken(token);
Expand All @@ -338,19 +335,19 @@ private Claims parseToken(String token) {
try {
return JwtUtil.parseToken(token);
} catch (ExpiredJwtException e) {
response.json(ApiResult.result(ApiCode.TOKEN_EXPIRED, locale));
ctx.json(ApiResult.result(ApiCode.TOKEN_EXPIRED, locale));
} catch (Exception e) {
response.json(ApiResult.result(ApiCode.TOKEN_PARSE_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.TOKEN_PARSE_EXCEPTION, locale));
}
return null;
}

private void generateToken(RoleEnum role, String accountId) {
try {
String token = JwtUtil.generateToken(role, accountId);
response.json(ApiResult.success(locale, token));
ctx.json(ApiResult.success(locale, token));
} catch (Exception e) {
response.json(ApiResult.result(ApiCode.TOKEN_GENERATE_FAIL, locale, token));
ctx.json(ApiResult.result(ApiCode.TOKEN_GENERATE_FAIL, locale, token));
}
}

Expand All @@ -361,11 +358,11 @@ private boolean checkParamFail(Object param) {
try {
Object object = field.get(param);
if (object == null || object.toString().isEmpty()) {
response.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.PARAM_EMPTY_EXCEPTION, locale));
return true;
}
} catch (IllegalAccessException e) {
response.json(ApiResult.result(ApiCode.PARAM_ILLEGAL_EXCEPTION, locale));
ctx.json(ApiResult.result(ApiCode.PARAM_ILLEGAL_EXCEPTION, locale));
return true;
}
}
Expand All @@ -375,15 +372,15 @@ private boolean checkParamFail(Object param) {
private Account getAccountByUsername(String username) {
Account account = DatabaseHelper.getAccountByName(username);
if (account == null) {
response.json(ApiResult.result(ApiCode.ACCOUNT_NOT_EXIST, locale));
ctx.json(ApiResult.result(ApiCode.ACCOUNT_NOT_EXIST, locale));
}
return account;
}

private Player getPlayerByAccountId(String accountId) {
Player player = getGameServer().getPlayerByAccountId(accountId);
if (player == null) {
response.json(ApiResult.result(ApiCode.PLAYER_NOT_ONLINE, locale));
ctx.json(ApiResult.result(ApiCode.PLAYER_NOT_ONLINE, locale));
}
return player;
}
Expand All @@ -395,7 +392,7 @@ private Player getPlayerByUsername(String username) {
}
Player player = getGameServer().getPlayerByAccountId(account.getId());
if (player == null) {
response.json(ApiResult.result(ApiCode.PLAYER_NOT_ONLINE, locale));
ctx.json(ApiResult.result(ApiCode.PLAYER_NOT_ONLINE, locale));
}
return player;
}
Expand All @@ -405,9 +402,9 @@ private void invokeCommand(Player player, String command, String accountId) {
CommandMap.getInstance().invoke(player, player, command);
String message = EventListeners.getMessage(accountId);
if (message != null) {
response.json(ApiResult.success(message));
ctx.json(ApiResult.success(message));
} else {
response.json(ApiResult.fail(locale));
ctx.json(ApiResult.fail(locale));
}
}
}
43 changes: 21 additions & 22 deletions src/main/java/org/hff/PluginRouter.java
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
package org.hff;

import emu.grasscutter.server.http.Router;
import express.Express;
import io.javalin.Javalin;

public final class PluginRouter implements Router {

@Override
public void applyRoutes(Express express, Javalin javalin) {
express.get("/plugin/admin/auth",
(request, response) -> new PluginHandler(request, response).adminAuth());
public void applyRoutes(Javalin javalin) {
javalin.get("/plugin/admin/auth",
ctx -> new PluginHandler(ctx).adminAuth());

express.get("/plugin/admin/createAccount",
(request, response) -> new PluginHandler(request, response).adminCreateAccount());
javalin.get("/plugin/admin/createAccount",
ctx -> new PluginHandler(ctx).adminCreateAccount());

express.get("/plugin/admin/command",
(request, response) -> new PluginHandler(request, response).adminCommand());
javalin.get("/plugin/admin/command",
ctx -> new PluginHandler(ctx).adminCommand());

express.get("/plugin/mail/verifyCode",
(request, response) -> new PluginHandler(request, response).mailVerifyCode());
javalin.get("/plugin/mail/verifyCode",
ctx -> new PluginHandler(ctx).mailVerifyCode());

express.get("/plugin/player/authByVerifyCode",
(request, response) -> new PluginHandler(request, response).playerAuthByVerifyCode());
javalin.get("/plugin/player/authByVerifyCode",
ctx -> new PluginHandler(ctx).playerAuthByVerifyCode());

express.get("/plugin/player/authByPassword",
(request, response) -> new PluginHandler(request, response).playerAuthByPassword());
javalin.get("/plugin/player/authByPassword",
ctx -> new PluginHandler(ctx).playerAuthByPassword());

express.get("/plugin/player/command",
(request, response) -> new PluginHandler(request, response).playerCommand());
javalin.get("/plugin/player/command",
ctx -> new PluginHandler(ctx).playerCommand());

express.get("/plugin/player/levelUpAllSkill",
(request, response) -> new PluginHandler(request, response).levelUpAllSkill());
javalin.get("/plugin/player/levelUpAllSkill",
ctx -> new PluginHandler(ctx).levelUpAllSkill());

express.get("/plugin/player/getProps",
(request, response) -> new PluginHandler(request, response).getProps());
javalin.get("/plugin/player/getProps",
ctx -> new PluginHandler(ctx).getProps());

express.get("/plugin/player/cdr",
(request, response) -> new PluginHandler(request, response).cdr());
javalin.get("/plugin/player/cdr",
ctx -> new PluginHandler(ctx).cdr());
}
}
3 changes: 2 additions & 1 deletion src/main/java/org/hff/permission/Authentication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class Authentication implements AuthenticationSystem {
private final Authenticator<LoginResultJson> tokenAuthenticator = new DefaultAuthenticators.TokenAuthenticator();
private final Authenticator<ComboTokenResJson> sessionKeyAuthenticator = new DefaultAuthenticators.SessionKeyAuthenticator();
private final ExternalAuthenticator externalAuthenticator = new DefaultAuthenticators.ExternalAuthentication();
private final OAuthAuthenticator oAuthAuthenticator = new DefaultAuthenticators.OAuthAuthentication();

@Override
public void createAccount(String username, String password) {
Expand Down Expand Up @@ -58,6 +59,6 @@ public emu.grasscutter.auth.ExternalAuthenticator getExternalAuthenticator() {

@Override
public OAuthAuthenticator getOAuthAuthenticator() {
return null;
return this.oAuthAuthenticator;
}
}
Loading

0 comments on commit f8d4be4

Please sign in to comment.