Skip to content

Commit a5308d6

Browse files
committed
[#11167] fix basic login error
1 parent 62fba42 commit a5308d6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

basic-login/src/main/java/com/navercorp/pinpoint/login/basic/config/BasicLoginProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
public class BasicLoginProperties implements InitializingBean {
3737

38-
private static final String DEFAULT_JWT_SECRET_KEY = "PINPOINT_JWT_SECRET";
38+
private static final String DEFAULT_JWT_SECRET_KEY = "__PINPOINT_JWT_SECRET__";
3939

4040
private static final long DEFAULT_EXPIRATION_TIME_SECONDS = TimeUnit.HOURS.toSeconds(12);
4141

basic-login/src/main/java/com/navercorp/pinpoint/login/basic/service/JwtService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public JwtService(BasicLoginProperties basicLoginProperties) {
5656
Assert.isTrue(basicLoginProperties.getExpirationTimeSeconds() > 0, "expirationTimeSeconds must be '>= 0'");
5757
this.expirationTimeMillis = TimeUnit.SECONDS.toMillis(basicLoginProperties.getExpirationTimeSeconds());
5858

59-
byte[] keyBytes = Base64.getDecoder().decode(secretKeyStr);
59+
byte[] keyBytes = Base64.getEncoder().encode(secretKeyStr.getBytes());
6060
this.secretKey = Keys.hmacShaKeyFor(keyBytes);
6161

6262
JwtParserBuilder jwtParser = Jwts.parser();

web/src/main/resources/pinpoint-web-root.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ web.installation.downloadUrl=
9898

9999
# Declares user:password in pinpoint-web.properties. (You can declare multiple people using,.)
100100
# Role (User : Can use whole function except for admin rest api, Admin : Can use whole function)
101-
#web.security.auth.user=alice:foo, bob:bar
101+
#web.security.auth.user=alice:foo,bob:bar
102102
#web.security.auth.admin=eve:baz
103-
#web.security.auth.jwt.secretkey=PINPOINT_JWT_SECRET
103+
#web.security.auth.jwt.secretkey=__PINPOINT_JWT_SECRET__
104104

105105
# cache application list in seconds
106106
web.applicationList.cacheTime=30

0 commit comments

Comments
 (0)