Merge pull request #102 from nbaars/master

i8n highlighting #96

README.MD

@@ -154,4 +154,10 @@ Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and hap
 ## Reloading plugins
 
 If you want to reload all the plugin visit the following url: `http://localhost:8080/WebGoat/service/reloadplugins.mvc`
-in a new browser tab. After reloading a message will appear and you can refresh the WebGoat browser tab.
+in a new browser tab. After reloading a message will appear and you can refresh the WebGoat browser tab.
+
+## Debugging label properties
+
+To be able to see which labels are loaded through a property file you first need to visit the following url:
+`http://localhost:8080/WebGoat/service/debug/labels.mvc` in a new browser tab. Switch back to the WebGoat page and
+reload this page. After this labels which load label from the property file will marked green.

webgoat-container/pom.xml

@@ -345,6 +345,11 @@
             <artifactId>spring-core</artifactId>
             <version>${org.springframework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
 
         <!-- Jackson -->
         <dependency>

webgoat-container/src/main/java/org/owasp/webgoat/service/LabelDebugService.java

@@ -0,0 +1,67 @@
+/**
+ * *************************************************************************************************
+ *
+ *
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ *
+ * Copyright (c) 2002 - 20014 Bruce Mayhew
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Getting Source ==============
+ *
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ *
+ * For details, please see http://webgoat.github.io
+ */
+package org.owasp.webgoat.service;
+
+import org.owasp.webgoat.session.LabelDebugger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * <p>PluginReloadService class.</p>
+ *
+ * @author nbaars
+ * @version $Id: $Id
+ */
+@Controller
+public class LabelDebugService extends BaseService {
+
+    private static final Logger logger = LoggerFactory.getLogger(LabelDebugService.class);
+
+    @Autowired
+    private LabelDebugger labelDebugger;
+
+    /**
+     * Reload all the plugins
+     */
+    @RequestMapping(value = "/debug/labels.mvc")
+    public @ResponseBody
+    //todo parse params to add enable / disable
+    ResponseEntity<String> reloadPlugins() {
+        labelDebugger.enable();
+        return new ResponseEntity("Label debugger enabled refresh the WebGoat page!",HttpStatus.OK);
+    }
+}

webgoat-container/src/main/java/org/owasp/webgoat/session/LabelDebugger.java

@@ -0,0 +1,17 @@
+package org.owasp.webgoat.session;
+
+/**
+ */
+public class LabelDebugger {
+
+    private boolean isEnabled = false;
+
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+
+    public void enable() {
+        this.isEnabled = true;
+    }
+
+}

webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManagerImpl.java

@@ -1,6 +1,7 @@
 
 package org.owasp.webgoat.util;
 
+import org.owasp.webgoat.session.LabelDebugger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -45,6 +46,8 @@ public class LabelManagerImpl implements LabelManager, Serializable
 
 	@Autowired
 	private transient LabelProvider labelProvider;
+	@Autowired
+	private transient LabelDebugger labelDebugger;
 
 	/** Locale mapped with current session. */
 	private Locale locale = new Locale(LabelProvider.DEFAULT_LANGUAGE);
@@ -75,7 +78,11 @@ public class LabelManagerImpl implements LabelManager, Serializable
 	/** {@inheritDoc} */
 	public String get(String labelKey)
 	{
-		return labelProvider.get(locale, labelKey);
+		String label = labelProvider.get(locale, labelKey);
+		if (labelDebugger.isEnabled()) {
+			label = "<font color=\"#00CD00\">" + label + "</font>";
+		}
+		return label;
 	}
 
 }

webgoat-container/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml

@@ -4,12 +4,16 @@
        xmlns:p="http://www.springframework.org/schema/p" 
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:aop="http://www.springframework.org/schema/aop"
        xsi:schemaLocation="http://www.springframework.org/schema/beans 
 	   		http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 	   		http://www.springframework.org/schema/context
 	   		http://www.springframework.org/schema/context/spring-context-3.2.xsd
 			http://www.springframework.org/schema/mvc 
-			http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+			http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+            http://www.springframework.org/schema/aop
+            http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+
 
     <context:component-scan base-package="org.owasp.webgoat" />
 	
@@ -38,7 +42,12 @@
         p:prefix="/WEB-INF/pages/" 
         p:suffix=".jsp" 
         p:order="1"/>
-        
+
+    <bean id="labelDebugger" class="org.owasp.webgoat.session.LabelDebugger" scope="session">
+        <aop:scoped-proxy/>
+    </bean>
+
+
     <mvc:interceptors>
         <bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
             <property name="cacheSeconds" value="0" />