#87: Move EULA to welcome page and make configurable via EULA_HTML pr…

…operty.

.env.template

@@ -38,6 +38,6 @@
 # Spring boot application property reset.on.start, default value is true
 #RESET_ON_START=false
 
-# EULA filename (i.e. filename without .html suffix)
-#EULA_FILENAME=EULA
+# EULA html
+#EULA_HTML=<p>The Spyderisk software is open source, licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a></p>
 

docker-compose.yml

@@ -42,7 +42,7 @@ services:
       SPRING_DATA_MONGODB_HOST: mongo
       KEYCLOAK_CREDENTIALS_SECRET: ${KEYCLOAK_CREDENTIALS_SECRET:-DfkQBcVpjbO6gTMXMBUBfHe45UmFhGxk}
       RESET_ON_START: ${RESET_ON_START:-true}
-      EULA_FILENAME: ${EULA_FILENAME:-EULA}
+      EULA_HTML: ${EULA_HTML}
     volumes:
       # Persistent named volume for the jena-tdb storage
       - type: volume

src/main/java/uk/ac/soton/itinnovation/security/systemmodeller/auth/WebSecurityConfig.java

@@ -106,7 +106,6 @@ protected void configure(HttpSecurity http) throws Exception {
 
 			// permit anyone to access the following public pages
 			.antMatchers("/", "/welcome").permitAll()
-			.antMatchers("/", "/EULA").permitAll()
 
 			// Explicitly list all operations on models that can be performed unauthenticated.
 			// We need to explicitly restrict "/models" as "/models/**" also matches it.

src/main/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/MvcConfig.java

@@ -25,23 +25,18 @@
 
 package uk.ac.soton.itinnovation.security.systemmodeller.rest;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
 public class MvcConfig extends WebMvcConfigurerAdapter {
 
-	@Value("${eula.filename}")
-	private String eulaViewname;
-
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
 
 		registry.addViewController("/").setViewName("welcome");
 		registry.addViewController("/welcome").setViewName("welcome");
-		registry.addViewController("/EULA").setViewName(eulaViewname);
 		registry.addViewController("/dashboard").setViewName("dashboard");
 		registry.addViewController("/domain-manager").setViewName("domainManager");
 		registry.addViewController("/admin").setViewName("admin");

src/main/resources/application.properties

@@ -32,8 +32,8 @@ server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javasc
 # Compress the response only if the response size is at least 1KB
 server.compression.min-response-size=1024
 
-# EULA filename (i.e. without .html suffix)
-eula.filename=EULA
+# EULA html
+eula.html=<p>The Spyderisk software is open source, licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a></p>
 
 # File upload
 spring.servlet.multipart.max-file-size=100MB

src/main/resources/static/css/welcome.css

@@ -35,6 +35,14 @@ html, body {
     margin-top: 10px;
 }
 
+.welcome-page .eula-textbox {
+    border: 2px solid #000;
+    padding: 15px;
+    overflow-y: auto;
+    height: 200px;
+    width: 470px;
+}
+
 .footer {
     background-color: #000000;
     height: 50px;

src/main/resources/templates/welcome.html

@@ -20,7 +20,8 @@ <h1 class="text-center branding">SPYDE<b>RISK</b></h1>
             <a th:href="@{~/documentation}" class="btn btn-primary btn-large">View Documentation</a>
         </div>
         <div class="eula">
-            <a th:href="@{/EULA}" >End User License Agreement</a>
+            <h3 class="text-center">End User License Agreement</h3>
+            <div class="eula-textbox" th:utext="${@environment.getProperty('eula.html')}"></div>
         </div>
     </div>
     <div class="footer">