Skip to content

Commit e57f032

Browse files
author
Psilo
committed
add logging to exception during token-checking
1 parent f4ef2e4 commit e57f032

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<modelVersion>4.0.0</modelVersion>
1919
<artifactId>http-server</artifactId>
20-
<version>0.1.1</version>
20+
<version>0.1.2</version>
2121
<name>HttpServer</name>
2222
<packaging>jar</packaging>
2323

src/main/java/info/unterrainer/commons/httpserver/accessmanager/HttpAccessManager.java

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,32 +95,36 @@ private void initPublicKey() {
9595
}
9696

9797
private void checkAccess(final Context ctx, final Set<Role> permittedRoles) {
98+
try {
99+
TokenVerifier<AccessToken> tokenVerifier = persistUserInfoInContext(ctx);
98100

99-
TokenVerifier<AccessToken> tokenVerifier = persistUserInfoInContext(ctx);
100-
101-
if (permittedRoles.isEmpty() || permittedRoles.contains(DefaultRole.OPEN) && permittedRoles.size() == 1)
102-
return;
101+
if (permittedRoles.isEmpty() || permittedRoles.contains(DefaultRole.OPEN) && permittedRoles.size() == 1)
102+
return;
103103

104-
if (tokenVerifier == null)
105-
throw new UnauthorizedException();
104+
if (tokenVerifier == null)
105+
throw new UnauthorizedException();
106106

107-
initPublicKey();
108-
tokenVerifier.publicKey(publicKey);
109-
try {
110-
tokenVerifier.verifySignature();
111-
} catch (VerificationException e) {
112-
throw new UnauthorizedException();
113-
}
107+
initPublicKey();
108+
tokenVerifier.publicKey(publicKey);
109+
try {
110+
tokenVerifier.verifySignature();
111+
} catch (VerificationException e) {
112+
throw new UnauthorizedException();
113+
}
114114

115-
try {
116-
tokenVerifier.verify();
117-
if (permittedRoles.contains(DefaultRole.AUTHENTICATED) && permittedRoles.size() == 1)
118-
return;
119-
if (hasPermittedRole(ctx, permittedRoles))
120-
return;
121-
throw new ForbiddenException();
122-
} catch (VerificationException e) {
123-
throw new ForbiddenException();
115+
try {
116+
tokenVerifier.verify();
117+
if (permittedRoles.contains(DefaultRole.AUTHENTICATED) && permittedRoles.size() == 1)
118+
return;
119+
if (hasPermittedRole(ctx, permittedRoles))
120+
return;
121+
throw new ForbiddenException();
122+
} catch (VerificationException e) {
123+
throw new ForbiddenException();
124+
}
125+
} catch (Exception e) {
126+
log.error("Error checking token.", e);
127+
throw e;
124128
}
125129
}
126130

0 commit comments

Comments
 (0)