Use application name property in startup template

LEDfan · LEDfan · commit 4b780a460265 · 2021-07-07T10:12:06.000+02:00
diff --git a/src/main/java/eu/openanalytics/containerproxy/util/AppRecoveryFilter.java b/src/main/java/eu/openanalytics/containerproxy/util/AppRecoveryFilter.java
@@ -20,9 +20,9 @@
  */
 package eu.openanalytics.containerproxy.util;
 
-import com.google.common.io.ByteStreams;
 import eu.openanalytics.containerproxy.service.AppRecoveryService;
 import org.apache.commons.io.IOUtils;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.GenericFilterBean;
 
@@ -35,6 +35,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 /**
  * While the recovery is happening, the application may not be used.
@@ -46,6 +47,11 @@ public class AppRecoveryFilter extends GenericFilterBean {
     @Inject
     public AppRecoveryService appRecoveryService;
 
+    @Inject
+    public Environment environment;
+
+    private String renderedTemplate;
+
     @Override
     public void doFilter(
             ServletRequest request,
@@ -69,11 +75,29 @@ public void doFilter(
         }
 
         // ... generate a 503
-        HttpServletResponse httpResponse = (HttpServletResponse) response;
+        renderTemplate((HttpServletResponse) response);
+    }
+
+    private void renderTemplate(HttpServletResponse httpResponse ) throws IOException {
+        if (renderedTemplate == null) {
+            InputStream template = this.getClass().getResourceAsStream("/templates/startup.html");
+            if (template == null) {
+                throw new IllegalStateException("Startup template should be available");
+            }
+
+            String applicationName = environment.getProperty("spring.application.name");
+            if (applicationName == null) {
+                throw new IllegalStateException("Application name should be available"); // we provide a default so this should not happen
+            }
+
+            renderedTemplate = IOUtils.toString(template, StandardCharsets.UTF_8.name());
+            renderedTemplate = renderedTemplate.replace("${application_name}", applicationName);
+        }
+
         httpResponse.setStatus(503);
         httpResponse.setContentType("text/html");
-        InputStream template = this.getClass().getResourceAsStream("/templates/startup.html");
-        IOUtils.copy(template, httpResponse.getOutputStream());
+
+        IOUtils.write(renderedTemplate, httpResponse.getOutputStream(), StandardCharsets.UTF_8.name());
     }
 
 }
diff --git a/src/main/resources/templates/auth-error.html b/src/main/resources/templates/auth-error.html
@@ -38,7 +38,7 @@
 	<div class="container">
 		<h2>An error occurred during the authentication procedure.</h2>
 		<p><b>If you are a user of <span th:text="${application_name}"></span>:</b> please report this issue to your administrator and try to log out from your Identity Provider.</p>
-		<p><b>If you are an administrator of <span th:text="${application_name}"></span>:</b> this error page is typically shown because of an configuration error in the authentication setup. See the ShinyProxy logs for more information.</p>
+		<p><b>If you are an administrator of <span th:text="${application_name}"></span>:</b> this error page is typically shown because of an configuration error in the authentication setup. See the logs for more information.</p>
 	</div>
 
 <style>
diff --git a/src/main/resources/templates/startup.html b/src/main/resources/templates/startup.html
@@ -23,12 +23,12 @@
 <!DOCTYPE html>
 <html>
 <head lang="en">
-    <title>ShinyProxy</title>
+    <title>${application_name}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
 <div class="container">
-    <h2>ShinyProxy is starting up, check back in a few seconds.</h2>
+    <h2>${application_name} is starting up, check back in a few seconds.</h2>
 </div>
 
 <style>
