Fix review remarks + show configurable application name inside auth-error

LEDfan · LEDfan · commit 7b815f069487 · 2020-12-15T16:23:16.000+01:00
diff --git a/src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java b/src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java
@@ -155,6 +155,8 @@ private static void setDefaultProperties(SpringApplication app ) {
 		
 		// disable logging of requests, since this reads part of the requests and therefore undertow is unable to correctly handle those requests
 		properties.put("logging.level.org.springframework.web.servlet.DispatcherServlet", "INFO");
+		
+		properties.put("spring.application.name", "ContainerProxy");
 		app.setDefaultProperties(properties);
 	}
 	
diff --git a/src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java
@@ -114,7 +114,7 @@ public void configureHttpSecurity(HttpSecurity http, AuthorizedUrl anyRequestCon
 					@Override
 					public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
 							AuthenticationException exception) throws IOException, ServletException {
-						exception.printStackTrace();
+						log.error(exception);
 						response.sendRedirect("/auth-error");
 					}
 					
diff --git a/src/main/java/eu/openanalytics/containerproxy/ui/AuthErrorController.java b/src/main/java/eu/openanalytics/containerproxy/ui/AuthErrorController.java
@@ -20,8 +20,10 @@
  */
 package eu.openanalytics.containerproxy.ui;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,9 +34,13 @@
 @Controller
 public class AuthErrorController extends BaseController {
 
+	@Inject
+	private Environment environment;
+
 	@RequestMapping(value = "/auth-error", method = RequestMethod.GET)
-    public String getLoginPage(ModelMap map, HttpServletRequest request) {
+	public String getAuthErrorPage(ModelMap map, HttpServletRequest request) {
+		map.put("application_name", environment.getProperty("spring.application.name"));
 		return "auth-error";
-    }
+	}
 
 }
diff --git a/src/main/resources/templates/auth-error.html b/src/main/resources/templates/auth-error.html
@@ -39,8 +39,8 @@
 <body>
 	<div class="container">
 		<h2>An error occurred during the authentication procedure.</h2>
-		<p><b>If you are a user of ShinyProxy:</b> please report this issue to your administrator.</p>
-		<p><b>If you are an administrator of ShinyProxy:</b> this error page is typically shown because of an configuration error in the OpenID setup. See the ShinyProxy logs for more information.</p>
+		<p><b>If you are a user of <span th:text="${application_name}"></span>:</b> please report this issue to your administrator.</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 OpenID setup. See the ShinyProxy logs for more information.</p>
 	</div>
 
 <style>

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ private static void setDefaultProperties(SpringApplication app ) {`
`155`	`155`
`156`	`156`	`// disable logging of requests, since this reads part of the requests and therefore undertow is unable to correctly handle those requests`
`157`	`157`	`properties.put("logging.level.org.springframework.web.servlet.DispatcherServlet", "INFO");`
	`158`	`+`
	`159`	`+ properties.put("spring.application.name", "ContainerProxy");`
`158`	`160`	`app.setDefaultProperties(properties);`
`159`	`161`	`}`
`160`	`162`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public void configureHttpSecurity(HttpSecurity http, AuthorizedUrl anyRequestCon`
`114`	`114`	`@Override`
`115`	`115`	`public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,`
`116`	`116`	`AuthenticationException exception) throws IOException, ServletException {`
`117`		`- exception.printStackTrace();`
	`117`	`+ log.error(exception);`
`118`	`118`	`response.sendRedirect("/auth-error");`
`119`	`119`	`}`
`120`	`120`