From 439e16586f6a1b05a892cada09e7b48cb322878c Mon Sep 17 00:00:00 2001 From: rv871f Date: Thu, 29 Mar 2018 11:38:04 -0400 Subject: [PATCH] Portal Login Filter reintegration Issue-ID: AAI-599 Change-Id: I119608a418a07546cd58d4fcbdf93f033c8fbd88 Signed-off-by: rv871f --- sparkybe-onap-application/pom.xml | 159 +++++++++------------ .../main/java/org/onap/aai/sparky/Application.java | 44 +++--- .../src/main/scripts/start.sh | 3 +- .../aai/sparky/config/SparkyResourceLoader.java | 36 ++--- 4 files changed, 109 insertions(+), 133 deletions(-) diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index 92c3126..ec40b53 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -1,5 +1,6 @@ - - 4.0.0 + + 4.0.0 org.springframework.boot @@ -8,9 +9,9 @@ org.onap.aai.sparky-be - sparkybe-onap-application + sparkybe-onap-application 1.2.0-SNAPSHOT - jar + jar 1.8 @@ -29,26 +30,26 @@ - + + + + + org.apache.camel + camel-spring-boot-dependencies + ${camel-spring-boot.version} + pom + import + - - - org.apache.camel - camel-spring-boot-dependencies - ${camel-spring-boot.version} - pom - import - - - - ch.qos.logback - logback-classic - 1.2.1 - + + ch.qos.logback + logback-classic + 1.2.1 + - + - + @@ -73,14 +74,14 @@ - + org.springframework.boot spring-boot-starter-logging - ch.qos.logback - logback-classic + ch.qos.logback + logback-classic @@ -125,7 +126,7 @@ commons-io commons-io - + @@ -144,11 +145,11 @@ spring-boot-starter-actuator - - org.onap.aai.sparky-be - sparkybe-onap-service - 1.2.0-SNAPSHOT - + + org.onap.aai.sparky-be + sparkybe-onap-service + 1.2.0-SNAPSHOT + @@ -378,6 +379,13 @@ org.springframework.boot spring-boot-maven-plugin + + + + ${CONFIG_HOME}/portal/ + + + org.apache.maven.plugins @@ -486,38 +494,14 @@ - - + + com.spotify docker-maven-plugin @@ -534,41 +518,26 @@ - + - - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - - + + + ecomp-releases + ECOMP Release Repository + ${nexusproxy}/content/repositories/releases/ + + + ecomp-snapshots + ECOMP Snapshot Repository + ${nexusproxy}/content/repositories/snapshots/ + + + diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java index 693617b..1077642 100644 --- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java +++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java @@ -20,25 +20,30 @@ */ package org.onap.aai.sparky; +import javax.servlet.Filter; + +import org.onap.aai.sparky.security.filter.LoginFilter; + import org.apache.camel.component.servlet.CamelHttpTransportServlet; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; @SpringBootApplication public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); + private Filter loginFilter = new LoginFilter(); + public static void main(String[] args) { + SpringApplication.run(Application.class, args); } - + /* * This initialization code enabled access to aai-ui-proxy-processor */ - @Bean ServletRegistrationBean servletRegistrationBean() { final ServletRegistrationBean servlet = @@ -48,20 +53,19 @@ public class Application { } /** - * bind LoginFilter + * bind LoginFilter */ - - /*@Bean - public FilterRegistrationBean myFilter() { - FilterRegistrationBean registration = new FilterRegistrationBean(); - Filter myFilter = new LoginFilter(); - beanFactory.autowireBean(myFilter); - registration.setFilter(myFilter); - registration.addUrlPatterns("/*"); - return registration; - }*/ - - - - + @Bean + @ConditionalOnProperty(value = "sparky.portal.enabled", havingValue = "true") + public FilterRegistrationBean loginFilterRegistrationBean() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + + registration.setFilter(loginFilter); + registration.addUrlPatterns("/*"); + + return registration; + } + + + } diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh index 0db0d37..f2f6f31 100644 --- a/sparkybe-onap-application/src/main/scripts/start.sh +++ b/sparkybe-onap-application/src/main/scripts/start.sh @@ -6,5 +6,6 @@ CONFIG_HOME=${APP_HOME}/appconfig PROPS="-DAPP_HOME=${APP_HOME} -DCONFIG_HOME=${CONFIG_HOME}" set -x -java -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar --sparky.ssl.enabled=${UI_SSL_ENABLED} +jar ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/portal.properties +java -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar --sparky.ssl.enabled=${UI_SSL_ENABLED} --sparky.portal.enabled=${UI_PORTAL_ENABLED} diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/SparkyResourceLoader.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/SparkyResourceLoader.java index 8d99221..6bb0c45 100644 --- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/SparkyResourceLoader.java +++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/config/SparkyResourceLoader.java @@ -30,8 +30,8 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; public class SparkyResourceLoader implements ResourceLoaderAware { - - + + private static final String FILE_URI = "file:"; private ResourceLoader resourceLoader; private String configHomeEnvVar; @@ -42,7 +42,7 @@ public class SparkyResourceLoader implements ResourceLoaderAware { public void setResourceLoader(ResourceLoader resourceLoader) { this.resourceLoader = resourceLoader; } - + public String getFullFileUri(String uriFilePath) { return FILE_URI + System.getProperty(configHomeEnvVar) + uriFilePath; } @@ -50,38 +50,40 @@ public class SparkyResourceLoader implements ResourceLoaderAware { public String getAbsolutePath(String uriFilePath) { return System.getProperty(configHomeEnvVar) + uriFilePath; } - + protected Resource getResource(String uriFilePath, boolean isRelative) { String fileUri = uriFilePath; - if (!uriFilePath.startsWith("file:")) { - fileUri = "file:" + uriFilePath; - } + if (!uriFilePath.startsWith(FILE_URI)) { + + if (isRelative) { + fileUri = getFullFileUri(fileUri); + } else { + fileUri = FILE_URI + uriFilePath; + } - if (isRelative) { - return resourceLoader.getResource(getFullFileUri(fileUri)); - } else { - return resourceLoader.getResource(fileUri); } + return resourceLoader.getResource(fileUri); + } public File getResourceAsFile(String uriFilePath, boolean isRelativePath) throws IOException { - - Resource resource = getResource(uriFilePath, isRelativePath); + + Resource resource = getResource(uriFilePath, isRelativePath); if (resource.exists()) { return resource.getFile(); } return null; - + } public byte[] getResourceAsBytes(String uriFilePath, boolean isRelativePath) throws IOException { - Resource resource = getResource(uriFilePath, isRelativePath); + Resource resource = getResource(uriFilePath, isRelativePath); if (resource.exists()) { return getResourceAsBytes(resource); @@ -89,10 +91,10 @@ public class SparkyResourceLoader implements ResourceLoaderAware { return null; } - + public byte[] getResourceAsBytes(Resource resource) throws IOException { - if ( resource != null && resource.exists()) { + if (resource != null && resource.exists()) { return Files.readAllBytes(Paths.get(resource.getFile().getAbsolutePath())); } -- 2.16.6