From 687976f0504e7392e93e4166a495c95c53ba5645 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Tue, 17 Oct 2023 11:07:02 +0800 Subject: [PATCH 1/3] feat(global): Upgraded some dependencies. logback 1.4.8 -> 1.4.11 slf4j-api 2.0.7 -> 2.0.9 lombok 1.18.28 -> 1.18.30 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3ea9171..5b6ff2c 100644 --- a/pom.xml +++ b/pom.xml @@ -86,10 +86,10 @@ 3.3.0 - 1.4.8 + 1.4.11 5.10.0 - 2.0.7 - 1.18.28 + 2.0.9 + 1.18.30 2.15.2 4.4.0 0.11.5 From 5350b5d49b166225dcc1c15e070f75bbce0b3988 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Tue, 17 Oct 2023 11:07:25 +0800 Subject: [PATCH 2/3] feat(global): Upgrade to v1.1.2. --- devkit-core/pom.xml | 2 +- devkit-utils/pom.xml | 2 +- guid/pom.xml | 2 +- pom.xml | 2 +- property-guard-spring-boot-starter/pom.xml | 2 +- simple-jwt-authzero/pom.xml | 2 +- simple-jwt-facade/pom.xml | 2 +- simple-jwt-jjwt/pom.xml | 2 +- simple-jwt-spring-boot-starter/pom.xml | 2 +- webcal/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/devkit-core/pom.xml b/devkit-core/pom.xml index f4bf40e..8de2632 100644 --- a/devkit-core/pom.xml +++ b/devkit-core/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 devkit-core diff --git a/devkit-utils/pom.xml b/devkit-utils/pom.xml index 1ddf6c5..b896679 100644 --- a/devkit-utils/pom.xml +++ b/devkit-utils/pom.xml @@ -6,7 +6,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 devkit-utils diff --git a/guid/pom.xml b/guid/pom.xml index e3742fb..1b1e332 100644 --- a/guid/pom.xml +++ b/guid/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 guid diff --git a/pom.xml b/pom.xml index 5b6ff2c..5e7ef0c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 2023 pom diff --git a/property-guard-spring-boot-starter/pom.xml b/property-guard-spring-boot-starter/pom.xml index 8df59be..20c5f21 100644 --- a/property-guard-spring-boot-starter/pom.xml +++ b/property-guard-spring-boot-starter/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 property-guard-spring-boot-starter diff --git a/simple-jwt-authzero/pom.xml b/simple-jwt-authzero/pom.xml index 29e96b1..c046d47 100644 --- a/simple-jwt-authzero/pom.xml +++ b/simple-jwt-authzero/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 simple-jwt-authzero diff --git a/simple-jwt-facade/pom.xml b/simple-jwt-facade/pom.xml index d16ecf6..afeb049 100644 --- a/simple-jwt-facade/pom.xml +++ b/simple-jwt-facade/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 simple-jwt-facade diff --git a/simple-jwt-jjwt/pom.xml b/simple-jwt-jjwt/pom.xml index ff49ffa..ee61cf3 100644 --- a/simple-jwt-jjwt/pom.xml +++ b/simple-jwt-jjwt/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 simple-jwt-jjwt diff --git a/simple-jwt-spring-boot-starter/pom.xml b/simple-jwt-spring-boot-starter/pom.xml index 50a9890..f77febf 100644 --- a/simple-jwt-spring-boot-starter/pom.xml +++ b/simple-jwt-spring-boot-starter/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 simple-jwt-spring-boot-starter diff --git a/webcal/pom.xml b/webcal/pom.xml index eb49cb2..65b198e 100644 --- a/webcal/pom.xml +++ b/webcal/pom.xml @@ -23,7 +23,7 @@ cn.org.codecrafters jdevkit - 1.1.1 + 1.1.2 webcal From de984733f0e66a766de84d4dead686527e808921 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Tue, 17 Oct 2023 11:09:24 +0800 Subject: [PATCH 3/3] fix(simple-jwt-jjwt): Fixed the issue that cannot create the bean of JjwtTokenResolver with a 32-character secret. --- .../codecrafters/simplejwt/jjwt/JjwtTokenResolver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simple-jwt-jjwt/src/main/java/cn/org/codecrafters/simplejwt/jjwt/JjwtTokenResolver.java b/simple-jwt-jjwt/src/main/java/cn/org/codecrafters/simplejwt/jjwt/JjwtTokenResolver.java index dbf146b..9a0fe5c 100644 --- a/simple-jwt-jjwt/src/main/java/cn/org/codecrafters/simplejwt/jjwt/JjwtTokenResolver.java +++ b/simple-jwt-jjwt/src/main/java/cn/org/codecrafters/simplejwt/jjwt/JjwtTokenResolver.java @@ -113,9 +113,9 @@ public class JjwtTokenResolver implements TokenResolver> { throw new IllegalArgumentException("A secret is required to build a JSON Web Token."); } - if (secret.length() <= 32) { + if (secret.length() < 32) { log.error(""" - The provided secret which owns {} characters is too weak. Please replace it with a stronger one.""", + The provided secret which owns {} characters is too weak. Please replace it with a stronger one.""", secret.length()); throw new WeakSecretException(""" The provided secret which owns %s characters is too weak. Please replace it with a stronger one.""" @@ -133,7 +133,7 @@ public class JjwtTokenResolver implements TokenResolver> { throw new IllegalArgumentException("A secret is required to build a JSON Web Token."); } - if (secret.length() <= 32) { + if (secret.length() < 32) { log.error( "The provided secret which owns {} characters is too weak. Please replace it with a stronger one.", secret.length()); @@ -153,7 +153,7 @@ public class JjwtTokenResolver implements TokenResolver> { throw new IllegalArgumentException("A secret is required to build a JSON Web Token."); } - if (secret.length() <= 32) { + if (secret.length() < 32) { log.error( "The provided secret which owns {} characters is too weak. Please replace it with a stronger one.", secret.length());