Altitude/AltitudeWeb
5
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Enhance AuthenticatedUuid to improve UUID extraction by adding support for decoding tokens from the Authorization header. Add logging, refactor for better null handling, and introduce @RequiredArgsConstructor."

Browse Source 
This reverts commit 02adbb2522.
This commit is contained in:
akastijn 2025-10-24 21:59:57 +02:00
parent 02adbb2522
commit c5ed657d3e
1 changed files with 7 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
backend/src/main/java/com/alttd/altitudeweb/controllers/data_from_auth/AuthenticatedUuid.java
View File

@ -1,30 +1,20 @@
package com.alttd.altitudeweb.controllers.data_from_auth; package com.alttd.altitudeweb.controllers.data_from_auth;
import com.nimbusds.jwt.JWT; import com.nimbusds.jwt.JWT;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
import jakarta.servlet.http.HttpServletRequest;
import java.util.UUID; import java.util.UUID;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor
public class AuthenticatedUuid { public class AuthenticatedUuid {
private final JwtDecoder jwtDecoder;
@Value("${UNSECURED:#{false}}") @Value("${UNSECURED:#{false}}")
private boolean unsecured; private boolean unsecured;
@ -35,68 +25,14 @@ public class AuthenticatedUuid {
* @throws ResponseStatusException with 401 status if authentication is invalid * @throws ResponseStatusException with 401 status if authentication is invalid
*/ */
public UUID getAuthenticatedUserUuid() { public UUID getAuthenticatedUserUuid() {
UUID uuidFromAuth = getUuidFromAuthentication();
if (uuidFromAuth != null) {
return uuidFromAuth;
}
return extractUuidFromAuthorizationHeader();
}
private UUID extractUuidFromAuthorizationHeader() {
log.debug("Attempting to extract UUID directly from Authorization header");
try {
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
if (requestAttributes == null) {
log.error("No request attributes found");
if (unsecured) {
return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f");
}
throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "No request attributes found");
}
HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
String authHeader = request.getHeader("Authorization");
if (authHeader == null || !authHeader.startsWith("Bearer ")) {
log.error("No valid Authorization header found");
if (unsecured) {
return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f");
}
throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "No valid Authorization header");
}
String token = authHeader.substring(7);
Jwt jwt = jwtDecoder.decode(token);
String stringUuid = jwt.getSubject();
log.debug("Successfully extracted UUID {} from Authorization header", stringUuid);
return UUID.fromString(stringUuid);
} catch (Exception e) {
if (e instanceof ResponseStatusException responseStatusException) {
log.debug("Rethrowing ResponseStatusException", e);
throw responseStatusException;
}
log.error("Error extracting UUID from Authorization header", e);
if (unsecured) {
return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f");
}
throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Failed to extract UUID from token");
}
}
private UUID getUuidFromAuthentication() {
Authentication authentication = getAuthentication(); Authentication authentication = getAuthentication();
if (authentication == null) {
log.error("Authentication is null");
return null;
}
if (!(authentication.getPrincipal() instanceof Jwt jwt)) { if (!(authentication.getPrincipal() instanceof Jwt jwt)) {
log.error("Authentication principal is not a JWT {}", authentication.getPrincipal() instanceof JWT); log.error("Authentication principal is not a JWT {}", authentication.getPrincipal() instanceof JWT);
if (unsecured) { if (unsecured) {
return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f"); return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f");
} }
return null; throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Authentication should be JWT");
} }
String stringUuid = jwt.getSubject(); String stringUuid = jwt.getSubject();
@ -109,6 +45,11 @@ public class AuthenticatedUuid {
} }
private static Authentication getAuthentication() { private static Authentication getAuthentication() {
return SecurityContextHolder.getContext().getAuthentication(); Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
log.error("Authentication is null");
throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Authentication required");
}
return authentication;
} }
} }