ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-09-14 16:17:16 +08:00
parent 7d3b614235
commit 191339d91a
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
View File

@ -333,7 +333,18 @@ public class JWT implements RegisteredPayload<JWT> {
* @return JWT字符串
*/
public String sign() {
return sign(this.signer);
return sign(true);
}
/**
* 签名生成JWT字符串
*
* @param addTypeIfNot 如果'typ'头不存在，是否赋值默认值
* @return JWT字符串
* @since 5.8.24
*/
public String sign(final boolean addTypeIfNot) {
return sign(this.signer, addTypeIfNot);
}
/**
@ -348,12 +359,21 @@ public class JWT implements RegisteredPayload<JWT> {
* <li>当用户未定义"alg"时，根据传入的{@link JWTSigner}对象类型，赋值对应ID</li>
* </ul>
*
* @param signer 自定义JWT签名器，非空
* @param signer 自定义JWT签名器，非空
* @param addTypeIfNot 如果'typ'头不存在，是否赋值默认值
* @return JWT字符串
*/
public String sign(final JWTSigner signer) {
public String sign(final JWTSigner signer, final boolean addTypeIfNot) {
Assert.notNull(signer, () -> new JWTException("No Signer provided!"));
// 检查tye信息
if (addTypeIfNot) {
final String type = (String) this.header.getClaim(JWTHeader.TYPE);
if (StrUtil.isBlank(type)) {
this.header.setClaim(JWTHeader.TYPE, "JWT");
}
}
// 检查头信息中是否有算法信息
final String algorithm = (String) this.header.getClaim(JWTHeader.ALGORITHM);
if (StrUtil.isBlank(algorithm)) {

24
hutool-json/src/test/java/org/dromara/hutool/json/jwt/Issue3732Test.java Normal file
View File

@ -0,0 +1,24 @@
package org.dromara.hutool.json.jwt;
import org.dromara.hutool.json.jwt.signers.JWTSigner;
import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class Issue3732Test {
@Test
void hmacTest() {
final JWTSigner SIGNER = JWTSignerUtil.hs256("6sf2f5j2a62a3s8f9032hsf".getBytes());
final Map<String, Object> payload = new HashMap<>();
payload.put("name", "test");
payload.put("role", "admin");
// 创建 JWT token
final String token = JWTUtil.createToken(payload, SIGNER);
assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlIjoiYWRtaW4iLCJuYW1lIjoidGVzdCJ9.pD3Xz41rtXvU3G1c_yS7ir01FXmDvtjjAOU2HYd8MdA", token);
}
}

2
hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTTest.java
View File

@ -185,7 +185,7 @@ public class JWTTest {
final Map<String, Object> map = new HashMap<>();
map.put("test2", 22222222222222L);
final JWTSigner jwtSigner = JWTSignerUtil.createSigner(AlgorithmUtil.getAlgorithm("HS256"), Base64.getDecoder().decode("abcdefghijklmn"));
final String sign = JWT.of().addPayloads(map).sign(jwtSigner);
final String sign = JWT.of().addPayloads(map).sign(jwtSigner, true);
final Object test2 = JWT.of(sign).getPayload().getClaim("test2");
Assertions.assertEquals(Long.class, test2.getClass());
}