diff --git a/apiml/src/main/java/org/zowe/apiml/ZaasSchemeTransformApi.java b/apiml/src/main/java/org/zowe/apiml/ZaasSchemeTransformApi.java index f1f41df88a..0321d55738 100644 --- a/apiml/src/main/java/org/zowe/apiml/ZaasSchemeTransformApi.java +++ b/apiml/src/main/java/org/zowe/apiml/ZaasSchemeTransformApi.java @@ -124,8 +124,9 @@ private Mono> handleMissingOrInvalidAuth(OtelReques return createAuthorizationResponse((ErrorHeaders) response.getHeaders(), null); } - private Mono> handleMissingApplicationName(OtelRequestContext context) { + private Mono> handleMissingApplicationName(String serviceId, OtelRequestContext context) { context.authErrorType(ApplicationNameNotProvidedException.class.getName()); + log.warn("Service '{}' is missing APPLID set", serviceId); return createAuthorizationResponse(createErrorMessage("ApplicationName not provided."),null); } @@ -134,7 +135,7 @@ public Mono> passticket(RequestCredentials var applicationName = requestCredentials.getApplId(); var otelRequestContext = OtelRequestContext.of(exchange); if (StringUtils.isBlank(applicationName)) { - return handleMissingApplicationName(otelRequestContext); + return handleMissingApplicationName(requestCredentials.getServiceId(), otelRequestContext); } try { @@ -186,7 +187,7 @@ public Mono> safIdt(RequestCredentials var applicationName = requestCredentials.getApplId(); var otelRequestContext = OtelRequestContext.of(exchange); if (StringUtils.isBlank(applicationName)) { - return handleMissingApplicationName(otelRequestContext); + return handleMissingApplicationName(requestCredentials.getServiceId(), otelRequestContext); } try { diff --git a/common-service-core/src/main/java/org/zowe/apiml/passticket/PassTicketService.java b/common-service-core/src/main/java/org/zowe/apiml/passticket/PassTicketService.java index 80bfe3901f..617b6e9cc6 100644 --- a/common-service-core/src/main/java/org/zowe/apiml/passticket/PassTicketService.java +++ b/common-service-core/src/main/java/org/zowe/apiml/passticket/PassTicketService.java @@ -51,8 +51,11 @@ public synchronized void evaluate(String userId, String applId, String passTicke // IRRPassTicket is not thread-safe, must be synchronized public synchronized String generate(String userId, String applId) throws PassTicketException { try { + log.debug("Generating PassTicket for user: {} and ZOSMF applid: {}", userId, applId); validateUserIdAndApplId(userId, applId); - return irrPassTicket.generate(userId.toUpperCase(), applId.toUpperCase()); + var passTicket = irrPassTicket.generate(userId.toUpperCase(), applId.toUpperCase()); + log.debug("Generated PassTicket: {}", passTicket); + return passTicket; } catch (RuntimeException e) { log.debug("Error during pass ticket generation, userId={}, applid={}, exception={}", userId, applId, e); throw e; diff --git a/zaas-service/src/main/java/org/zowe/apiml/zaas/security/service/TokenCreationService.java b/zaas-service/src/main/java/org/zowe/apiml/zaas/security/service/TokenCreationService.java index 3bf2854aa3..5f843bb78c 100644 --- a/zaas-service/src/main/java/org/zowe/apiml/zaas/security/service/TokenCreationService.java +++ b/zaas-service/src/main/java/org/zowe/apiml/zaas/security/service/TokenCreationService.java @@ -103,10 +103,7 @@ private boolean isZosmfAvailable() { private String generatePassTicket(String user) { try { - log.debug("Generating PassTicket for user: {} and ZOSMF applid: {}", user, zosmfApplId); String passTicket = passTicketService.generate(user, zosmfApplId); - log.debug("Generated PassTicket: {}", passTicket); - return passTicket; } catch (IRRPassTicketGenerationException e) { throw new AuthenticationTokenException("Generation of PassTicket failed", e);