Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -rb935721d25817b83c29d3166a7fa9b4b9b7d3785 -r1beaa4cc5e224dd433297d543c5511234c0bfc10
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision b935721d25817b83c29d3166a7fa9b4b9b7d3785)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 1beaa4cc5e224dd433297d543c5511234c0bfc10)
@@ -43,6 +43,10 @@
 			org.lamsfoundation.lams.web.filter.LocaleFilter
 		</filter-class>
 	</filter>
+	<filter>
+		<filter-name>CSRFGuard</filter-name>
+		<filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
+	</filter>
 
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
@@ -56,6 +60,10 @@
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
+	<filter-mapping>
+		<filter-name>CSRFGuard</filter-name> 
+		<url-pattern>*.do</url-pattern>
+	</filter-mapping>
 
 	<listener>
 		<listener-class>
@@ -168,6 +176,13 @@
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
 		</taglib>
+		<!-- ======================================================== -->
+		<!-- CSRF Guard Tag Library -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>csrfguard</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
+		</taglib>
 
 	</jsp-config>