Skip to content

Revert "Fix auth validation" #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
piyushroshan merged 1 commit into from
May 20, 2024
Merged

Revert "Fix auth validation" #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions services/identity/src/main/java/com/crapi/config/JwtAuthTokenFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ protected void doFilterInternal(
response.sendError(
HttpServletResponse.SC_UNAUTHORIZED, UserMessage.ACCOUNT_LOCKED_MESSAGE);
}
} else {
tokenLogger.error(UserMessage.INVALID_CREDENTIALS);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, UserMessage.INVALID_CREDENTIALS);
}
} catch (Exception e) {
tokenLogger.error("Can NOT set user authentication -> Message:%d", e);
Expand Down Expand Up @@ -125,13 +122,10 @@ public String getUserFromToken(HttpServletRequest request) throws ParseException
String username = null;
if (token != null) {
if (apiType == ApiType.APIKEY) {
logger.debug("Token is api token");
username = tokenProvider.getUserNameFromApiToken(token);
} else {
logger.debug("Token is jwt token");
if (tokenProvider.validateJwtToken(token)) {
username = tokenProvider.getUserNameFromJwtToken(token);
}
tokenProvider.validateJwtToken(token);
username = tokenProvider.getUserNameFromJwtToken(token);
}
// checking username from token
if (username != null) return username;
Expand Down
19 changes: 9 additions & 10 deletions services/identity/src/main/java/com/crapi/config/JwtProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,26 +175,25 @@ public boolean validateJwtToken(String authToken) {
SignedJWT signedJWT = SignedJWT.parse(authToken);
JWSHeader header = signedJWT.getHeader();
Algorithm alg = header.getAlgorithm();
boolean valid = false;

// JWT Algorithm confusion vulnerability
logger.debug("Algorithm: " + alg.getName());
JWSVerifier verifier;
logger.info("Algorithm: " + alg.getName());
if (Objects.equals(alg.getName(), "HS256")) {
String secret = getJwtSecret(header);
logger.debug("JWT Secret: " + secret);
verifier = new MACVerifier(secret.getBytes(StandardCharsets.UTF_8));
logger.info("JWT Secret: " + secret);
JWSVerifier verifier = new MACVerifier(secret.getBytes(StandardCharsets.UTF_8));
return signedJWT.verify(verifier);
} else {
RSAKey verificationKey = getKeyFromJkuHeader(header);
JWSVerifier verifier;
if (verificationKey == null) {
logger.debug("Key from JWKS: " + this.publicRSAKey.toJSONString());
verifier = new RSASSAVerifier(this.publicRSAKey);
} else {
logger.debug("Key from JKU: " + verificationKey.toJSONString());
logger.info("Key from JKU: " + verificationKey.toJSONString());
verifier = new RSASSAVerifier(verificationKey);
}
valid = signedJWT.verify(verifier);
logger.info("JWT valid?: " + valid);
return valid;

return signedJWT.verify(verifier);
}

} catch (ParseException e) {
Expand Down