Ref #36652: update cleanhtml in templates

Author: LEDfan

src/main/java/eu/openanalytics/shinyproxy/controllers/AppController.java

@@ -36,6 +36,7 @@
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.PortMappingsKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.PublicPathKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValue;
+import eu.openanalytics.containerproxy.model.spec.ParameterDefinition;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
 import eu.openanalytics.containerproxy.service.AsyncProxyService;
 import eu.openanalytics.containerproxy.service.InvalidParametersException;
@@ -80,6 +81,7 @@
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -169,6 +171,11 @@ private ModelAndView app(ModelMap map, HttpServletRequest request, String appNam
             map.put("parameterValues", allowedParametersForUser.getValues());
             map.put("parameterDefaults", allowedParametersForUser.getDefaultValue());
             map.put("parameterDefinitions", spec.getParameters().getDefinitions());
+            Map<ParameterDefinition, String> cleanedAppParameterDescriptions = new HashMap<>();
+            for (ParameterDefinition parameterDefinition : spec.getParameters().getDefinitions()) {
+                cleanedAppParameterDescriptions.put(parameterDefinition, thymeleaf.cleanHtml(parameterDefinition.getDescription()));
+            }
+            map.put("cleanedAppParameterDescriptions", cleanedAppParameterDescriptions);
             map.put("parameterIds", spec.getParameters().getIds());
 
             if (spec.getParameters().getTemplate() != null) {

src/main/java/eu/openanalytics/shinyproxy/controllers/BaseController.java

@@ -185,7 +185,7 @@ protected void prepareMap(ModelMap map, HttpServletRequest request, ProxySpec pr
         map.put("pauseSupported", backend.supportsPause());
         map.put("spInstance", identifierService.instanceId);
         map.put("allowTransferApp", allowTransferApp);
-        map.put("notificationMessage", environment.getProperty("proxy.notification-message"));
+        map.put("notificationMessage", thymeleaf.cleanHtml(environment.getProperty("proxy.notification-message")));
         map.put("bodyClasses", bodyClasses);
 
         List<ProxySpec> apps = proxyService.getUserSpecs();

src/main/java/eu/openanalytics/shinyproxy/controllers/IndexController.java

@@ -99,12 +99,15 @@ private Object index(ModelMap map, HttpServletRequest request) {
 
         Map<ProxySpec, Boolean> openSwitchInstanceInsteadOfApp = new HashMap<>();
         Map<ProxySpec, String> appUrl = new HashMap<>();
+        Map<ProxySpec, String> cleanDescription = new HashMap<>();
         for (ProxySpec app : apps) {
             openSwitchInstanceInsteadOfApp.put(app, thymeleaf.openSwitchInstanceInsteadOfApp(app));
             appUrl.put(app, thymeleaf.getAppUrl(app));
+            cleanDescription.put(app, thymeleaf.cleanHtml(app.getDescription()));
         }
         map.put("openSwitchInstanceInsteadOfApp", openSwitchInstanceInsteadOfApp);
         map.put("appUrl", appUrl);
+        map.put("cleanDescription", cleanDescription);
 
         // navbar
         map.put("page", "index");

src/main/resources/templates/app.html

@@ -154,7 +154,7 @@ <h2>Choose the parameters for this app</h2>
                                             th:text="${value}"></option>
                                 </select>
                                 <span class="help-block" th:if="${parameterDefinition.getDescription() != null}"
-                                      th:utext="${@thymeleaf.cleanHtml(parameterDefinition.getDescription())}"></span>
+                                      th:utext="${cleanedAppParameterDescriptions.get(parameterDefinition)}"></span>
                             </div>
                         </div>
 

src/main/resources/templates/index.html

@@ -63,7 +63,7 @@
                         </th:block>
                         <span class="app-list-title app-list-title-after" th:text="${app.displayName == null} ? ${app.id} : ${app.displayName}"></span>
                     </a>
-                    <span class="app-list-description" th:if="${app.description != null}" th:utext="${@thymeleaf.cleanHtml(app.description)}"></span>
+                    <span class="app-list-description" th:if="${app.description != null}" th:utext="${cleanDescription.get(app)}"></span>
                 </div>
             </th:block>
         </th:block>
@@ -75,7 +75,7 @@
                      th:class="${myAppsMode == 'Inline' ? 'col-xs-12 col-md-4 col-md-offset-3 col-lg-5 col-lg-offset-3' : 'col-lg-6 col-lg-offset-3'}">
                     <div class="alert alert-warning notification-message" role="alert" th:if="${notificationMessage != null}">
                         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <p th:utext="${@thymeleaf.cleanHtml(notificationMessage)}"> </p>
+                        <p th:utext="${notificationMessage}"> </p>
                     </div>
                     <div class="alert alert-info" role="alert"
                          th:if="${groupedApps.isEmpty() && ungroupedApps.isEmpty()}">