Skip to content
Snippets Groups Projects
Commit 4a7f88a1 authored by Félix  Sidokhine's avatar Félix Sidokhine Committed by Adrien Béraud
Browse files

implemented correct Bearer logic on all filters

Change-Id: I29166b72f3b7243056f00dc4ee405bdb63f0f531
parent 49da581e
No related branches found
No related tags found
No related merge requests found
......@@ -61,11 +61,11 @@ public class AdminApiFilter implements Filter {
boolean authsuccess = false;
boolean isLogin = false;
if (request.getServletPath().contains("login")) isLogin = true;
if (request.getHeader("Bearer") != null){
if(request.getHeader("authorization").contains("bearer") || request.getHeader("authorization").contains("Bearer")){
SignedJWT signedJWT = null;
try {
JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey());
signedJWT = SignedJWT.parse(request.getHeader("Bearer"));
signedJWT = SignedJWT.parse(request.getHeader("authorization").replace("bearer","").replace("Bearer",""));
HashSet<AccessLevel> permissionLevels = new HashSet<>();
permissionLevels.add(AccessLevel.ADMIN);
if(signedJWT.verify(jwsVerifier) && verifyValidity(signedJWT) && verifyLevel(signedJWT,permissionLevels)){
......
......@@ -58,10 +58,10 @@ public class InstallFilter implements Filter {
boolean isLogin = false;
if(request.getServletPath().contains("start")) isLogin = true;
SignedJWT signedJWT = null;
if(request.getHeader("Bearer") != null) {
if(request.getHeader("authorization").contains("bearer") || request.getHeader("authorization").contains("Bearer")){
try {
JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey());
signedJWT = SignedJWT.parse(request.getHeader("Bearer"));
signedJWT = SignedJWT.parse(request.getHeader("authorization").replace("bearer","").replace("Bearer",""));
if (signedJWT.verify(jwsVerifier) && signedJWT.getJWTClaimsSet().getExpirationTime().compareTo(new Date()) > 0) {
authsuccess = true;
request.setAttribute("username", signedJWT.getJWTClaimsSet().getSubject());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment