fix zosmf mock service support for ltpa tokens in auth header

Signed-off-by: Richard Salac <[email protected]>
zowe · Feb 21, 2025 · f831f7a · f831f7a
1 parent bd70161
commit f831f7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...ts/src/test/java/org/zowe/apiml/integration/authentication/pat/PATWithAllSchemesTest.java b/...ts/src/test/java/org/zowe/apiml/integration/authentication/pat/PATWithAllSchemesTest.java
@@ -62,7 +62,7 @@ static Stream<Arguments> schemas() {
         var schemasTest = new ArrayList<Arguments>();
         schemasTest.add(Arguments.of("zowejwt", HttpRequestUtils.getUriFromGateway(ZOWE_JWT_REQUEST), (Consumer<Response>) r -> {
             assertEquals(HttpStatus.SC_OK, r.getStatusCode());
-            assertNull(r.getBody().path("headers.authorization"));
+            assertNotNull(r.getBody().path("headers.authorization"));
             assertThat(r.getBody().path("headers.cookie"), containsString(COOKIE_NAME));
             String jwt = r.getBody().path("headers.cookie").toString();
             try {

diff --git a/...ests/src/test/java/org/zowe/apiml/integration/authentication/schemes/GatewayAuthTest.java b/...ests/src/test/java/org/zowe/apiml/integration/authentication/schemes/GatewayAuthTest.java
@@ -49,12 +49,12 @@ static Stream<Arguments> validToBeTransformed() {
         List<Arguments> arguments = new ArrayList<>(Arrays.asList(
             Arguments.of("Zowe auth scheme", ZOWE_JWT_REQUEST, (Consumer<Response>) response -> {
                 assertNotNull(response.jsonPath().getString("cookies.apimlAuthenticationToken"), "Expected not null apimlAuthenticationToken. Response was: " + response.asPrettyString());
-                assertNull(response.jsonPath().getString("headers.authorization"), "Expected null Authorization header. Response was: " + response.asPrettyString());
+                assertNotNull(response.jsonPath().getString("headers.authorization"), "Expected not null Authorization header. Response was: " + response.asPrettyString());
                 assertTrue(CollectionUtils.isEmpty(response.jsonPath().getList("certs")), "Expected empty certs list. Response was: " + response.asPrettyString());
             }),
             Arguments.of("z/OSMF auth scheme", ZOSMF_REQUEST, (Consumer<Response>) response -> {
                 assertNotNull(response.jsonPath().getString("cookies.jwtToken"), "Expected not null jwtToken cookie. Response was: " + response.asPrettyString());
-                assertNull(response.jsonPath().getString("headers.authorization"), "Expected null Authorization header. Response was: " + response.asPrettyString());
+                assertNotNull(response.jsonPath().getString("headers.authorization"), "Expected not null Authorization header. Response was: " + response.asPrettyString());
                 assertTrue(CollectionUtils.isEmpty(response.jsonPath().getList("certs")), "Expected empty certs list. Response was: " + response.asPrettyString());
             }),
             Arguments.of("PassTicket auth scheme", REQUEST_INFO_ENDPOINT, (Consumer<Response>) response -> {

diff --git a/mock-services/src/main/java/org/zowe/apiml/client/services/apars/PHBase.java b/mock-services/src/main/java/org/zowe/apiml/client/services/apars/PHBase.java
@@ -70,7 +70,7 @@ protected ResponseEntity<?> handleFiles(Map<String, String> headers) {
         String authorization = headers.get(AUTHORIZATION_HEADER);
 
         if (authorization != null) {
-            if (!isValidAuthHeader(authorization)) {
+            if (!isValidAuthHeader(authorization) && !ltpaIsPresent(headers)) {
                 return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
             }
         } else {