make Web content loadable from configuration directory

3 files changed, 84 insertions, 0 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
new file mode 100644
index 00000000..9367c69f
--- /dev/null
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.asitplus.eidas.specific.connector.config;
+
+import java.net.MalformedURLException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
+
+/**
+ * @author tlenz
+ *
+ */
+@Configuration
+@EnableWebMvc
+public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
+	private static final Logger log = LoggerFactory.getLogger(StaticResourceConfiguration.class);
+	private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
+			"/"
+		};
+	
+	@Autowired private IConfiguration basicConfig;
+	
+
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_STATIC_PATH);
+		try {
+			if (StringUtils.isNotEmpty(staticResources)) {
+				String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory());
+				if (!absPath.endsWith("/"))
+					absPath += "/";
+					
+				registry.addResourceHandler("/static/**").addResourceLocations(absPath);
+				log.info("Add Ressourcefolder: " + absPath + " for static Web content");
+				
+			} else
+				log.debug("No Ressourcefolder for static Web content");
+				
+		} catch (MalformedURLException e) {
+			log.warn("Can NOT initialize ressourcefolder for static Web content", e);
+			
+		}
+		
+		registry.addResourceHandler("/**").addResourceLocations(CLASSPATH_RESOURCE_LOCATIONS);
+		
+	    
+	}
+}
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 8756c55f..01be5ab7 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -15,6 +15,9 @@
 	<mvc:annotation-driven />	
 	<mvc:default-servlet-handler/> 
 	
+	<bean id="WebResourceConfiguration" 
+			class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
+	
 	<bean id="ProcessEngineSignalController"
 			class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
 				
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
index e49d70bf..4e027307 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
@@ -36,6 +36,8 @@ public class MSeIDASNodeConstants {
 	public static final String PROP_CONFIG_APPLICATION_PUBLIC_URL_REQUEST_VALIDATION =  "context.url.request.validation";
 	public static final String PROP_CONFIG_REVISIONLOG_LOG_IP_ADDRESS_OF_USER = "revisionlog.logIPAddressOfUser";
 	
+	public static final String PROP_CONFIG_WEBCONTENT_STATIC_PATH = "webcontent.static.directory"; 
+	
 	private static final String PROP_CONFIG_PVP2_PREFIX =  "pvp2.";
 	public static final String PROP_CONFIG_PVP2_KEYSTORE_PATH = PROP_CONFIG_PVP2_PREFIX + "keystore.path"; 
 	public static final String PROP_CONFIG_PVP2_KEYSTORE_PASSWORD = PROP_CONFIG_PVP2_PREFIX + "keystore.password";