diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/config/RbacConfig.java b/cruise-activity-service/src/main/java/com/cruise/activity/config/RbacConfig.java new file mode 100644 index 00000000..b2219949 --- /dev/null +++ b/cruise-activity-service/src/main/java/com/cruise/activity/config/RbacConfig.java @@ -0,0 +1,10 @@ +package com.cruise.activity.config; + +import com.cruise.common.security.RemoteRbacConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +@Configuration(proxyBeanMethods = false) +@Import(RemoteRbacConfiguration.class) +public class RbacConfig { +} diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/controller/OperationalNotificationController.java b/cruise-activity-service/src/main/java/com/cruise/activity/controller/OperationalNotificationController.java index b51021e1..82a5dc62 100644 --- a/cruise-activity-service/src/main/java/com/cruise/activity/controller/OperationalNotificationController.java +++ b/cruise-activity-service/src/main/java/com/cruise/activity/controller/OperationalNotificationController.java @@ -47,7 +47,7 @@ public ApiResponse broadcastOperationalAlert( @RequestHeader(value = "X-Caller-Role", required = false) String callerRole, @Valid @RequestBody OperationalBroadcastRequest request ) { - if (callerRole == null || !java.util.Set.of("CREW", "STAFF", "OFFICER", "ADMIN", "SYSTEM") + if (callerRole == null || !java.util.Set.of("CREW", "STAFF", "OFFICER", "ADMIN", "SYSTEM", "SYSTEM_ADMIN", "OPERATIONS_MANAGER") .contains(callerRole.trim().toUpperCase())) { throw new AccessDeniedException("Chỉ nhân viên hoặc hệ thống mới có quyền phát thông báo vận hành"); } diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/controller/PassengerReviewController.java b/cruise-activity-service/src/main/java/com/cruise/activity/controller/PassengerReviewController.java index eaaef9ac..c5fbab19 100644 --- a/cruise-activity-service/src/main/java/com/cruise/activity/controller/PassengerReviewController.java +++ b/cruise-activity-service/src/main/java/com/cruise/activity/controller/PassengerReviewController.java @@ -78,7 +78,7 @@ public ApiResponse triageReview( } private void verifyAdminAuthorization(String callerRole) { - if (callerRole == null || !java.util.Set.of("SYSTEM_ADMIN", "ADMIN", "STAFF") + if (callerRole == null || !java.util.Set.of("SYSTEM_ADMIN", "ADMIN", "STAFF", "OPERATIONS_MANAGER") .contains(callerRole.trim().toUpperCase())) { throw new AccessDeniedException("Yêu cầu quyền SYSTEM_ADMIN để truy cập quản trị đánh giá"); } diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/controller/TourProviderController.java b/cruise-activity-service/src/main/java/com/cruise/activity/controller/TourProviderController.java index 36759f7c..644e0f9b 100644 --- a/cruise-activity-service/src/main/java/com/cruise/activity/controller/TourProviderController.java +++ b/cruise-activity-service/src/main/java/com/cruise/activity/controller/TourProviderController.java @@ -82,7 +82,8 @@ public ApiResponse> getTourProviders( } private void verifyProviderManagementAuthorization(String callerRole) { - if (callerRole == null || !"SHORE_EXCURSION_MANAGER".equalsIgnoreCase(callerRole.trim())) { + if (callerRole == null || !java.util.Set.of("SHORE_EXCURSION_MANAGER", "OPERATIONS_MANAGER", "SYSTEM_ADMIN") + .contains(callerRole.trim().toUpperCase(java.util.Locale.ROOT))) { throw new AccessDeniedException("Yêu cầu quyền SHORE_EXCURSION_MANAGER"); } } diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/service/OperationalNotificationBroadcaster.java b/cruise-activity-service/src/main/java/com/cruise/activity/service/OperationalNotificationBroadcaster.java index 686d822c..368fec4e 100644 --- a/cruise-activity-service/src/main/java/com/cruise/activity/service/OperationalNotificationBroadcaster.java +++ b/cruise-activity-service/src/main/java/com/cruise/activity/service/OperationalNotificationBroadcaster.java @@ -30,6 +30,7 @@ public boolean canReceive(OperationalNotificationEventDto event) { || callerRole.equalsIgnoreCase("STAFF") || callerRole.equalsIgnoreCase("OFFICER") || callerRole.equalsIgnoreCase("ADMIN") + || isCanonicalCrew(callerRole) ); } if (event.getScope() == NotificationScope.PASSENGER_ONLY) { @@ -45,6 +46,14 @@ public boolean canReceive(OperationalNotificationEventDto event) { } return true; } + + private static boolean isCanonicalCrew(String role) { + try { + return com.cruise.common.enums.Role.valueOf(role) != com.cruise.common.enums.Role.PASSENGER; + } catch (IllegalArgumentException ex) { + return false; + } + } } private final List subscribers = new CopyOnWriteArrayList<>(); diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/CruiseActivityApplicationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/CruiseActivityApplicationTest.java index 945c437c..7a178689 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/CruiseActivityApplicationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/CruiseActivityApplicationTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @DisplayName("Cruise Activity Service Context Tests") class CruiseActivityApplicationTest { diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCheckInControllerIntegrationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCheckInControllerIntegrationTest.java index 54c71935..245b7951 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCheckInControllerIntegrationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCheckInControllerIntegrationTest.java @@ -30,6 +30,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @DisplayName("Activity Check-in & Attendance Controller Integration Tests (KAN-223)") diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCrudOperationsApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCrudOperationsApiTest.java index 8f6923b2..1d312aab 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCrudOperationsApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityCrudOperationsApiTest.java @@ -23,6 +23,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityListAndDetailApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityListAndDetailApiTest.java index f4485e88..bcc8c010 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityListAndDetailApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ActivityListAndDetailApiTest.java @@ -22,6 +22,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionCrudOperationsApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionCrudOperationsApiTest.java index 10d8232c..eba84013 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionCrudOperationsApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionCrudOperationsApiTest.java @@ -34,6 +34,7 @@ * 6. PATCH /api/excursions/{id}/status & GET allowed-transitions - Quản lý trạng thái và danh sách trạng thái cho phép. * 7. DELETE /api/excursions/{id} - Xóa mềm tour bờ (active=false, status=CANCELLED, 404). */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupGenerationApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupGenerationApiTest.java index 7a497078..8470af1d 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupGenerationApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupGenerationApiTest.java @@ -37,6 +37,7 @@ * 2. POST /api/excursions/{id}/groups/auto-generate * 3. GET /api/excursions/{id}/groups/export/csv */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupManagementApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupManagementApiTest.java index d2015395..caa5d31e 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupManagementApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionGroupManagementApiTest.java @@ -45,6 +45,7 @@ * 10. GET /api/excursions/{id}/groups/export/csv - Xuất danh sách đoàn dạng CSV * 11. Edge cases, Validation và Business Rule Error Handling */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionLogisticsApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionLogisticsApiTest.java index a3fa15a8..8f73e70f 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionLogisticsApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionLogisticsApiTest.java @@ -36,6 +36,7 @@ * 1. POST /api/excursions/{id}/vehicles & GET & PATCH & DELETE * 2. POST /api/excursions/{id}/guides & GET & PATCH & DELETE */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionPassengerAssignmentApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionPassengerAssignmentApiTest.java index df6a21fc..004f0c80 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionPassengerAssignmentApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionPassengerAssignmentApiTest.java @@ -36,6 +36,7 @@ * 4. PATCH /api/excursions/{id}/passengers/bulk-group - Gán đoàn & xe hàng loạt * 5. DELETE /api/excursions/{id}/passengers/{passengerId} - Xóa hành khách khỏi tour bờ */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionStatusUpdatesIntegrationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionStatusUpdatesIntegrationTest.java index 2bbff77d..86fe9eee 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionStatusUpdatesIntegrationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ExcursionStatusUpdatesIntegrationTest.java @@ -26,6 +26,7 @@ * Integration Test suite kiểm thử tích hợp toàn diện cho các thao tác cập nhật trạng thái tour bờ (KAN-191). * Kiểm thử thông qua MockMvc và verify trực tiếp trong database. */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @DisplayName("Excursion Status Updates Integration Tests (KAN-191)") diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/FilteringAndExportResultsTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/FilteringAndExportResultsTest.java index c05da035..acdc5ed7 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/FilteringAndExportResultsTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/FilteringAndExportResultsTest.java @@ -35,6 +35,7 @@ * 6. Escape dữ liệu đặc biệt trong file CSV (dấu phẩy, dấu nháy kép, ký tự xuống dòng). * 7. Kiểm tra Content-Type, Content-Disposition header của response CSV. */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerCatalogControllerIntegrationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerCatalogControllerIntegrationTest.java index 8ec00d55..79de681e 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerCatalogControllerIntegrationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerCatalogControllerIntegrationTest.java @@ -28,6 +28,7 @@ /** * Integration Test cho Passenger Catalog Browsing & Realtime Capacity (KAN-213) */ +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc(addFilters = false) @ActiveProfiles("test") diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerRegistrationListRetrievalApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerRegistrationListRetrievalApiTest.java index 1163543a..f7af20e2 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerRegistrationListRetrievalApiTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/PassengerRegistrationListRetrievalApiTest.java @@ -20,6 +20,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ShoreExcursionIntegrationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ShoreExcursionIntegrationTest.java index 15cc93fb..744cf2be 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/controller/ShoreExcursionIntegrationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/controller/ShoreExcursionIntegrationTest.java @@ -22,6 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/integration/ShoreExcursionBookingIntegrationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/integration/ShoreExcursionBookingIntegrationTest.java index d5e7099e..9ea75c1f 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/integration/ShoreExcursionBookingIntegrationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/integration/ShoreExcursionBookingIntegrationTest.java @@ -22,6 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @ActiveProfiles("test") @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/security/CrossRoleActivityApiTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/security/CrossRoleActivityApiTest.java new file mode 100644 index 00000000..38682839 --- /dev/null +++ b/cruise-activity-service/src/test/java/com/cruise/activity/security/CrossRoleActivityApiTest.java @@ -0,0 +1,51 @@ +package com.cruise.activity.security; + +import com.cruise.activity.repository.OnboardActivityRepository; +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import java.util.Optional; +import java.util.Set; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@SpringBootTest @AutoConfigureMockMvc @Transactional +class CrossRoleActivityApiTest { + @Autowired MockMvc mvc; + @Autowired OnboardActivityRepository activities; + @MockitoBean AccessTokenVerifier verifier; + + @ParameterizedTest @EnumSource(Role.class) + void onlyActivityManagersOpsAndAdminCanCreateActivities(Role role) throws Exception { + when(verifier.verify("role-token")).thenReturn(Optional.of(new VerifiedCaller(5L, "actor", role))); + boolean allowed = Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.ACTIVITY_MANAGER).contains(role); + long before = activities.count(); + mvc.perform(post("/api/activities").header("Authorization", "Bearer role-token") + .header("X-Caller-Role", "SYSTEM_ADMIN").contentType(MediaType.APPLICATION_JSON).content(""" + {"tourId":777,"title":"RBAC Activity","location":"Deck 7","activityDate":"2027-01-01", + "startTime":"09:00:00","endTime":"10:00:00","maxCapacity":20,"price":0,"isIncluded":true} + """)) + .andExpect(status().is(allowed ? 201 : 403)); + assertThat(activities.count()).isEqualTo(before + (allowed ? 1 : 0)); + } + + @Test void directServiceRequestsRejectAnonymousSpoofedHeadersAndAuthOutages() throws Exception { + mvc.perform(get("/api/activities/tour/777").header("X-Caller-Role", "SYSTEM_ADMIN")) + .andExpect(status().isUnauthorized()); + when(verifier.verify("outage")).thenThrow(new AccessTokenVerifier.Unavailable(new RuntimeException())); + mvc.perform(get("/api/activities/tour/777").header("Authorization", "Bearer outage")) + .andExpect(status().isServiceUnavailable()); + mvc.perform(get("/api/activities/health")).andExpect(status().isOk()); + } +} diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/service/ActivityConcurrencyIntegrationTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/service/ActivityConcurrencyIntegrationTest.java index d85be0b0..205f3052 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/service/ActivityConcurrencyIntegrationTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/service/ActivityConcurrencyIntegrationTest.java @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@org.springframework.context.annotation.Import(com.cruise.activity.support.AuthenticatedApiTestConfig.class) @SpringBootTest @DisplayName("Activity Concurrency & Capacity Enforcement Integration Test (KAN-218)") class ActivityConcurrencyIntegrationTest { diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/support/AuthenticatedApiTestConfig.java b/cruise-activity-service/src/test/java/com/cruise/activity/support/AuthenticatedApiTestConfig.java new file mode 100644 index 00000000..b5df8c70 --- /dev/null +++ b/cruise-activity-service/src/test/java/com/cruise/activity/support/AuthenticatedApiTestConfig.java @@ -0,0 +1,24 @@ +package com.cruise.activity.support; + +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import java.util.Optional; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webmvc.test.autoconfigure.MockMvcBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +/** Explicit authenticated fixture for pre-existing domain tests; production RBAC remains active. */ +@TestConfiguration(proxyBeanMethods = false) +public class AuthenticatedApiTestConfig { + @Bean @Primary + public AccessTokenVerifier domainTestIdentityVerifier() { + return token -> "domain-test-admin".equals(token) + ? Optional.of(new VerifiedCaller(1L, "domain.test", Role.SYSTEM_ADMIN)) : Optional.empty(); + } + @Bean + public MockMvcBuilderCustomizer authenticatedDomainRequests() { + return builder -> builder.defaultRequest(get("/").header("Authorization", "Bearer domain-test-admin")); + } +} diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/config/RbacConfig.java b/cruise-auth-service/src/main/java/com/cruise/auth/config/RbacConfig.java new file mode 100644 index 00000000..f80c8924 --- /dev/null +++ b/cruise-auth-service/src/main/java/com/cruise/auth/config/RbacConfig.java @@ -0,0 +1,10 @@ +package com.cruise.auth.config; + +import com.cruise.common.security.RbacFilterConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +@Configuration(proxyBeanMethods = false) +@Import(RbacFilterConfiguration.class) +public class RbacConfig { +} diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/controller/AccessControlController.java b/cruise-auth-service/src/main/java/com/cruise/auth/controller/AccessControlController.java new file mode 100644 index 00000000..8d5e8fd3 --- /dev/null +++ b/cruise-auth-service/src/main/java/com/cruise/auth/controller/AccessControlController.java @@ -0,0 +1,40 @@ +package com.cruise.auth.controller; + +import com.cruise.auth.dto.VerifyTokenRequest; +import com.cruise.common.dto.ApiResponse; +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import jakarta.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/auth") +public class AccessControlController { + private final AccessTokenVerifier verifier; + public AccessControlController(AccessTokenVerifier verifier) { this.verifier = verifier; } + + /** The token itself is proof. Invalid tokens return no identity and no detailed claims. */ + @PostMapping("/access-context") + public ApiResponse accessContext(@RequestBody VerifyTokenRequest request) { + String token = request.getToken(); + if (token == null || token.isBlank() || token.length() > 8192) return ApiResponse.ok(null); + return ApiResponse.ok(verifier.verify(token).orElse(null)); + } + + @GetMapping("/roles") + public ApiResponse>> roles() { + Map> grants = new LinkedHashMap<>(); + Arrays.stream(Role.values()).forEach(role -> grants.put(role, RolePermissions.permissions(role))); + return ApiResponse.ok(grants); + } + + @GetMapping("/permissions") + public ApiResponse> permissions(HttpServletRequest request) { + var caller = (VerifiedCaller) request.getAttribute(VerifiedCaller.ATTRIBUTE); + return ApiResponse.ok(RolePermissions.permissions(caller.role())); + } +} diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/controller/UserController.java b/cruise-auth-service/src/main/java/com/cruise/auth/controller/UserController.java index 1cffb3fa..3d959a9e 100644 --- a/cruise-auth-service/src/main/java/com/cruise/auth/controller/UserController.java +++ b/cruise-auth-service/src/main/java/com/cruise/auth/controller/UserController.java @@ -30,7 +30,7 @@ public UserController(UserService userService) { } @PostMapping - public ResponseEntity> createUser(@RequestBody com.cruise.auth.dto.UserDto userDto) { + public ResponseEntity> createUser(@jakarta.validation.Valid @RequestBody com.cruise.auth.dto.UserDto userDto) { try { User user = new User(); user.setUsername(userDto.getUsername()); diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/dto/UserDto.java b/cruise-auth-service/src/main/java/com/cruise/auth/dto/UserDto.java index dafb5cd8..6abc09df 100644 --- a/cruise-auth-service/src/main/java/com/cruise/auth/dto/UserDto.java +++ b/cruise-auth-service/src/main/java/com/cruise/auth/dto/UserDto.java @@ -11,10 +11,18 @@ @AllArgsConstructor @Builder public class UserDto { + @jakarta.validation.constraints.NotBlank + @jakarta.validation.constraints.Size(min = 3, max = 50) private String username; private String password; + @jakarta.validation.constraints.NotBlank + @jakarta.validation.constraints.Size(max = 100) private String fullName; + @jakarta.validation.constraints.NotBlank + @jakarta.validation.constraints.Email + @jakarta.validation.constraints.Size(max = 100) private String email; + @jakarta.validation.constraints.NotNull private Role role; private String cabinNumber; private String rfidTag; diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/entity/IdentityAuditEvent.java b/cruise-auth-service/src/main/java/com/cruise/auth/entity/IdentityAuditEvent.java new file mode 100644 index 00000000..d10ca71c --- /dev/null +++ b/cruise-auth-service/src/main/java/com/cruise/auth/entity/IdentityAuditEvent.java @@ -0,0 +1,34 @@ +package com.cruise.auth.entity; + +import jakarta.persistence.*; +import java.time.Instant; +import lombok.Getter; +import lombok.NoArgsConstructor; + +/** Append-only identity mutations; never contains passwords or bearer tokens. */ +@Entity +@Table(name = "identity_audit_events", indexes = @Index(name = "idx_identity_audit_occurred", columnList = "occurred_at")) +@Getter +@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) +public class IdentityAuditEvent { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @Column(name = "occurred_at", nullable = false, updatable = false) + private Instant occurredAt; + @Column(nullable = false, updatable = false, length = 30) + private String action; + @Column(name = "actor_user_id", updatable = false) + private Long actorUserId; + @Column(name = "target_username", nullable = false, updatable = false, length = 50) + private String targetUsername; + @Column(name = "target_role", nullable = false, updatable = false, length = 30) + private String targetRole; + + public IdentityAuditEvent(String action, Long actorUserId, String targetUsername, String targetRole) { + this.occurredAt = Instant.now(); + this.action = action; + this.actorUserId = actorUserId; + this.targetUsername = targetUsername; + this.targetRole = targetRole; + } +} diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/repository/IdentityAuditRepository.java b/cruise-auth-service/src/main/java/com/cruise/auth/repository/IdentityAuditRepository.java new file mode 100644 index 00000000..3294c828 --- /dev/null +++ b/cruise-auth-service/src/main/java/com/cruise/auth/repository/IdentityAuditRepository.java @@ -0,0 +1,6 @@ +package com.cruise.auth.repository; + +import com.cruise.auth.entity.IdentityAuditEvent; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IdentityAuditRepository extends JpaRepository {} diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/security/LocalAccessTokenVerifier.java b/cruise-auth-service/src/main/java/com/cruise/auth/security/LocalAccessTokenVerifier.java new file mode 100644 index 00000000..1249b805 --- /dev/null +++ b/cruise-auth-service/src/main/java/com/cruise/auth/security/LocalAccessTokenVerifier.java @@ -0,0 +1,41 @@ +package com.cruise.auth.security; + +import com.cruise.auth.repository.UserRepository; +import com.cruise.auth.service.JwtService; +import com.cruise.common.security.AccessTokenVerifier; +import com.cruise.common.security.VerifiedCaller; +import java.time.Instant; +import java.util.Optional; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Component +public class LocalAccessTokenVerifier implements AccessTokenVerifier { + private final JwtService jwt; + private final UserRepository users; + private final String issuer; + + public LocalAccessTokenVerifier(JwtService jwt, UserRepository users, + @Value("${jwt.issuer:cruise-auth-service}") String issuer) { + this.jwt = jwt; + this.users = users; + this.issuer = issuer; + } + + @Override + @Transactional(readOnly = true) + public Optional verify(String token) { + var verification = jwt.introspectToken(token); + if (!verification.isValid() || !JwtService.TOKEN_TYPE_ACCESS.equals(verification.getTokenType()) + || verification.getExpiresAt() == null || verification.getExpiresAt() <= Instant.now().getEpochSecond() + || !issuer.equals(jwt.extractClaim(token, "iss")) || verification.getUsername() == null) { + return Optional.empty(); + } + return users.findByUsername(verification.getUsername()) + .filter(user -> Boolean.TRUE.equals(user.getActive()) && user.getRole() != null + && user.getId().equals(verification.getUserId()) + && user.getRole().name().equals(verification.getRole())) + .map(user -> new VerifiedCaller(user.getId(), user.getUsername(), user.getRole())); + } +} diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/service/JwtService.java b/cruise-auth-service/src/main/java/com/cruise/auth/service/JwtService.java index c6a5aeac..93461558 100644 --- a/cruise-auth-service/src/main/java/com/cruise/auth/service/JwtService.java +++ b/cruise-auth-service/src/main/java/com/cruise/auth/service/JwtService.java @@ -48,7 +48,7 @@ public JwtService() { @org.springframework.beans.factory.annotation.Autowired public JwtService( - @Value("${jwt.secret:cruise-secret-key-super-secure-token-2026-auth-jwt-system}") String secretKey, + @Value("${jwt.secret}") String secretKey, @Value("${jwt.access-token.expiration-millis:${jwt.expiration-millis:86400000}}") long accessExpirationMillis, @Value("${jwt.refresh-token.expiration-millis:604800000}") long refreshExpirationMillis, @Value("${jwt.issuer:cruise-auth-service}") String issuer) { diff --git a/cruise-auth-service/src/main/java/com/cruise/auth/service/UserService.java b/cruise-auth-service/src/main/java/com/cruise/auth/service/UserService.java index e3060442..be5f97ca 100644 --- a/cruise-auth-service/src/main/java/com/cruise/auth/service/UserService.java +++ b/cruise-auth-service/src/main/java/com/cruise/auth/service/UserService.java @@ -1,59 +1,69 @@ -package com.cruise.auth.service; - -import com.cruise.auth.entity.User; -import com.cruise.auth.repository.UserRepository; -import com.cruise.common.enums.Role; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Optional; - -/** - * Service xử lý nghiệp vụ người dùng và hành khách - */ -@Service -@Transactional -public class UserService { - +package com.cruise.auth.service; + +import com.cruise.auth.entity.User; +import com.cruise.auth.repository.UserRepository; +import com.cruise.common.enums.Role; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +/** + * Service xử lý nghiệp vụ người dùng và hành khách + */ +@Service +@Transactional +public class UserService { + private final UserRepository userRepository; private final org.springframework.security.crypto.password.PasswordEncoder passwordEncoder; - private final JwtService jwtService; - - @org.springframework.beans.factory.annotation.Autowired - public UserService(UserRepository userRepository, org.springframework.security.crypto.password.PasswordEncoder passwordEncoder, @org.springframework.lang.Nullable JwtService jwtService) { + private final JwtService jwtService; + private final com.cruise.auth.repository.IdentityAuditRepository audit; + + @org.springframework.beans.factory.annotation.Autowired + public UserService(UserRepository userRepository, org.springframework.security.crypto.password.PasswordEncoder passwordEncoder, + JwtService jwtService, com.cruise.auth.repository.IdentityAuditRepository audit) { this.userRepository = userRepository; this.passwordEncoder = passwordEncoder; this.jwtService = jwtService; + this.audit = audit; + } + + public UserService(UserRepository userRepository, org.springframework.security.crypto.password.PasswordEncoder passwordEncoder, + JwtService jwtService) { + this(userRepository, passwordEncoder, jwtService, null); } public UserService(UserRepository userRepository) { this(userRepository, new org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder(), null); - } - - public User registerUser(User user) { - if (userRepository.existsByUsername(user.getUsername())) { - throw new IllegalArgumentException("Username already exists: " + user.getUsername()); - } - if (user.getPassword() != null && !user.getPassword().isBlank() && !user.getPassword().startsWith("$2a$")) { - user.setPassword(passwordEncoder.encode(user.getPassword())); - } - return userRepository.save(user); - } - - @Transactional(readOnly = true) - public Optional getUserByUsername(String username) { - return userRepository.findByUsername(username); - } - - @Transactional(readOnly = true) - public Optional getUserByRfid(String rfidTag) { - return userRepository.findByRfidTag(rfidTag); - } - - @Transactional(readOnly = true) - public List getUsersByRole(Role role) { - return userRepository.findByRole(role); + } + + public User registerUser(User user) { + if (userRepository.existsByUsername(user.getUsername())) { + throw new IllegalArgumentException("Username already exists: " + user.getUsername()); + } + if (user.getPassword() != null && !user.getPassword().isBlank() && !user.getPassword().startsWith("$2a$")) { + user.setPassword(passwordEncoder.encode(user.getPassword())); + } + User saved = userRepository.save(user); + recordIdentityChange("USER_CREATED", saved); + return saved; + } + + @Transactional(readOnly = true) + public Optional getUserByUsername(String username) { + return userRepository.findByUsername(username); + } + + @Transactional(readOnly = true) + public Optional getUserByRfid(String rfidTag) { + return userRepository.findByRfidTag(rfidTag); + } + + @Transactional(readOnly = true) + public List getUsersByRole(Role role) { + return userRepository.findByRole(role); } public void deleteUserByUsername(String username) { @@ -62,6 +72,20 @@ public void deleteUserByUsername(String username) { jwtService.revokeAllUserTokens(username); } userRepository.delete(user); + recordIdentityChange("USER_DELETED", user); }); - } -} + } + + private void recordIdentityChange(String action, User user) { + // Compatibility constructors are used by isolated unit tests; production injects the repository. + if (audit == null) return; + var attributes = org.springframework.web.context.request.RequestContextHolder.getRequestAttributes(); + Object caller = attributes == null ? null : attributes.getAttribute( + com.cruise.common.security.VerifiedCaller.ATTRIBUTE, + org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST); + Long actor = caller instanceof com.cruise.common.security.VerifiedCaller verified ? verified.userId() : null; + Role role = user.getRole(); + String targetRole = role == null ? "UNKNOWN" : role.name(); + audit.save(new com.cruise.auth.entity.IdentityAuditEvent(action, actor, user.getUsername(), targetRole)); + } +} diff --git a/cruise-auth-service/src/main/resources/application-dev.yml b/cruise-auth-service/src/main/resources/application-dev.yml index e3d470ec..bfd39bfe 100644 --- a/cruise-auth-service/src/main/resources/application-dev.yml +++ b/cruise-auth-service/src/main/resources/application-dev.yml @@ -16,3 +16,7 @@ spring: hibernate: ddl-auto: create-drop show-sql: true + +# Explicit local-only key; production requires JWT_SECRET. +jwt: + secret: ${JWT_SECRET:dev-only-cruise-jwt-key-do-not-deploy-2026} diff --git a/cruise-auth-service/src/main/resources/application.yml b/cruise-auth-service/src/main/resources/application.yml index 9fa66fa9..fd89d77b 100644 --- a/cruise-auth-service/src/main/resources/application.yml +++ b/cruise-auth-service/src/main/resources/application.yml @@ -29,7 +29,7 @@ spring: open-in-view: false jwt: - secret: ${JWT_SECRET:cruise-secret-key-super-secure-token-2026-auth-jwt-system} + secret: ${JWT_SECRET} issuer: ${JWT_ISSUER:cruise-auth-service} expiration-millis: ${JWT_EXPIRATION_MILLIS:86400000} access-token: diff --git a/cruise-auth-service/src/test/java/com/cruise/auth/security/CrossRoleAccessApiTest.java b/cruise-auth-service/src/test/java/com/cruise/auth/security/CrossRoleAccessApiTest.java new file mode 100644 index 00000000..ea082358 --- /dev/null +++ b/cruise-auth-service/src/test/java/com/cruise/auth/security/CrossRoleAccessApiTest.java @@ -0,0 +1,65 @@ +package com.cruise.auth.security; + +import com.cruise.auth.repository.IdentityAuditRepository; +import com.cruise.common.enums.Role; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import static org.assertj.core.api.Assertions.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +/** KAN-72: all eight real JWT roles against the production auth HTTP boundary. */ +class CrossRoleAccessApiTest extends RbacApiTestSupport { + @Autowired private IdentityAuditRepository audit; + + @ParameterizedTest @EnumSource(Role.class) + void onlySystemAdminCanReadOrMutateUserAdministration(Role role) throws Exception { + String header = bearer(account(role)); + int expected = role == Role.SYSTEM_ADMIN ? 200 : 403; + mvc.perform(get("/api/auth/roles").header("Authorization", header) + .header("X-Caller-Role", "SYSTEM_ADMIN")) + .andExpect(status().is(expected)); + long before = users.count(); + mvc.perform(post("/api/auth/users").header("Authorization", header).header("X-Caller-Role", "SYSTEM_ADMIN") + .contentType(MediaType.APPLICATION_JSON).content("{}")) + .andExpect(status().is(role == Role.SYSTEM_ADMIN ? 400 : 403)); + assertThat(users.count()).isEqualTo(before); + mvc.perform(get("/api/auth/permissions").header("Authorization", header)) + .andExpect(status().isOk()).andExpect(jsonPath("$.data").isArray()); + } + + @Test void adminCreatesAndDeletesUserWithTransactionalAuditAndNoPasswordDisclosure() throws Exception { + var admin = account(Role.SYSTEM_ADMIN); + String header = bearer(admin); + long before = audit.count(); + String payload = """ + {"username":"rbac.new.staff","password":"Secret#2026Test","fullName":"New Staff", + "email":"new.staff@rbac.test","role":"ACTIVITY_MANAGER"} + """; + mvc.perform(post("/api/auth/users").header("Authorization", header).contentType(MediaType.APPLICATION_JSON).content(payload)) + .andExpect(status().isCreated()).andExpect(jsonPath("$.data.role").value("ACTIVITY_MANAGER")) + .andExpect(jsonPath("$.data.password").doesNotExist()); + var created = users.findByUsername("rbac.new.staff").orElseThrow(); + assertThat(created.getPassword()).startsWith("$2").doesNotContain("Secret#2026Test"); + String staffToken = bearer(created); + mvc.perform(delete("/api/auth/users/rbac.new.staff").header("Authorization", header)).andExpect(status().isOk()); + assertThat(users.findByUsername("rbac.new.staff")).isEmpty(); + assertThat(audit.count()).isEqualTo(before + 2); + assertThat(audit.findAll().stream().filter(e -> e.getTargetUsername().equals("rbac.new.staff"))) + .allSatisfy(e -> assertThat(e.getActorUserId()).isEqualTo(admin.getId())); + mvc.perform(get("/api/auth/permissions").header("Authorization", staffToken)).andExpect(status().isUnauthorized()); + } + + @Test void nonAdminCannotDeleteAnotherRoleAndAdminCannotUseAnUndefinedApi() throws Exception { + var target = account(Role.SYSTEM_ADMIN); + var cashier = account(Role.POS_STAFF); + mvc.perform(delete("/api/auth/users/" + target.getUsername()).header("Authorization", bearer(cashier))) + .andExpect(status().isForbidden()); + assertThat(users.existsByUsername(target.getUsername())).isTrue(); + mvc.perform(get("/api/undefined-admin-route").header("Authorization", bearer(target))) + .andExpect(status().isForbidden()); + } +} diff --git a/cruise-auth-service/src/test/java/com/cruise/auth/security/InvalidCredentialsAndExpiredTokensIntegrationTest.java b/cruise-auth-service/src/test/java/com/cruise/auth/security/InvalidCredentialsAndExpiredTokensIntegrationTest.java index 6ed2c491..7222453f 100644 --- a/cruise-auth-service/src/test/java/com/cruise/auth/security/InvalidCredentialsAndExpiredTokensIntegrationTest.java +++ b/cruise-auth-service/src/test/java/com/cruise/auth/security/InvalidCredentialsAndExpiredTokensIntegrationTest.java @@ -347,17 +347,17 @@ void testChangePassword_WeakNewPassword_Returns400() throws Exception { } @Test - @DisplayName("1.18. POST /api/auth/change-password trả về 403 khi tài khoản bị khóa/vô hiệu hóa") - void testChangePassword_InactiveAccount_Returns403() throws Exception { + @DisplayName("1.18. POST /api/auth/change-password trả về 401 khi tài khoản bị khóa/vô hiệu hóa") + void testChangePassword_InactiveAccount_Returns401() throws Exception { String tokenForInactiveUser = jwtService.generateAccessToken(inactiveUser); mockMvc.perform(post("/api/auth/change-password") .header("Authorization", "Bearer " + tokenForInactiveUser) .contentType(MediaType.APPLICATION_JSON) .content(changePasswordJson(VALID_RAW_PASSWORD, "NewValidPass999#", "NewValidPass999#"))) - .andExpect(status().isForbidden()) + .andExpect(status().isUnauthorized()) .andExpect(jsonPath("$.success").value(false)) - .andExpect(jsonPath("$.message").value("Account is inactive or disabled")); + .andExpect(jsonPath("$.code").value("UNAUTHENTICATED")); } } diff --git a/cruise-auth-service/src/test/java/com/cruise/auth/security/RbacApiTestSupport.java b/cruise-auth-service/src/test/java/com/cruise/auth/security/RbacApiTestSupport.java new file mode 100644 index 00000000..09f1e540 --- /dev/null +++ b/cruise-auth-service/src/test/java/com/cruise/auth/security/RbacApiTestSupport.java @@ -0,0 +1,31 @@ +package com.cruise.auth.security; + +import com.cruise.auth.entity.User; +import com.cruise.auth.repository.UserRepository; +import com.cruise.auth.service.JwtService; +import com.cruise.common.enums.Role; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.transaction.annotation.Transactional; + +@SpringBootTest +@AutoConfigureMockMvc +@Transactional +abstract class RbacApiTestSupport { + @Autowired protected MockMvc mvc; + @Autowired protected UserRepository users; + @Autowired protected JwtService jwt; + + @BeforeEach void clearRevocations() { jwt.clearRevocations(); } + + protected User account(Role role) { + return users.saveAndFlush(User.builder().username("rbac." + role.name().toLowerCase()) + .fullName("RBAC Test").email(role.name().toLowerCase() + "@rbac.test") + .role(role).active(true).build()); + } + + protected String bearer(User user) { return "Bearer " + jwt.generateAccessToken(user); } +} diff --git a/cruise-auth-service/src/test/java/com/cruise/auth/security/UnauthorizedAccessApiTest.java b/cruise-auth-service/src/test/java/com/cruise/auth/security/UnauthorizedAccessApiTest.java new file mode 100644 index 00000000..79001256 --- /dev/null +++ b/cruise-auth-service/src/test/java/com/cruise/auth/security/UnauthorizedAccessApiTest.java @@ -0,0 +1,69 @@ +package com.cruise.auth.security; + +import com.cruise.auth.service.JwtService; +import com.cruise.common.enums.Role; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.springframework.http.MediaType; +import static org.assertj.core.api.Assertions.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +/** KAN-71: real signature verification and database state, with the production filter enabled. */ +class UnauthorizedAccessApiTest extends RbacApiTestSupport { + @Test void anonymousCannotCreateReadOrDeleteUsersOrReadTheRoleMatrix() throws Exception { + long before = users.count(); + mvc.perform(post("/api/auth/users").contentType(MediaType.APPLICATION_JSON).content("{}")) + .andExpect(status().isUnauthorized()).andExpect(jsonPath("$.code").value("UNAUTHENTICATED")); + mvc.perform(get("/api/auth/users/admin")).andExpect(status().isUnauthorized()); + mvc.perform(delete("/api/auth/users/admin")).andExpect(status().isUnauthorized()); + mvc.perform(get("/api/auth/roles")).andExpect(status().isUnauthorized()); + assertThat(users.count()).isEqualTo(before); + } + + @ParameterizedTest @ValueSource(strings = {"Basic abc", "Bearer ", "Bearer garbage", "Bearer a.b.c"}) + void malformedCredentialsReturn401AndNoPrivateClaims(String header) throws Exception { + mvc.perform(get("/api/auth/roles").header("Authorization", header)) + .andExpect(status().isUnauthorized()).andExpect(jsonPath("$.success").value(false)) + .andExpect(header().string("WWW-Authenticate", "Bearer")); + } + + @Test void expiredTamperedRefreshRevokedAndForeignIssuerTokensAreNotAccessCredentials() throws Exception { + var admin = account(Role.SYSTEM_ADMIN); + var expired = new JwtService("cruise-secret-key-super-secure-token-2026-auth-jwt-system", -1000, -1000, "cruise-auth-service"); + var foreignIssuer = new JwtService("cruise-secret-key-super-secure-token-2026-auth-jwt-system", 60000, 60000, "foreign-issuer"); + String token = jwt.generateAccessToken(admin); + String[] parts = token.split("\\."); + String tampered = parts[0] + "." + parts[1] + "." + (parts[2].charAt(0) == 'A' ? "B" : "A") + parts[2].substring(1); + for (String invalid : new String[]{expired.generateAccessToken(admin), tampered, + jwt.generateRefreshToken(admin), foreignIssuer.generateAccessToken(admin)}) { + mvc.perform(get("/api/auth/roles").header("Authorization", "Bearer " + invalid)) + .andExpect(status().isUnauthorized()); + } + jwt.invalidateToken(token); + mvc.perform(get("/api/auth/roles").header("Authorization", "Bearer " + token)).andExpect(status().isUnauthorized()); + } + + @Test void disabledDeletedAndChangedRoleAccountsCannotReuseOldTokens() throws Exception { + var admin = account(Role.SYSTEM_ADMIN); + String header = bearer(admin); + admin.setActive(false); + users.saveAndFlush(admin); + mvc.perform(get("/api/auth/roles").header("Authorization", header)).andExpect(status().isUnauthorized()); + admin.setActive(true); + admin.setRole(Role.POS_STAFF); + users.saveAndFlush(admin); + mvc.perform(get("/api/auth/roles").header("Authorization", header)).andExpect(status().isUnauthorized()); + String staffToken = bearer(admin); + users.delete(admin); + users.flush(); + mvc.perform(get("/api/auth/permissions").header("Authorization", staffToken)).andExpect(status().isUnauthorized()); + } + + @Test void forgedUpstreamHeadersDoNotAuthenticateTheCaller() throws Exception { + mvc.perform(post("/api/auth/users").header("X-Caller-Role", "SYSTEM_ADMIN").header("X-Caller-Id", "1") + .contentType(MediaType.APPLICATION_JSON).content("{}")) + .andExpect(status().isUnauthorized()); + } +} diff --git a/cruise-auth-service/src/test/java/com/cruise/auth/service/UserServiceTest.java b/cruise-auth-service/src/test/java/com/cruise/auth/service/UserServiceTest.java index adeeb542..40be3e91 100644 --- a/cruise-auth-service/src/test/java/com/cruise/auth/service/UserServiceTest.java +++ b/cruise-auth-service/src/test/java/com/cruise/auth/service/UserServiceTest.java @@ -1,6 +1,8 @@ package com.cruise.auth.service; import com.cruise.auth.entity.User; +import com.cruise.auth.entity.IdentityAuditEvent; +import com.cruise.auth.repository.IdentityAuditRepository; import com.cruise.auth.repository.UserRepository; import com.cruise.common.enums.Role; import org.junit.jupiter.api.BeforeEach; @@ -8,6 +10,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -29,6 +32,9 @@ class UserServiceTest { @Mock private JwtService jwtService; + @Mock + private IdentityAuditRepository audit; + @InjectMocks private UserService userService; @@ -61,6 +67,41 @@ void shouldRegisterUserSuccessfully() { verify(userRepository, times(1)).existsByUsername("thao.tran"); verify(userRepository, times(1)).save(sampleUser); + verify(audit).save(argThat(event -> "USER_CREATED".equals(event.getAction()) + && "PASSENGER".equals(event.getTargetRole()))); + } + + @Test + @DisplayName("Creating a user with no role records UNKNOWN in the audit without throwing") + void shouldAuditUnknownRoleWhenCreatingUserWithoutRole() { + sampleUser.setRole(null); + when(userRepository.save(sampleUser)).thenReturn(sampleUser); + + User registered = userService.registerUser(sampleUser); + + assertThat(registered).isSameAs(sampleUser); + var event = ArgumentCaptor.forClass(IdentityAuditEvent.class); + verify(audit).save(event.capture()); + assertThat(event.getValue().getAction()).isEqualTo("USER_CREATED"); + assertThat(event.getValue().getTargetUsername()).isEqualTo("thao.tran"); + assertThat(event.getValue().getTargetRole()).isEqualTo("UNKNOWN"); + } + + @Test + @DisplayName("Deleting a user with no role still revokes tokens and records UNKNOWN") + void shouldAuditUnknownRoleWhenDeletingUserWithoutRole() { + sampleUser.setRole(null); + when(userRepository.findByUsername("thao.tran")).thenReturn(Optional.of(sampleUser)); + + userService.deleteUserByUsername("thao.tran"); + + verify(jwtService).revokeAllUserTokens("thao.tran"); + verify(userRepository).delete(sampleUser); + var event = ArgumentCaptor.forClass(IdentityAuditEvent.class); + verify(audit).save(event.capture()); + assertThat(event.getValue().getAction()).isEqualTo("USER_DELETED"); + assertThat(event.getValue().getTargetUsername()).isEqualTo("thao.tran"); + assertThat(event.getValue().getTargetRole()).isEqualTo("UNKNOWN"); } @Test @@ -180,4 +221,4 @@ void shouldDeleteUserWhenJwtServiceIsNull() { verify(userRepository, times(1)).delete(sampleUser); } -} \ No newline at end of file +} diff --git a/cruise-auth-service/src/test/resources/application.yml b/cruise-auth-service/src/test/resources/application.yml index 481926b9..ae5b937d 100644 --- a/cruise-auth-service/src/test/resources/application.yml +++ b/cruise-auth-service/src/test/resources/application.yml @@ -14,3 +14,6 @@ spring: hibernate: ddl-auto: create-drop show-sql: false + +jwt: + secret: cruise-secret-key-super-secure-token-2026-auth-jwt-system diff --git a/cruise-common/pom.xml b/cruise-common/pom.xml index 93ccf8d7..9e18d44a 100644 --- a/cruise-common/pom.xml +++ b/cruise-common/pom.xml @@ -14,6 +14,16 @@ Shared common library for Cruise microservices + + org.springframework.boot + spring-boot-starter-webmvc + true + + + jakarta.servlet + jakarta.servlet-api + provided + org.projectlombok lombok diff --git a/cruise-common/src/main/java/com/cruise/common/security/AccessPolicy.java b/cruise-common/src/main/java/com/cruise/common/security/AccessPolicy.java new file mode 100644 index 00000000..67db2d37 --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/AccessPolicy.java @@ -0,0 +1,6 @@ +package com.cruise.common.security; + +@FunctionalInterface +public interface AccessPolicy { + AccessRequirement requirement(String method, String path); +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/AccessRequirement.java b/cruise-common/src/main/java/com/cruise/common/security/AccessRequirement.java new file mode 100644 index 00000000..61082aaf --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/AccessRequirement.java @@ -0,0 +1,11 @@ +package com.cruise.common.security; + +public record AccessRequirement(Mode mode, Permission permission) { + public enum Mode { PUBLIC, AUTHENTICATED, PERMISSION, DENY } + public static AccessRequirement publicAccess() { return new AccessRequirement(Mode.PUBLIC, null); } + public static AccessRequirement authenticated() { return new AccessRequirement(Mode.AUTHENTICATED, null); } + public static AccessRequirement require(Permission permission) { + return new AccessRequirement(Mode.PERMISSION, java.util.Objects.requireNonNull(permission)); + } + public static AccessRequirement deny() { return new AccessRequirement(Mode.DENY, null); } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/AccessTokenVerifier.java b/cruise-common/src/main/java/com/cruise/common/security/AccessTokenVerifier.java new file mode 100644 index 00000000..371e87a7 --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/AccessTokenVerifier.java @@ -0,0 +1,13 @@ +package com.cruise.common.security; + +import java.util.Optional; + +@FunctionalInterface +public interface AccessTokenVerifier { + Optional verify(String token); + + /** An auth outage must never turn into an allow decision. */ + class Unavailable extends RuntimeException { + public Unavailable(Throwable cause) { super("Identity service unavailable", cause); } + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/AuthorizationFilter.java b/cruise-common/src/main/java/com/cruise/common/security/AuthorizationFilter.java new file mode 100644 index 00000000..d6159b25 --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/AuthorizationFilter.java @@ -0,0 +1,126 @@ +package com.cruise.common.security; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.security.Principal; +import java.util.Collections; +import java.util.Enumeration; +import java.util.LinkedHashSet; +import java.util.Optional; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.filter.OncePerRequestFilter; + +/** Service boundary authorization, including direct port access that bypasses the gateway. */ +public final class AuthorizationFilter extends OncePerRequestFilter { + private static final Logger AUDIT = LoggerFactory.getLogger("com.cruise.security.audit"); + private final AccessTokenVerifier verifier; + private final AccessPolicy policy; + + public AuthorizationFilter(AccessTokenVerifier verifier, AccessPolicy policy) { + this.verifier = verifier; + this.policy = policy; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException { + String path = request.getRequestURI().substring(request.getContextPath().length()); + if (!path.startsWith("/api/") && !path.equals("/api")) { + chain.doFilter(request, response); + return; + } + // Reject ambiguous paths instead of letting routing and policy normalization disagree. + if (path.contains("%") || path.contains(";") || path.contains("\\") || path.contains("//") + || path.matches(".*/\\.\\.?(/.*)?")) { + reject(request, response, 400, "INVALID_PATH", "Ambiguous API path", null); + return; + } + String method = request.getMethod(); + if ("OPTIONS".equals(method)) { + chain.doFilter(request, response); + return; + } + AccessRequirement rule = policy.requirement(method, path); + if (rule.mode() == AccessRequirement.Mode.PUBLIC) { + chain.doFilter(new CallerRequest(request, null), response); + return; + } + String header = request.getHeader("Authorization"); + if (header == null || !header.matches("(?i)Bearer [^\\s,]{1,8192}")) { + reject(request, response, 401, "UNAUTHENTICATED", "Missing or invalid Authorization header", null); + return; + } + Optional result; + try { + result = verifier.verify(header.substring(7)); + } catch (AccessTokenVerifier.Unavailable ex) { + reject(request, response, 503, "AUTH_UNAVAILABLE", "Identity service unavailable; retry later", null); + return; + } + if (result.isEmpty()) { + reject(request, response, 401, "UNAUTHENTICATED", "Invalid or expired session token", null); + return; + } + VerifiedCaller caller = result.get(); + if (rule.mode() == AccessRequirement.Mode.DENY + || (rule.mode() == AccessRequirement.Mode.PERMISSION + && !RolePermissions.allows(caller.role(), rule.permission()))) { + reject(request, response, 403, "FORBIDDEN", "Your role does not have this permission", caller); + return; + } + request.setAttribute(VerifiedCaller.ATTRIBUTE, caller); + try { + chain.doFilter(new CallerRequest(request, caller), response); + } finally { + if (!"GET".equals(method) && !"HEAD".equals(method)) { + AUDIT.info("event=api_write userId={} role={} method={} path={} status={}", + caller.userId(), caller.role(), method, path, response.getStatus()); + } + } + } + + private void reject(HttpServletRequest request, HttpServletResponse response, int status, + String code, String message, VerifiedCaller caller) throws IOException { + AUDIT.warn("event=access_denied userId={} role={} method={} path={} status={} code={}", + caller == null ? null : caller.userId(), caller == null ? null : caller.role(), + request.getMethod(), request.getRequestURI(), status, code); + response.setStatus(status); + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.setHeader("Cache-Control", "no-store"); + if (status == 401) response.setHeader("WWW-Authenticate", "Bearer"); + response.getWriter().write("{\"success\":false,\"code\":\"" + code + "\",\"message\":\"" + message + "\"}"); + } + + /** Override spoofable role headers. Auth user IDs are deliberately not passenger IDs. */ + private static final class CallerRequest extends HttpServletRequestWrapper { + private final VerifiedCaller caller; + CallerRequest(HttpServletRequest request, VerifiedCaller caller) { super(request); this.caller = caller; } + @Override public String getHeader(String name) { + if ("X-Caller-Role".equalsIgnoreCase(name)) return caller == null ? null : caller.role().name(); + if ("X-Caller-Id".equalsIgnoreCase(name)) return null; + return super.getHeader(name); + } + @Override public Enumeration getHeaders(String name) { + if ("X-Caller-Role".equalsIgnoreCase(name) || "X-Caller-Id".equalsIgnoreCase(name)) { + String value = getHeader(name); + return Collections.enumeration(value == null ? java.util.List.of() : java.util.List.of(value)); + } + return super.getHeaders(name); + } + @Override public Enumeration getHeaderNames() { + var names = new LinkedHashSet<>(Collections.list(super.getHeaderNames())); + names.removeIf(n -> "X-Caller-Role".equalsIgnoreCase(n) || "X-Caller-Id".equalsIgnoreCase(n)); + if (caller != null) names.add("X-Caller-Role"); + return Collections.enumeration(names); + } + @Override public Principal getUserPrincipal() { return caller; } + @Override public String getRemoteUser() { return caller == null ? null : caller.username(); } + @Override public boolean isUserInRole(String role) { return caller != null && caller.role().name().equals(role); } + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/Permission.java b/cruise-common/src/main/java/com/cruise/common/security/Permission.java new file mode 100644 index 00000000..80e6695e --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/Permission.java @@ -0,0 +1,12 @@ +package com.cruise.common.security; + +/** Stable permission names shared by the service authorization policies. */ +public enum Permission { + USERS_MANAGE, SECURITY_AUDIT_READ, TERMINALS_MANAGE, + ITINERARY_READ, ITINERARY_MANAGE, + ACTIVITIES_READ, ACTIVITIES_MANAGE, + EXCURSIONS_READ, EXCURSIONS_MANAGE, + PASSENGERS_READ, PASSENGERS_MANAGE, + POS_READ, POS_OPERATE, FINANCE_MANAGE, REPORTS_READ, + OPERATIONS_MANAGE, CATALOG_READ +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/RbacFilterConfiguration.java b/cruise-common/src/main/java/com/cruise/common/security/RbacFilterConfiguration.java new file mode 100644 index 00000000..cf6c13e3 --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/RbacFilterConfiguration.java @@ -0,0 +1,18 @@ +package com.cruise.common.security; + +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; + +/** Registers the same service-boundary policy for local and remote identity verification. */ +@Configuration(proxyBeanMethods = false) +public class RbacFilterConfiguration { + @Bean + public FilterRegistrationBean authorizationFilter(AccessTokenVerifier verifier) { + var registration = new FilterRegistrationBean<>(new AuthorizationFilter(verifier, new ServiceAccessPolicy())); + registration.setOrder(Ordered.HIGHEST_PRECEDENCE + 20); + registration.addUrlPatterns("/api/*"); + return registration; + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/RemoteAccessTokenVerifier.java b/cruise-common/src/main/java/com/cruise/common/security/RemoteAccessTokenVerifier.java new file mode 100644 index 00000000..4e6a9c70 --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/RemoteAccessTokenVerifier.java @@ -0,0 +1,44 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import java.net.URI; +import java.net.http.HttpClient; +import java.time.Duration; +import java.util.Map; +import java.util.Optional; +import org.springframework.http.client.JdkClientHttpRequestFactory; +import org.springframework.web.client.RestClient; +import org.springframework.web.client.RestClientException; + +/** Bounded, uncached introspection: logout, deletion and role changes take effect per request. */ +public final class RemoteAccessTokenVerifier implements AccessTokenVerifier { + private final RestClient client; + private final URI endpoint; + + public RemoteAccessTokenVerifier(String authBaseUrl) { + this.endpoint = URI.create(authBaseUrl.replaceAll("/+$", "") + "/api/auth/access-context"); + var factory = new JdkClientHttpRequestFactory(HttpClient.newBuilder() + .connectTimeout(Duration.ofSeconds(1)).build()); + factory.setReadTimeout(Duration.ofSeconds(2)); + this.client = RestClient.builder().requestFactory(factory).build(); + } + + @Override + public Optional verify(String token) { + try { + Map response = client.post().uri(endpoint).body(Map.of("token", token)) + .retrieve().body(Map.class); + if (response == null || !Boolean.TRUE.equals(response.get("success"))) { + throw new IllegalStateException("Invalid identity service response"); + } + Object data = response.get("data"); + if (data == null) return Optional.empty(); + if (!(data instanceof Map caller)) throw new IllegalStateException("Invalid identity data"); + return Optional.of(new VerifiedCaller(((Number) caller.get("userId")).longValue(), + (String) caller.get("username"), Role.valueOf((String) caller.get("role")))); + } catch (RestClientException | IllegalArgumentException | IllegalStateException | ClassCastException + | NullPointerException ex) { + throw new AccessTokenVerifier.Unavailable(ex); + } + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/RemoteRbacConfiguration.java b/cruise-common/src/main/java/com/cruise/common/security/RemoteRbacConfiguration.java new file mode 100644 index 00000000..d339e0cd --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/RemoteRbacConfiguration.java @@ -0,0 +1,17 @@ +package com.cruise.common.security; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +/** Shared wiring for services that obtain their live identity from the auth service. */ +@Configuration(proxyBeanMethods = false) +@Import(RbacFilterConfiguration.class) +public class RemoteRbacConfiguration { + @Bean + public AccessTokenVerifier accessTokenVerifier( + @Value("${cruise.auth.base-url:http://localhost:8081}") String authBaseUrl) { + return new RemoteAccessTokenVerifier(authBaseUrl); + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/RolePermissions.java b/cruise-common/src/main/java/com/cruise/common/security/RolePermissions.java new file mode 100644 index 00000000..56abb9f8 --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/RolePermissions.java @@ -0,0 +1,37 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import java.util.EnumSet; +import java.util.Map; +import java.util.Set; +import static com.cruise.common.security.Permission.*; + +/** No implicit role hierarchy and no legacy ADMIN/STAFF aliases. */ +public final class RolePermissions { + private RolePermissions() {} + + private static final Map> GRANTS = Map.of( + Role.SYSTEM_ADMIN, Set.copyOf(EnumSet.allOf(Permission.class)), + Role.OPERATIONS_MANAGER, Set.of(ITINERARY_READ, ITINERARY_MANAGE, + ACTIVITIES_READ, ACTIVITIES_MANAGE, EXCURSIONS_READ, EXCURSIONS_MANAGE, + PASSENGERS_READ, PASSENGERS_MANAGE, POS_READ, POS_OPERATE, + FINANCE_MANAGE, REPORTS_READ, OPERATIONS_MANAGE, CATALOG_READ), + Role.ITINERARY_COORDINATOR, Set.of(ITINERARY_READ, ITINERARY_MANAGE, CATALOG_READ), + Role.ACTIVITY_MANAGER, Set.of(ITINERARY_READ, ACTIVITIES_READ, ACTIVITIES_MANAGE, + PASSENGERS_READ, CATALOG_READ), + Role.SHORE_EXCURSION_MANAGER, Set.of(ITINERARY_READ, EXCURSIONS_READ, EXCURSIONS_MANAGE, + PASSENGERS_READ, CATALOG_READ), + Role.POS_STAFF, Set.of(ITINERARY_READ, POS_READ, POS_OPERATE, PASSENGERS_READ), + Role.FINANCE_FRONT_DESK, Set.of(ITINERARY_READ, POS_READ, FINANCE_MANAGE, + REPORTS_READ, PASSENGERS_READ, PASSENGERS_MANAGE), + Role.PASSENGER, Set.of(ITINERARY_READ, CATALOG_READ) + ); + + public static Set permissions(Role role) { + return role == null ? Set.of() : GRANTS.getOrDefault(role, Set.of()); + } + + public static boolean allows(Role role, Permission permission) { + return permission != null && permissions(role).contains(permission); + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/ServiceAccessPolicy.java b/cruise-common/src/main/java/com/cruise/common/security/ServiceAccessPolicy.java new file mode 100644 index 00000000..e418754e --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/ServiceAccessPolicy.java @@ -0,0 +1,71 @@ +package com.cruise.common.security; + +import java.util.Set; +import static com.cruise.common.security.Permission.*; +import static com.cruise.common.security.AccessRequirement.*; + +/** Ordered domain rules: specific aliases precede broader resource families; unknown APIs deny. */ +public final class ServiceAccessPolicy implements AccessPolicy { + private static final Set HEALTH = Set.of("/api/ping", "/api/info", "/api/health", + "/api/auth/health", "/api/itinerary/health", "/api/activities/health", "/api/pos/health"); + private static final Set PUBLIC_AUTH = Set.of("/api/auth/login", "/api/auth/refresh", + "/api/auth/refresh-token", "/api/auth/verify-token", "/api/auth/validate-token", + "/api/auth/access-context", "/api/auth/logout", "/api/auth/verify-password", + "/api/auth/revoke-token", "/api/auth/token/revoke"); + private static final Set SESSION = Set.of("/api/auth/me", "/api/auth/logout", + "/api/auth/change-password", "/api/auth/verify-password", "/api/auth/token/pair", + "/api/auth/revoke-token", "/api/auth/token/revoke", "/api/auth/permissions"); + + @Override + public AccessRequirement requirement(String method, String path) { + boolean read = "GET".equals(method) || "HEAD".equals(method); + if (read && HEALTH.contains(path)) return publicAccess(); + // These endpoints prove credentials/token in their payload, and retain their existing 405 contract. + if (PUBLIC_AUTH.contains(path)) return publicAccess(); + if (SESSION.contains(path)) return authenticated(); + if (under(path, "/api/auth/users") || under(path, "/api/auth/roles")) return require(USERS_MANAGE); + if (under(path, "/api/admin/audit")) return require(SECURITY_AUDIT_READ); + if (under(path, "/api/admin/pos/terminals")) return require(TERMINALS_MANAGE); + if (under(path, "/api/admin/voyage-lifecycle") || under(path, "/api/admin/voyages")) { + return require(OPERATIONS_MANAGE); + } + if (under(path, "/api/itinerary") || under(path, "/api/admin/cruise-area-policy")) { + return require(read ? ITINERARY_READ : ITINERARY_MANAGE); + } + if (under(path, "/api/passenger-portal/catalog")) return read ? require(CATALOG_READ) : deny(); + if (under(path, "/api/v1/tour-providers") && path.contains("/settlement")) return require(FINANCE_MANAGE); + if (under(path, "/api/excursions") || under(path, "/api/activities/excursions") + || under(path, "/api/v1/shore-excursions") || under(path, "/api/v1/tour-providers")) { + return require(read ? EXCURSIONS_READ : EXCURSIONS_MANAGE); + } + if (under(path, "/api/passengers") || under(path, "/api/activities/passengers")) { + if (path.contains("/folio")) return require(read ? POS_READ : FINANCE_MANAGE); + return require(read ? PASSENGERS_READ : PASSENGERS_MANAGE); + } + if (under(path, "/api/activities")) return require(read ? ACTIVITIES_READ : ACTIVITIES_MANAGE); + if (under(path, "/api/operations") || under(path, "/api/feedback/reviews")) return require(OPERATIONS_MANAGE); + if (under(path, "/api/service-recovery")) return require(FINANCE_MANAGE); + if (under(path, "/api/pos") || under(path, "/api/v1/pos")) { + String posPath = path.replaceFirst("^/api/v1/pos", "/api/pos"); + if (under(posPath, "/api/pos/reports")) return require(REPORTS_READ); + if (under(posPath, "/api/pos/auth/manifest")) return require(POS_OPERATE); + if (!read && posPath.matches("/api/pos/transactions/[^/]+/(refund|void)")) return require(FINANCE_MANAGE); + if (under(posPath, "/api/pos/terminals") && !read) return require(OPERATIONS_MANAGE); + if (under(posPath, "/api/pos/folios") || under(posPath, "/api/pos/disputes") + || under(posPath, "/api/pos/cabin-billing") || under(posPath, "/api/pos/invoices") + || under(posPath, "/api/pos/settlements") || under(posPath, "/api/pos/reconciliation")) { + // Cashiers may post a charge; credit limits, settlement and dispute resolution require finance. + if ("POST".equals(method) && posPath.matches("/api/pos/folios/[^/]+/ledger")) return require(POS_OPERATE); + return require(read ? POS_READ : FINANCE_MANAGE); + } + if (!read && (under(posPath, "/api/pos/products") || under(posPath, "/api/pos/catalog") + || under(posPath, "/api/pos/pricing/happy-hour-rules"))) return require(OPERATIONS_MANAGE); + return require(read ? POS_READ : POS_OPERATE); + } + return deny(); + } + + private static boolean under(String path, String root) { + return path.equals(root) || path.startsWith(root + "/"); + } +} diff --git a/cruise-common/src/main/java/com/cruise/common/security/VerifiedCaller.java b/cruise-common/src/main/java/com/cruise/common/security/VerifiedCaller.java new file mode 100644 index 00000000..e57b8daa --- /dev/null +++ b/cruise-common/src/main/java/com/cruise/common/security/VerifiedCaller.java @@ -0,0 +1,18 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import java.security.Principal; + +/** Identity from verified auth-service state, never from caller supplied headers. */ +public record VerifiedCaller(Long userId, String username, Role role) implements Principal { + public static final String ATTRIBUTE = VerifiedCaller.class.getName(); + + public VerifiedCaller { + if (userId == null || userId <= 0 || username == null || username.isBlank() || role == null) { + throw new IllegalArgumentException("A verified caller requires user ID, username and role"); + } + } + + @Override + public String getName() { return username; } +} diff --git a/cruise-common/src/test/java/com/cruise/common/security/AuthorizationFilterTest.java b/cruise-common/src/test/java/com/cruise/common/security/AuthorizationFilterTest.java new file mode 100644 index 00000000..6f83692f --- /dev/null +++ b/cruise-common/src/test/java/com/cruise/common/security/AuthorizationFilterTest.java @@ -0,0 +1,105 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import jakarta.servlet.http.HttpServletRequest; +import java.util.Collections; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.NullSource; +import org.junit.jupiter.params.provider.ValueSource; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +class AuthorizationFilterTest { + private final AccessTokenVerifier verifier = mock(AccessTokenVerifier.class); + private final AuthorizationFilter filter = new AuthorizationFilter(verifier, new ServiceAccessPolicy()); + + @ParameterizedTest @NullSource + @ValueSource(strings = {"", "Basic abc", "Bearer ", "Bearer token", "Bearer abc,def", "Bearer abc def"}) + void missingAndMalformedHeadersNeverReachTheController(String header) throws Exception { + var request = new MockHttpServletRequest("POST", "/api/auth/users"); + if (header != null) request.addHeader("Authorization", header); + request.addHeader("X-Caller-Role", "SYSTEM_ADMIN"); + var response = new MockHttpServletResponse(); + filter.doFilter(request, response, (req, res) -> fail("Unauthorized controller invocation")); + assertThat(response.getStatus()).isEqualTo(401); + assertThat(response.getHeader("WWW-Authenticate")).isEqualTo("Bearer"); + assertThat(response.getContentAsString()).contains("UNAUTHENTICATED"); + verifyNoInteractions(verifier); + } + + @Test void invalidTokensFailClosedAndAreNotEchoed() throws Exception { + when(verifier.verify("sensitive-token")).thenReturn(Optional.empty()); + var response = execute("POST", "/api/auth/users", "sensitive-token"); + assertThat(response.getStatus()).isEqualTo(401); + assertThat(response.getContentAsString()).doesNotContain("sensitive-token"); + } + + @Test void identityOutageReturnsRetryable503WithoutExecutingBusinessLogic() throws Exception { + when(verifier.verify("token")).thenThrow(new AccessTokenVerifier.Unavailable(new RuntimeException("private detail"))); + var response = execute("POST", "/api/activities", "token"); + assertThat(response.getStatus()).isEqualTo(503); + assertThat(response.getContentAsString()).contains("AUTH_UNAVAILABLE").doesNotContain("private detail"); + } + + @Test void stripsSpoofedHeadersAndUsesVerifiedRole() throws Exception { + var caller = new VerifiedCaller(12L, "shore.guide", Role.SHORE_EXCURSION_MANAGER); + when(verifier.verify("token")).thenReturn(Optional.of(caller)); + var request = new MockHttpServletRequest("POST", "/api/excursions"); + request.addHeader("Authorization", "bEaReR token"); + request.addHeader("X-Caller-Role", "SYSTEM_ADMIN"); + request.addHeader("x-caller-role", "POS_STAFF"); + request.addHeader("X-Caller-Id", "1"); + var reached = new AtomicBoolean(); + filter.doFilter(request, new MockHttpServletResponse(), (req, res) -> { + reached.set(true); + var http = (HttpServletRequest) req; + assertThat(http.getHeader("X-Caller-Role")).isEqualTo("SHORE_EXCURSION_MANAGER"); + assertThat(Collections.list(http.getHeaders("x-caller-role"))).containsExactly("SHORE_EXCURSION_MANAGER"); + assertThat(http.getHeader("X-Caller-Id")).isNull(); + assertThat(Collections.list(http.getHeaderNames())).doesNotContain("X-Caller-Id"); + assertThat(http.getUserPrincipal()).isEqualTo(caller); + assertThat(http.isUserInRole("SYSTEM_ADMIN")).isFalse(); + }); + assertThat(reached).isTrue(); + } + + @Test void wrongRoleCannotElevateUsingHeadersAndUnknownApisDenyAdmin() throws Exception { + when(verifier.verify("staff")).thenReturn(Optional.of(new VerifiedCaller(2L, "pos", Role.POS_STAFF))); + assertThat(execute("POST", "/api/auth/users", "staff").getStatus()).isEqualTo(403); + when(verifier.verify("admin")).thenReturn(Optional.of(new VerifiedCaller(1L, "admin", Role.SYSTEM_ADMIN))); + assertThat(execute("POST", "/api/undefined-management", "admin").getStatus()).isEqualTo(403); + } + + @ParameterizedTest + @ValueSource(strings = {"/api/auth/users;admin", "/api/auth//users", "/api/%61uth/users", "/api/auth/../activities", "/api/auth/./users"}) + void rejectsAmbiguousPaths(String path) throws Exception { + assertThat(execute("POST", path, "token").getStatus()).isEqualTo(400); + verifyNoInteractions(verifier); + } + + @Test void healthAndPreflightRemainAvailableWithoutAnAuthDependency() throws Exception { + var reached = new AtomicBoolean(); + filter.doFilter(new MockHttpServletRequest("GET", "/api/activities/health"), new MockHttpServletResponse(), + (req, res) -> reached.set(true)); + assertThat(reached).isTrue(); + reached.set(false); + filter.doFilter(new MockHttpServletRequest("OPTIONS", "/api/activities"), new MockHttpServletResponse(), + (req, res) -> reached.set(true)); + assertThat(reached).isTrue(); + verifyNoInteractions(verifier); + } + + private MockHttpServletResponse execute(String method, String path, String token) throws Exception { + var request = new MockHttpServletRequest(method, path); + request.addHeader("Authorization", "Bearer " + token); + request.addHeader("X-Caller-Role", "SYSTEM_ADMIN"); + var response = new MockHttpServletResponse(); + filter.doFilter(request, response, (req, res) -> fail("Denied request reached the controller")); + return response; + } +} diff --git a/cruise-common/src/test/java/com/cruise/common/security/PermissionRulesTest.java b/cruise-common/src/test/java/com/cruise/common/security/PermissionRulesTest.java new file mode 100644 index 00000000..563d4a98 --- /dev/null +++ b/cruise-common/src/test/java/com/cruise/common/security/PermissionRulesTest.java @@ -0,0 +1,80 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import static com.cruise.common.security.Permission.*; +import static org.assertj.core.api.Assertions.*; + +class PermissionRulesTest { + private final ServiceAccessPolicy policy = new ServiceAccessPolicy(); + + static Stream matrix() { + return Stream.of( + Arguments.of("POST", "/api/auth/users", Set.of(Role.SYSTEM_ADMIN)), + Arguments.of("GET", "/api/auth/roles", Set.of(Role.SYSTEM_ADMIN)), + Arguments.of("GET", "/api/admin/audit/events", Set.of(Role.SYSTEM_ADMIN)), + Arguments.of("POST", "/api/admin/pos/terminals", Set.of(Role.SYSTEM_ADMIN)), + Arguments.of("POST", "/api/itinerary/ships", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.ITINERARY_COORDINATOR)), + Arguments.of("POST", "/api/activities", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.ACTIVITY_MANAGER)), + Arguments.of("PUT", "/api/excursions/7", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.SHORE_EXCURSION_MANAGER)), + Arguments.of("POST", "/api/activities/excursions/7/check-in", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.SHORE_EXCURSION_MANAGER)), + Arguments.of("POST", "/api/v1/tour-providers", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.SHORE_EXCURSION_MANAGER)), + Arguments.of("POST", "/api/v1/tour-providers/settlements", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK)), + Arguments.of("POST", "/api/passengers/register", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK)), + Arguments.of("POST", "/api/pos/transactions", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.POS_STAFF)), + Arguments.of("POST", "/api/pos/transactions/5/refund", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK)), + Arguments.of("POST", "/api/pos/folios/A101/settle", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK)), + Arguments.of("PUT", "/api/pos/folios/A101/credit-limit", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK)), + Arguments.of("POST", "/api/pos/folios/A101/ledger", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.POS_STAFF)), + Arguments.of("GET", "/api/pos/reports/revenue", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK)), + Arguments.of("POST", "/api/operations/solas-muster/trigger", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER)), + Arguments.of("GET", "/api/passenger-portal/catalog/tour/1", Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, + Role.ITINERARY_COORDINATOR, Role.ACTIVITY_MANAGER, Role.SHORE_EXCURSION_MANAGER, Role.PASSENGER)) + ); + } + + @ParameterizedTest @MethodSource("matrix") + void enforcesTheReviewedBusinessMatrixForEveryRole(String method, String path, Set allowed) { + var rule = policy.requirement(method, path); + assertThat(rule.mode()).isEqualTo(AccessRequirement.Mode.PERMISSION); + for (Role role : Role.values()) { + assertThat(RolePermissions.allows(role, rule.permission())).as("%s %s %s", role, method, path) + .isEqualTo(allowed.contains(role)); + } + } + + @Test void grantsAreCompleteImmutableAndFailClosed() { + for (Role role : Role.values()) { + assertThat(RolePermissions.permissions(role)).isNotEmpty(); + assertThatThrownBy(() -> RolePermissions.permissions(role).clear()).isInstanceOf(UnsupportedOperationException.class); + } + assertThat(RolePermissions.permissions(Role.SYSTEM_ADMIN)).containsExactlyInAnyOrder(Permission.values()); + assertThat(RolePermissions.permissions(null)).isEmpty(); + assertThat(RolePermissions.allows(null, USERS_MANAGE)).isFalse(); + assertThat(RolePermissions.allows(Role.SYSTEM_ADMIN, null)).isFalse(); + assertThat(RolePermissions.permissions(Role.OPERATIONS_MANAGER)).doesNotContain(USERS_MANAGE, SECURITY_AUDIT_READ, TERMINALS_MANAGE); + } + + @Test void aliasesAndHeadsHaveTheSameRules() { + assertThat(policy.requirement("PATCH", "/api/activities/passengers/5/check-in")) + .isEqualTo(policy.requirement("PATCH", "/api/passengers/5/check-in")); + assertThat(policy.requirement("POST", "/api/v1/pos/shifts/1/cash-drops")) + .isEqualTo(policy.requirement("POST", "/api/pos/shifts/1/cash-drops")); + assertThat(policy.requirement("HEAD", "/api/activities/tour/1")) + .isEqualTo(policy.requirement("GET", "/api/activities/tour/1")); + } + + @Test void unknownResourceFamiliesAndSimilarPrefixesDenyEvenAdmin() { + for (String path : Arrays.asList("/api/new-admin-feature", "/api/activities-evil", "/api/auth/users-evil", "/api/admin")) { + assertThat(policy.requirement("GET", path).mode()).as(path).isEqualTo(AccessRequirement.Mode.DENY); + } + assertThat(policy.requirement("POST", "/api/passenger-portal/catalog").mode()).isEqualTo(AccessRequirement.Mode.DENY); + assertThat(policy.requirement("POST", "/api/activities/health").mode()).isNotEqualTo(AccessRequirement.Mode.PUBLIC); + } +} diff --git a/cruise-common/src/test/java/com/cruise/common/security/RbacConfigurationTest.java b/cruise-common/src/test/java/com/cruise/common/security/RbacConfigurationTest.java new file mode 100644 index 00000000..9a7691b1 --- /dev/null +++ b/cruise-common/src/test/java/com/cruise/common/security/RbacConfigurationTest.java @@ -0,0 +1,65 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.Test; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.core.Ordered; +import org.springframework.core.env.MapPropertySource; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; +import static org.assertj.core.api.Assertions.assertThat; + +class RbacConfigurationTest { + @Test + void localIdentityWiringUsesOnlyTheProvidedVerifierAndEnforcesItsRole() throws Exception { + try (var context = new AnnotationConfigApplicationContext()) { + context.registerBean(AccessTokenVerifier.class, + () -> token -> Optional.of(new VerifiedCaller(7L, "activity.manager", Role.ACTIVITY_MANAGER))); + context.register(RbacFilterConfiguration.class); + context.refresh(); + + assertThat(context.getBeansOfType(AccessTokenVerifier.class)).hasSize(1); + var registration = context.getBean(FilterRegistrationBean.class); + assertThat(registration.getUrlPatterns()).containsExactly("/api/*"); + assertThat(registration.getOrder()).isLessThan(Ordered.HIGHEST_PRECEDENCE + 100); + var request = new MockHttpServletRequest("POST", "/api/activities"); + request.addHeader("Authorization", "Bearer local-token"); + var reached = new AtomicBoolean(); + registration.getFilter().doFilter(request, new MockHttpServletResponse(), + (req, res) -> reached.set(true)); + assertThat(reached).isTrue(); + + request = new MockHttpServletRequest("POST", "/api/auth/users"); + request.addHeader("Authorization", "Bearer local-token"); + var denied = new MockHttpServletResponse(); + reached.set(false); + registration.getFilter().doFilter(request, denied, (req, res) -> reached.set(true)); + assertThat(reached).isFalse(); + assertThat(denied.getStatus()).isEqualTo(403); + } + } + + @Test + void remoteIdentityWiringRegistersOneProtectedFilterWithoutAnAuthNetworkDependency() throws Exception { + try (var context = new AnnotationConfigApplicationContext()) { + context.getEnvironment().getPropertySources().addFirst(new MapPropertySource("rbac-test", + Map.of("cruise.auth.base-url", "http://127.0.0.1:1"))); + context.register(RemoteRbacConfiguration.class); + context.refresh(); + + assertThat(context.getBeansOfType(FilterRegistrationBean.class)).hasSize(1); + assertThat(context.getBean(AccessTokenVerifier.class)).isInstanceOf(RemoteAccessTokenVerifier.class); + var registration = context.getBean(FilterRegistrationBean.class); + var response = new MockHttpServletResponse(); + var reached = new AtomicBoolean(); + registration.getFilter().doFilter(new MockHttpServletRequest("GET", "/api/activities/tour/7"), + response, (req, res) -> reached.set(true)); + assertThat(reached).isFalse(); + assertThat(response.getStatus()).isEqualTo(401); + } + } +} diff --git a/cruise-common/src/test/java/com/cruise/common/security/RemoteAccessTokenVerifierTest.java b/cruise-common/src/test/java/com/cruise/common/security/RemoteAccessTokenVerifierTest.java new file mode 100644 index 00000000..a30c98e0 --- /dev/null +++ b/cruise-common/src/test/java/com/cruise/common/security/RemoteAccessTokenVerifierTest.java @@ -0,0 +1,56 @@ +package com.cruise.common.security; + +import com.cruise.common.enums.Role; +import com.sun.net.httpserver.HttpServer; +import java.net.InetSocketAddress; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.*; + +class RemoteAccessTokenVerifierTest { + private HttpServer server; + private RemoteAccessTokenVerifier verifier; + private final AtomicReference body = new AtomicReference<>("{\"success\":true}"); + private final AtomicInteger status = new AtomicInteger(200); + private final AtomicInteger calls = new AtomicInteger(); + + @BeforeEach void start() throws Exception { + server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + server.createContext("/api/auth/access-context", exchange -> { + calls.incrementAndGet(); + assertThat(exchange.getRequestMethod()).isEqualTo("POST"); + assertThat(new String(exchange.getRequestBody().readAllBytes(), StandardCharsets.UTF_8)).contains("\"token\":\"access-token\""); + byte[] bytes = body.get().getBytes(StandardCharsets.UTF_8); + exchange.getResponseHeaders().add("Content-Type", "application/json"); + exchange.sendResponseHeaders(status.get(), bytes.length); + exchange.getResponseBody().write(bytes); + exchange.close(); + }); + server.start(); + verifier = new RemoteAccessTokenVerifier("http://127.0.0.1:" + server.getAddress().getPort()); + } + @AfterEach void stop() { server.stop(0); } + + @Test void readsTheLiveIdentityAndDoesNotCachePositiveResults() { + body.set("{\"success\":true,\"data\":{\"userId\":9,\"username\":\"activity.mgr\",\"role\":\"ACTIVITY_MANAGER\"}}"); + assertThat(verifier.verify("access-token")).contains(new VerifiedCaller(9L, "activity.mgr", Role.ACTIVITY_MANAGER)); + body.set("{\"success\":true}"); + assertThat(verifier.verify("access-token")).isEmpty(); + assertThat(calls.get()).isEqualTo(2); + } + + @Test void networkFailureAndMalformedOrUnknownRoleResponsesDenyAccess() { + for (String response : new String[]{"not-json", "{}", "{\"success\":true,\"data\":{\"userId\":1,\"username\":\"x\",\"role\":\"ADMIN\"}}"}) { + body.set(response); + assertThatThrownBy(() -> verifier.verify("access-token")).isInstanceOf(AccessTokenVerifier.Unavailable.class); + } + status.set(500); + assertThatThrownBy(() -> verifier.verify("access-token")).isInstanceOf(AccessTokenVerifier.Unavailable.class); + server.stop(0); + assertThatThrownBy(() -> verifier.verify("access-token")).isInstanceOf(AccessTokenVerifier.Unavailable.class); + } +} diff --git a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/RbacConfig.java b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/RbacConfig.java new file mode 100644 index 00000000..fb248428 --- /dev/null +++ b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/RbacConfig.java @@ -0,0 +1,10 @@ +package com.cruise.itinerary.config; + +import com.cruise.common.security.RemoteRbacConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +@Configuration(proxyBeanMethods = false) +@Import(RemoteRbacConfiguration.class) +public class RbacConfig { +} diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CrossRoleItineraryApiTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CrossRoleItineraryApiTest.java new file mode 100644 index 00000000..e79f6d76 --- /dev/null +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CrossRoleItineraryApiTest.java @@ -0,0 +1,38 @@ +package com.cruise.itinerary; + +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import java.util.Optional; +import java.util.Set; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@SpringBootTest @AutoConfigureMockMvc +class CrossRoleItineraryApiTest { + @Autowired MockMvc mvc; + @MockitoBean AccessTokenVerifier verifier; + + @ParameterizedTest @EnumSource(Role.class) + void allRolesCanReadButOnlyAuthorizedFleetRolesReachMutationValidation(Role role) throws Exception { + when(verifier.verify("token")).thenReturn(Optional.of(new VerifiedCaller(5L, "actor", role))); + mvc.perform(get("/api/itinerary/ships").header("Authorization", "Bearer token")).andExpect(status().isOk()); + boolean allowed = Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.ITINERARY_COORDINATOR).contains(role); + mvc.perform(post("/api/itinerary/ships").header("Authorization", "Bearer token") + .contentType(MediaType.APPLICATION_JSON).content("{}")) + .andExpect(status().is(allowed ? 400 : 403)); + } + @Test void anonymousDirectServiceAccessIsDenied() throws Exception { + mvc.perform(get("/api/itinerary/ships")).andExpect(status().isUnauthorized()); + mvc.perform(get("/api/itinerary/health")).andExpect(status().isOk()); + } +} diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseItineraryApplicationTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseItineraryApplicationTest.java index be0bc46f..324873ac 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseItineraryApplicationTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseItineraryApplicationTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +@org.springframework.context.annotation.Import(com.cruise.itinerary.support.AuthenticatedApiTestConfig.class) @SpringBootTest @DisplayName("Cruise Itinerary Service Context Tests") class CruiseItineraryApplicationTest { diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseShipIntegrationTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseShipIntegrationTest.java index ee327b44..e23ee268 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseShipIntegrationTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseShipIntegrationTest.java @@ -20,6 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +@org.springframework.context.annotation.Import(com.cruise.itinerary.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseTourIntegrationTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseTourIntegrationTest.java index 7d3dd00d..5fd93bef 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseTourIntegrationTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/CruiseTourIntegrationTest.java @@ -29,6 +29,7 @@ /** * End-to-End API Integration Tests for Tour Management (KAN-99) */ +@org.springframework.context.annotation.Import(com.cruise.itinerary.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryIntegrationTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryIntegrationTest.java index dc7892f9..815cb9d1 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryIntegrationTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryIntegrationTest.java @@ -35,6 +35,7 @@ /** * Integration Tests for Daily Itinerary Updates and Change History (KAN-128, KAN-127) */ +@org.springframework.context.annotation.Import(com.cruise.itinerary.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryUpdateIntegrationTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryUpdateIntegrationTest.java index 605c6202..bdb794e1 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryUpdateIntegrationTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/DailyItineraryUpdateIntegrationTest.java @@ -34,6 +34,7 @@ /** * End-to-End API Integration Tests for Itinerary Updates and Audit Notification Triggers (KAN-128) */ +@org.springframework.context.annotation.Import(com.cruise.itinerary.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @Transactional diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/support/AuthenticatedApiTestConfig.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/support/AuthenticatedApiTestConfig.java new file mode 100644 index 00000000..9cae4439 --- /dev/null +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/support/AuthenticatedApiTestConfig.java @@ -0,0 +1,24 @@ +package com.cruise.itinerary.support; + +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import java.util.Optional; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webmvc.test.autoconfigure.MockMvcBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +/** Explicit authenticated fixture for pre-existing domain tests; production RBAC remains active. */ +@TestConfiguration(proxyBeanMethods = false) +public class AuthenticatedApiTestConfig { + @Bean @Primary + public AccessTokenVerifier domainTestIdentityVerifier() { + return token -> "domain-test-admin".equals(token) + ? Optional.of(new VerifiedCaller(1L, "domain.test", Role.SYSTEM_ADMIN)) : Optional.empty(); + } + @Bean + public MockMvcBuilderCustomizer authenticatedDomainRequests() { + return builder -> builder.defaultRequest(get("/").header("Authorization", "Bearer domain-test-admin")); + } +} diff --git a/cruise-pos-service/src/main/java/com/cruise/pos/config/RbacConfig.java b/cruise-pos-service/src/main/java/com/cruise/pos/config/RbacConfig.java new file mode 100644 index 00000000..b6d1e789 --- /dev/null +++ b/cruise-pos-service/src/main/java/com/cruise/pos/config/RbacConfig.java @@ -0,0 +1,11 @@ +package com.cruise.pos.config; + +import com.cruise.common.security.RemoteRbacConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +/** Runs even when the legacy POS demo security switch is disabled. */ +@Configuration(proxyBeanMethods = false) +@Import(RemoteRbacConfiguration.class) +public class RbacConfig { +} diff --git a/cruise-pos-service/src/main/java/com/cruise/pos/config/SecurityConfig.java b/cruise-pos-service/src/main/java/com/cruise/pos/config/SecurityConfig.java index 92eb862e..566fc32e 100644 --- a/cruise-pos-service/src/main/java/com/cruise/pos/config/SecurityConfig.java +++ b/cruise-pos-service/src/main/java/com/cruise/pos/config/SecurityConfig.java @@ -35,6 +35,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .csrf(AbstractHttpConfigurer::disable) .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(auth -> auth + .requestMatchers(org.springframework.http.HttpMethod.OPTIONS, "/**").permitAll() + .requestMatchers(org.springframework.http.HttpMethod.GET, "/api/pos/health").permitAll() + .requestMatchers(org.springframework.http.HttpMethod.HEAD, "/api/pos/health").permitAll() .requestMatchers("/api/pos/auth/manifest/**").hasAnyRole("POS_STAFF", "OPERATIONS_MANAGER", "SYSTEM_ADMIN") .requestMatchers("/api/admin/voyage-lifecycle/**").hasAnyRole("OPERATIONS_MANAGER", "SYSTEM_ADMIN", "ADMIN") .requestMatchers("/api/admin/voyages/**").hasAnyRole("OPERATIONS_MANAGER", "SYSTEM_ADMIN", "EXECUTIVE_CONTROLLER", "EXECUTIVE_DIRECTOR", "ADMIN", "MANAGER") diff --git a/cruise-pos-service/src/main/java/com/cruise/pos/controller/OperationalReportController.java b/cruise-pos-service/src/main/java/com/cruise/pos/controller/OperationalReportController.java index b357823e..5eaacaaf 100644 --- a/cruise-pos-service/src/main/java/com/cruise/pos/controller/OperationalReportController.java +++ b/cruise-pos-service/src/main/java/com/cruise/pos/controller/OperationalReportController.java @@ -22,7 +22,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.time.Instant; @@ -31,7 +31,7 @@ @RequestMapping("/api/pos/reports") @RequiredArgsConstructor @Slf4j -@PreAuthorize("hasAnyRole('MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") +@PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public class OperationalReportController { private final OperationalReportService reportService; diff --git a/cruise-pos-service/src/main/java/com/cruise/pos/controller/ServiceRecoveryController.java b/cruise-pos-service/src/main/java/com/cruise/pos/controller/ServiceRecoveryController.java index 7da9ac2d..425a577f 100644 --- a/cruise-pos-service/src/main/java/com/cruise/pos/controller/ServiceRecoveryController.java +++ b/cruise-pos-service/src/main/java/com/cruise/pos/controller/ServiceRecoveryController.java @@ -29,7 +29,7 @@ public class ServiceRecoveryController { private final ServiceRecoveryService serviceRecoveryService; @PostMapping("/cases") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity> createCase( @Valid @RequestBody CreateServiceRecoveryCaseRequest request, Principal principal) { @@ -40,7 +40,7 @@ public ResponseEntity> createCase( } @GetMapping("/cases") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity>> searchCases( @RequestParam(required = false) ServiceRecoveryCaseStatus status, @RequestParam(required = false) ServiceRecoverySeverity severity, @@ -51,14 +51,14 @@ public ResponseEntity>> searchCases( } @GetMapping("/cases/{caseId}") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity> getCase(@PathVariable Long caseId) { ServiceRecoveryCaseDto dto = serviceRecoveryService.getCase(caseId); return ResponseEntity.ok(ApiResponse.ok(dto)); } @PostMapping("/cases/{caseId}/escalate") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity> escalateCase( @PathVariable Long caseId, @Valid @RequestBody EscalateCaseRequest request, @@ -69,7 +69,7 @@ public ResponseEntity> escalateCase( } @PostMapping("/cases/{caseId}/resolve") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity> resolveCase( @PathVariable Long caseId, @Valid @RequestBody ResolveCaseRequest request, @@ -80,7 +80,7 @@ public ResponseEntity> resolveCase( } @PostMapping("/cases/{caseId}/vouchers") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity> issueVoucher( @PathVariable Long caseId, @Valid @RequestBody IssueObcVoucherRequest request, @@ -92,7 +92,7 @@ public ResponseEntity> issueVoucher( } @GetMapping("/cases/{caseId}/vouchers") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN')") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN')") public ResponseEntity>> getVouchersForCase(@PathVariable Long caseId) { List list = serviceRecoveryService.getVouchersForCase(caseId); return ResponseEntity.ok(ApiResponse.ok(list)); @@ -108,7 +108,7 @@ public ResponseEntity> claimVoucher( } @GetMapping("/passenger/{passengerId}/vouchers") - @PreAuthorize("hasAnyRole('STAFF', 'MANAGER', 'ADMIN', 'SYSTEM_ADMIN') or #passengerId.toString() == authentication.name") + @PreAuthorize("hasAnyRole('FINANCE_FRONT_DESK', 'OPERATIONS_MANAGER', 'SYSTEM_ADMIN') or #passengerId.toString() == authentication.name") public ResponseEntity>> getPassengerVouchers(@PathVariable Long passengerId) { List list = serviceRecoveryService.getPassengerVouchers(passengerId); return ResponseEntity.ok(ApiResponse.ok(list)); diff --git a/cruise-pos-service/src/main/java/com/cruise/pos/security/JwtAuthenticationFilter.java b/cruise-pos-service/src/main/java/com/cruise/pos/security/JwtAuthenticationFilter.java index e00c7234..50175ada 100644 --- a/cruise-pos-service/src/main/java/com/cruise/pos/security/JwtAuthenticationFilter.java +++ b/cruise-pos-service/src/main/java/com/cruise/pos/security/JwtAuthenticationFilter.java @@ -37,6 +37,17 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull FilterChain filterChain) throws ServletException, IOException { String header = request.getHeader(HttpHeaders.AUTHORIZATION); + // Reuse live auth-service verification performed at the service boundary. + // Do not require another shared-secret configuration or lose revocation checks. + Object verified = request.getAttribute(com.cruise.common.security.VerifiedCaller.ATTRIBUTE); + if (verified instanceof com.cruise.common.security.VerifiedCaller caller) { + var principal = new AuthPrincipal(caller.username(), caller.role().name(), null); + var authentication = new UsernamePasswordAuthenticationToken(principal, null, + List.of(new SimpleGrantedAuthority("ROLE_" + caller.role().name()))); + SecurityContextHolder.getContext().setAuthentication(authentication); + filterChain.doFilter(request, response); + return; + } if (header != null && header.startsWith(BEARER_PREFIX)) { String token = header.substring(BEARER_PREFIX.length()).trim(); Optional principal = jwtVerificationService.verify(token); diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/CruisePosApplicationTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/CruisePosApplicationTest.java index 716ae8ef..a617ab85 100644 --- a/cruise-pos-service/src/test/java/com/cruise/pos/CruisePosApplicationTest.java +++ b/cruise-pos-service/src/test/java/com/cruise/pos/CruisePosApplicationTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +@org.springframework.context.annotation.Import(com.cruise.pos.support.AuthenticatedApiTestConfig.class) @SpringBootTest @DisplayName("Cruise POS Service Context Tests") class CruisePosApplicationTest { diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/controller/PosFolioSettlementControllerTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/controller/PosFolioSettlementControllerTest.java index 63677ca1..9f6f116d 100644 --- a/cruise-pos-service/src/test/java/com/cruise/pos/controller/PosFolioSettlementControllerTest.java +++ b/cruise-pos-service/src/test/java/com/cruise/pos/controller/PosFolioSettlementControllerTest.java @@ -28,6 +28,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +@org.springframework.context.annotation.Import(com.cruise.pos.support.AuthenticatedApiTestConfig.class) @SpringBootTest @AutoConfigureMockMvc @ActiveProfiles("test") diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/security/CrossRolePosApiTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/security/CrossRolePosApiTest.java new file mode 100644 index 00000000..b6420542 --- /dev/null +++ b/cruise-pos-service/src/test/java/com/cruise/pos/security/CrossRolePosApiTest.java @@ -0,0 +1,41 @@ +package com.cruise.pos.security; + +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import java.util.Optional; +import java.util.Set; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@SpringBootTest(properties = "pos.security.enabled=true") @AutoConfigureMockMvc +class CrossRolePosApiTest { + @Autowired MockMvc mvc; + @MockitoBean AccessTokenVerifier verifier; + + @ParameterizedTest @EnumSource(Role.class) + void cashiersCannotSettleFoliosAndFinanceCannotCreateSales(Role role) throws Exception { + when(verifier.verify("token")).thenReturn(Optional.of(new VerifiedCaller(5L, "actor", role))); + boolean sale = Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.POS_STAFF).contains(role); + mvc.perform(post("/api/pos/transactions").header("Authorization", "Bearer token") + .contentType(MediaType.APPLICATION_JSON).content("{}")) + .andExpect(status().is(sale ? 400 : 403)); + boolean finance = Set.of(Role.SYSTEM_ADMIN, Role.OPERATIONS_MANAGER, Role.FINANCE_FRONT_DESK).contains(role); + mvc.perform(put("/api/pos/folios/A101/credit-limit").header("Authorization", "Bearer token") + .contentType(MediaType.APPLICATION_JSON).content("{}")) + .andExpect(status().is(finance ? 400 : 403)); + } + @Test void healthIsPublicButInternalApisAreProtectedWithSpringSecurityEnabled() throws Exception { + mvc.perform(get("/api/pos/health")).andExpect(status().isOk()); + mvc.perform(get("/api/pos/folios")).andExpect(status().isUnauthorized()); + } +} diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementConcurrencyTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementConcurrencyTest.java index cf3839ca..a5e76692 100644 --- a/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementConcurrencyTest.java +++ b/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementConcurrencyTest.java @@ -31,6 +31,7 @@ * Chứng minh tất toán nguyên tử: khoá bi quan trên folio + unique idempotency key * đảm bảo không bao giờ có hai bản ghi tất toán cho cùng một cabin. */ +@org.springframework.context.annotation.Import(com.cruise.pos.support.AuthenticatedApiTestConfig.class) @SpringBootTest @ActiveProfiles("test") @DisplayName("Folio settlement concurrency") diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementServiceTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementServiceTest.java index 7ca7eef2..458fe9aa 100644 --- a/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementServiceTest.java +++ b/cruise-pos-service/src/test/java/com/cruise/pos/service/FolioSettlementServiceTest.java @@ -42,6 +42,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.reset; +@org.springframework.context.annotation.Import(com.cruise.pos.support.AuthenticatedApiTestConfig.class) @SpringBootTest @ActiveProfiles("test") @Transactional diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/service/InvoicePdfServiceTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/service/InvoicePdfServiceTest.java index b3baca67..8fab4f02 100644 --- a/cruise-pos-service/src/test/java/com/cruise/pos/service/InvoicePdfServiceTest.java +++ b/cruise-pos-service/src/test/java/com/cruise/pos/service/InvoicePdfServiceTest.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +@org.springframework.context.annotation.Import(com.cruise.pos.support.AuthenticatedApiTestConfig.class) @SpringBootTest @ActiveProfiles("test") @Transactional diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/service/PosConcurrencyIntegrationTest.java b/cruise-pos-service/src/test/java/com/cruise/pos/service/PosConcurrencyIntegrationTest.java index fb6893af..57fd0073 100644 --- a/cruise-pos-service/src/test/java/com/cruise/pos/service/PosConcurrencyIntegrationTest.java +++ b/cruise-pos-service/src/test/java/com/cruise/pos/service/PosConcurrencyIntegrationTest.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@org.springframework.context.annotation.Import(com.cruise.pos.support.AuthenticatedApiTestConfig.class) @SpringBootTest @ActiveProfiles("test") @DisplayName("POS Concurrency & Credit Limit Enforcement Integration Tests") diff --git a/cruise-pos-service/src/test/java/com/cruise/pos/support/AuthenticatedApiTestConfig.java b/cruise-pos-service/src/test/java/com/cruise/pos/support/AuthenticatedApiTestConfig.java new file mode 100644 index 00000000..206f5365 --- /dev/null +++ b/cruise-pos-service/src/test/java/com/cruise/pos/support/AuthenticatedApiTestConfig.java @@ -0,0 +1,24 @@ +package com.cruise.pos.support; + +import com.cruise.common.enums.Role; +import com.cruise.common.security.*; +import java.util.Optional; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webmvc.test.autoconfigure.MockMvcBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +/** Explicit authenticated fixture for pre-existing domain tests; production RBAC remains active. */ +@TestConfiguration(proxyBeanMethods = false) +public class AuthenticatedApiTestConfig { + @Bean @Primary + public AccessTokenVerifier domainTestIdentityVerifier() { + return token -> "domain-test-admin".equals(token) + ? Optional.of(new VerifiedCaller(1L, "domain.test", Role.SYSTEM_ADMIN)) : Optional.empty(); + } + @Bean + public MockMvcBuilderCustomizer authenticatedDomainRequests() { + return builder -> builder.defaultRequest(get("/").header("Authorization", "Bearer domain-test-admin")); + } +} diff --git a/docs/KAN-66-RBAC.md b/docs/KAN-66-RBAC.md new file mode 100644 index 00000000..86010a6f --- /dev/null +++ b/docs/KAN-66-RBAC.md @@ -0,0 +1,131 @@ +# KAN-66 — Implement Role-Based Access Control + +## KAN-67: roles and permissions + +The existing eight `Role` enum values and persisted user role column remain the +source of truth. Grants are immutable in `RolePermissions`; changing a user's +role requires an administrator. Unknown roles and legacy aliases such as `ADMIN`, +`STAFF`, and `MANAGER` do not acquire system permissions. + +| Role | Domain access | +| --- | --- | +| SYSTEM_ADMIN | All defined permissions, including users, audit and terminal administration | +| OPERATIONS_MANAGER | All operational domains, excluding identity/security administration | +| ITINERARY_COORDINATOR | Manage itinerary; read catalog | +| ACTIVITY_MANAGER | Manage activities; read passenger rosters, itinerary and catalog | +| SHORE_EXCURSION_MANAGER | Manage excursions/providers; read passenger rosters, itinerary and catalog | +| POS_STAFF | Operate POS; read passenger rosters and itinerary | +| FINANCE_FRONT_DESK | Manage financial settlement and passenger check-in; read reports, POS and itinerary | +| PASSENGER | Read itinerary and guest catalog; no internal management access | + +This story governs role access to internal APIs and staff screens. Passenger +self-service ownership (mapping an auth user to a passenger record, booking, +folio or notification) must be implemented before granting passengers those +ID-addressed endpoints. An auth user ID is not assumed to be a passenger ID. +Existing anonymous demo self-service calls to internal endpoints are rejected. + +Task mapping: KAN-67 roles/grants; KAN-68 authorization middleware; KAN-69 API and +web restrictions; KAN-70 permission unit tests; KAN-71 unauthenticated API tests; +KAN-72 cross-role API and web tests. + +## KAN-68 / KAN-69: enforcement and contracts + +- Auth, itinerary, activity and POS register the authorization filter for `/api/*`. + Protection applies on direct service ports as well as behind a reverse proxy. +- Production auth startup requires `JWT_SECRET` (use a randomly generated secret + of at least 32 bytes). The old publicly known fallback is no longer used by + Spring injection; the `dev` profile and isolated test configuration have explicit + non-production keys. +- `401 UNAUTHENTICATED`: missing/malformed bearer token, invalid signature, + expiration, refresh token used as access token, revoked token, deleted or disabled + user, or a token whose role no longer matches the database. +- `403 FORBIDDEN`: valid identity without the required permission; undefined API + families deny even administrators. Ambiguous encoded/dot/semicolon paths return 400. +- `503 AUTH_UNAVAILABLE`: remote introspection fails/times out; access is denied. + Set `CRUISE_AUTH_BASE_URL` to the private auth-service origin in deployed services + (Spring property `cruise.auth.base-url`; default `http://localhost:8081`). Calls + have 1s connection / 2s read timeouts and no positive cache. +- `POST /api/auth/access-context` accepts `{ "token": "" }` and returns + a minimal verified identity, or a successful envelope without data for invalid + tokens. It validates issuer/type/expiry/signature/revocation and current user state. +- `GET /api/auth/roles`: administrator only; returns all grants. +- `GET /api/auth/permissions`: authenticated user; returns own permissions. +- Existing credential/token proof endpoints (login, refresh, verify-token, + verify-password, logout, revoke-token and aliases) retain their public contracts. + Logout stays idempotent. They do not grant access to internal management APIs. +- `X-Caller-Role` is replaced with the verified canonical role. `X-Caller-Id` is + stripped because auth and passenger record IDs have no established mapping. +- Successful user creation/deletion appends `identity_audit_events` in the same + transaction. Failure to persist the event rolls back the identity mutation. + Structured denial/write logs contain method, path, status, role and numeric user ID, + never credentials or tokens. Apply `docs/db/KAN-66-identity-audit.sql` when schema + changes are managed manually; development `ddl-auto=update` creates the table. +- POS uses the verified caller for its existing Spring Security method checks. + The shared RBAC filter is active even if `POS_SECURITY_ENABLED=false`. +- Web route guard, sidebar and command palette use one permission matrix. Unknown + roles cannot become staff. Passenger roster mutation controls require manage + permission. UI checks supplement server authorization, never replace it. +- The web client sends `usernameOrEmail` and reads `accessToken` from the actual + auth contract, and attaches the session Bearer token to API requests. Default + `/api` uses Vite's development proxy to the owning service (the current gateway + only exposes system telemetry). Production hosting must provide equivalent + reverse-proxy routing or set `VITE_API_BASE_URL` to that API origin. + +No role table migration is needed: role storage already exists. Permissions are +versioned code. Token revocation storage remains the existing auth-service in-memory +implementation; a persistent/distributed revocation store is a separate deployment +concern, and this change does not claim restart-safe or multi-instance revocation. + +The service-specific `RbacConfig` classes are opt-in imports only. Filter registration +is defined once in `RbacFilterConfiguration`; itinerary, activity and POS also import +the single `RemoteRbacConfiguration` for live identity verification. Auth supplies its +local verifier. Keeping these imports in service configuration preserves MVC test +slice isolation while removing the repeated remote-verifier/filter bean definitions. + +## KAN-70 / KAN-71 / KAN-72: validation + +Validated locally on 2026-11-02 with Java 25 (compiler target 21), Maven 3.9.15, +Node 24.22.1 and npm 12.2.1: + +- `mvn -q test`: 1,953 tests, zero failures/errors/skips across all six modules. +- `mvn -q -DskipTests package`: all modules package successfully. +- Web: `npx vitest run --maxWorkers=2`: 107 files, 736 tests passed; the separate + `node --test .github/scripts/jules-client.test.mjs` suite also passes. +- Web `npm run lint` exits 0 with repository warnings; `npm run build` succeeds + (TypeScript + Vite). The existing Lottie dependency emits an eval build warning. + +The new tests exercise all eight roles at real Spring HTTP boundaries in auth, +itinerary, activity and POS, including positive persistence and denied writes +without mutations. Auth integration uses real signed access/refresh JWTs and H2 +user state; domain cross-role tests mock only the remote identity verifier. The +remote verifier itself is covered against a loopback HTTP identity-service stub. +Existing domain tests use an explicit test-only authenticated fixture and keep +the production authorization filter active. + +Web tests cover deep links, menus, landing pages, read-only roster controls, +unknown roles, actual login payload/token contract and Bearer injection. A server +401 clears the staff session; 403 opens the denied page, even if a domain service +contains an offline/demo fallback. Demo staff accounts now require explicit +development opt-in and cannot be enabled in a production build. + +Review and staging sign-off remain for the team: PostgreSQL schema deployment, +reverse-proxy routing, TLS to the private auth service, and real browser sessions +for representative staff roles. GitHub CI and staging were not run from this +workspace. The three unrelated bugs listed after the RBAC story in the source +document are excluded from this change. + +### Review follow-up — 2026-11-03 + +The initial SonarCloud analysis reported 3.2% new-code duplication against a 3% +limit, caused by repeated remote RBAC bean wiring in itinerary, activity and POS. +That wiring now lives in the shared configurations described above. Configuration +context tests verify both local-verifier and remote-verifier imports, single filter +registration and role enforcement. The full backend `mvn -B verify` run and the +common-module verification pass; the combined suite contains 1,955 passing tests, +with zero failures, errors or skips. This is a follow-up review fix on KAN-66; +the six original KAN-67–72 task commits remain intact. + +After upstream PRs #142 and #143 were merged into `main`, the branch was merged +with `a8cdc62` and the `UserController` conflict was resolved by retaining upstream +role normalization together with KAN-66 request validation. The final full +`mvn -B verify` run passes all six modules: 1,961 tests, zero failures/errors/skips. diff --git a/docs/db/KAN-66-identity-audit.sql b/docs/db/KAN-66-identity-audit.sql new file mode 100644 index 00000000..43775468 --- /dev/null +++ b/docs/db/KAN-66-identity-audit.sql @@ -0,0 +1,13 @@ +-- Apply to the same database and search_path as the auth users table. +-- Existing development environments also create this entity via Hibernate ddl-auto=update. +BEGIN; +CREATE TABLE IF NOT EXISTS identity_audit_events ( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + occurred_at TIMESTAMP WITH TIME ZONE NOT NULL, + action VARCHAR(30) NOT NULL, + actor_user_id BIGINT, + target_username VARCHAR(50) NOT NULL, + target_role VARCHAR(30) NOT NULL +); +CREATE INDEX IF NOT EXISTS idx_identity_audit_occurred ON identity_audit_events(occurred_at); +COMMIT;