From 9e4656cb7305ba83c8272106fc071574c493e594 Mon Sep 17 00:00:00 2001 From: GeorgeC Date: Thu, 18 Jan 2024 05:31:50 -0500 Subject: [PATCH] Update JAXRSConfiguration with Okta IDP setup Added Okta Identity Provider (IDP) setup in JAXRSConfiguration.java, enabling SAML error messages to be logged correctly when fields are missing. Also, irrelevant Okta client secret --- .../dbmi/avillach/auth/JAXRSConfiguration.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/JAXRSConfiguration.java b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/JAXRSConfiguration.java index 730608010..829902867 100755 --- a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/JAXRSConfiguration.java +++ b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/JAXRSConfiguration.java @@ -45,8 +45,9 @@ public class JAXRSConfiguration extends Application { @Resource(mappedName = "java:global/client_id") public static String clientId; + @Resource(mappedName = "java:global/client_secret") - public static String clientSecret; + public static String clientSecret; // actually picsure_client_secret in standalone.xml @Resource(mappedName = "java:global/clientSecretIsBase64") public static String clientSecretIsBase64; @@ -102,8 +103,6 @@ public class JAXRSConfiguration extends Application { public static String fence_harmonized_consent_group_concept_path; public static String fence_topmed_consent_group_concept_path; public static String fence_allowed_query_types; - public static String oktaClientSecret; - public static String oktaClientId; public static String defaultAdminRoleName = "PIC-SURE Top Admin"; @@ -260,6 +259,19 @@ public void checkIDPProvider(Context ctx) { logger.error("checkIDPProvider() Invalid FENCE IDP Provider Setup. Mandatory fields are missing. " + "Check configuration in standalone.xml"); } + } else if (idp_provider.equalsIgnoreCase("okta")) { + try { + idp_provider_uri = (String) ctx.lookup("java:global/idp_provider_uri"); + clientSecret = (String) ctx.lookup("java:global/sp_client_secret"); + logger.debug("checkIDPProvider() idp provider OKTA is configured"); + } catch (Exception ex) { + logger.error("checkIDPProvider() " + ex.getMessage()); + logger.error("checkIDPProvider() Invalid OKTA IDP Provider Setup. Mandatory fields are missing. " + + "Check configuration in standalone.xml"); + } + } else { + logger.error("checkIDPProvider() Invalid IDP Provider Setup. Mandatory fields are missing. " + + "Check configuration in standalone.xml"); } logger.debug("checkIDPProvider() finished");