X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FCaasIngressConfiguration.java;h=21dd91bebec5bb5f895c0f426fb3987fb1be67c9;hb=b5eafe03989e7c5dc0b96cab1288ccd06181f8a2;hp=397a5dc87fad62a8d3fa05cd64f21cd94a8d41dd;hpb=2dc8cbacf7ea48854c63f35b2d5a861da16b0cf6;p=portal%2Fric-dashboard.git diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/CaasIngressConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/CaasIngressConfiguration.java index 397a5dc8..21dd91be 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/CaasIngressConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/CaasIngressConfiguration.java @@ -50,20 +50,21 @@ public class CaasIngressConfiguration { @Autowired public CaasIngressConfiguration( // - @Value("${caasingress.insecure}") final Boolean insecureFlag, // @Value("${caasingress.aux.url.prefix}") final String auxUrlPrefix, // @Value("${caasingress.aux.url.suffix}") final String auxUrlSuffix, // @Value("${caasingress.plt.url.prefix}") final String pltUrlPrefix, - @Value("${caasingress.plt.url.suffix}") final String pltUrlSuffix) + @Value("${caasingress.plt.url.suffix}") final String pltUrlSuffix, + @Value("${caasingress.insecure}") final Boolean insecureFlag) // throws KeyManagementException, NoSuchAlgorithmException { logger.debug("ctor caasingress aux prefix '{}' suffix '{}'", auxUrlPrefix, auxUrlSuffix); logger.debug("ctor caasingress plt prefix '{}' suffix '{}'", pltUrlPrefix, pltUrlSuffix); + logger.debug("ctor caasingress insecure flag {}", insecureFlag); caasIngressAuxUrl = new DefaultUriBuilderFactory(auxUrlPrefix.trim()).builder().path(auxUrlSuffix.trim()) .build().normalize().toString(); caasIngressPltUrl = new DefaultUriBuilderFactory(pltUrlPrefix.trim()).builder().path(pltUrlSuffix.trim()) .build().normalize().toString(); logger.info("Configuring CAAS-Ingress URLs: aux {}, plt {}", caasIngressAuxUrl, caasIngressPltUrl); - if (insecureFlag) { + if (insecureFlag != null && insecureFlag) { logger.warn("ctor: insecure flag set, disabling SSL checks"); HttpsURLConnectionUtils.turnOffSslChecking(); }