From 92717efaa56e3d0f7c271b91483507cf981b417b Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 16 Jan 2015 10:19:44 +0100
Subject: Add minor fixes and updates.

- Fix moa-id-auth web.xml and upgrade to servlet 3.0.
- Reformat loginFormFull.html in order to enhance readability.
- Add some TODOs and FIXMEs.
- Adding some comments to DispatcherServlet in order to ease understanding the process.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 71 ++++++++++++++++----------
 1 file changed, 44 insertions(+), 27 deletions(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 42085b01e..fb3888a3e 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 	<display-name>MOA ID Auth</display-name>
 	<description>MOA ID Authentication Service</description>
+
+	<!-- bootstrap loader for spring framework -->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!-- exposes request and response to the current thread -->
+	<filter>
+		<filter-name>requestContextFilter</filter-name>
+		<filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>requestContextFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
 <!-- 	<servlet>
 		<servlet-name>SelectBKU</servlet-name>
 		<display-name>SelectBKU</display-name>
@@ -10,63 +27,63 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SelectBKUServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>GenerateIframeTemplate</servlet-name>
-		<display-name>GenerateIframeTemplate</display-name>
 		<description>Generate BKU Request template</description>
+		<display-name>GenerateIframeTemplate</display-name>
+		<servlet-name>GenerateIframeTemplate</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>RedirectServlet</servlet-name>
 		<display-name>RedirectServlet</display-name>
+		<servlet-name>RedirectServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.RedirectServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>MonitoringServlet</servlet-name>
 		<display-name>MonitoringServlet</display-name>
+		<servlet-name>MonitoringServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>SSOSendAssertionServlet</servlet-name>
 		<display-name>SSOSendAssertionServlet</display-name>
+		<servlet-name>SSOSendAssertionServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet</servlet-class>
 	</servlet>	
 	<servlet>
-		<servlet-name>LogOut</servlet-name>
-		<display-name>LogOut</display-name>
 		<description>SSO LogOut</description>
+		<display-name>LogOut</display-name>
+		<servlet-name>LogOut</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.LogOutServlet</servlet-class>
 	</servlet>
 	
 	<servlet>
-		<servlet-name>IDPSLO</servlet-name>
-		<display-name>IDP-SLO</display-name>
 		<description>IDP Single LogOut Service</description>
+		<display-name>IDP-SLO</display-name>
+		<servlet-name>IDPSLO</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet</servlet-class>
 	</servlet>
 	
 	<servlet>
-		<servlet-name>VerifyIdentityLink</servlet-name>
-		<display-name>VerifyIdentityLink</display-name>
 		<description>Verify identity link coming from security layer</description>
+		<display-name>VerifyIdentityLink</display-name>
+		<servlet-name>VerifyIdentityLink</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>VerifyCertificate</servlet-name>
-		<display-name>VerifyCertificate</display-name>
 		<description>Verify the certificate coming from security layer</description>
+		<display-name>VerifyCertificate</display-name>
+		<servlet-name>VerifyCertificate</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>GetMISSessionID</servlet-name>
-		<display-name>GetMISSessionID</display-name>
 		<description>Get the MIS session ID coming from security layer</description>
+		<display-name>GetMISSessionID</display-name>
+		<servlet-name>GetMISSessionID</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet</servlet-class>
 	</servlet>
 
 	<servlet>
-		<servlet-name>GetForeignID</servlet-name>
-		<display-name>GetForeignID</display-name>
 		<description>Gets the foreign eID from security layer</description>
+		<display-name>GetForeignID</display-name>
+		<servlet-name>GetForeignID</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
 	</servlet>
 <!-- 	<servlet>
@@ -76,9 +93,9 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessValidatorInputServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		<display-name>VerifyAuthBlock</display-name>
 		<description>Verify AUTH block coming from security layer</description>
+		<display-name>VerifyAuthBlock</display-name>
+		<servlet-name>VerifyAuthBlock</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class>
 	</servlet>
 <!-- 	<servlet>
@@ -89,8 +106,8 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>AxisServlet</servlet-name>
 		<display-name>Apache-Axis Servlet</display-name>
+		<servlet-name>AxisServlet</servlet-name>
 		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
 	</servlet>
 
@@ -100,18 +117,18 @@
 		<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
 	</servlet> -->
 	<servlet>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<display-name>PEPSConnectorServlet</display-name>
 		<description>Servlet receiving STORK SAML Response Messages from
 			different C-PEPS</description>
+		<display-name>PEPSConnectorServlet</display-name>
+		<servlet-name>PEPSConnectorServlet</servlet-name>
 		<servlet-class>
 			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
 		<description>Servlet receiving STORK SAML Response Messages from
 			different C-PEPS</description>
+		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
+		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
 		<servlet-class>
 			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
 	</servlet>
@@ -124,8 +141,8 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>-->
 	<servlet>
-		<servlet-name>DispatcherServlet</servlet-name>
 		<display-name>Dispatcher Servlet</display-name>
+		<servlet-name>DispatcherServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-- 
cgit v1.2.3


From a1bb34634bf4f30fc565109358eb51bd1111dc21 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 21 Jan 2015 08:50:58 +0100
Subject: Add "DefaultAuthentication" process (AT, no mandates, no stork)
 (MOAID-59).

- Fix oa web.xml, switch to servlet 3.0.
- moa-id-auth web.xml
-- Add CharacterEncodingFilter for UTF-8 encoding.
-- Add ProcessEngineSignalServlet.
- Fix invalid template_*.html.
- Add TODO[branch] annotations in order to indicates potential process flow branches.
- Add some missing Javadoc.
- Add property processInstandId to AuthenticationSession.
- Add process engine support.
- Fix HttpServlet init issues.
- Set VerifyAuthenticationBlockServlet and VerifyIdentityLinkServlet deprecated.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index fb3888a3e..477cce57b 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -10,6 +10,23 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
+	<filter>
+		<filter-name>characterEncodingFilter</filter-name>
+		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+		<init-param>
+			<param-name>forceEncoding</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>characterEncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
 	<!-- exposes request and response to the current thread -->
 	<filter>
 		<filter-name>requestContextFilter</filter-name>
@@ -20,6 +37,7 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
+
 <!-- 	<servlet>
 		<servlet-name>SelectBKU</servlet-name>
 		<display-name>SelectBKU</display-name>
@@ -153,6 +171,12 @@
 		<servlet-class>at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet</servlet-class>
 	</servlet>
 
+	<servlet>
+		<description>Resumes a suspended process engine task.</description>
+		<display-name>ProcessEngineSignal</display-name>
+		<servlet-name>ProcessEngineSignal</servlet-name>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet</servlet-class>
+	</servlet>
 
 
 
@@ -207,7 +231,10 @@
 		<url-pattern>/idpSingleLogout</url-pattern>
 	</servlet-mapping>	
 	<servlet-mapping>
+		<!--
 		<servlet-name>VerifyIdentityLink</servlet-name>
+		-->
+		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
@@ -229,7 +256,10 @@
 	</servlet-mapping> -->
 	
 	<servlet-mapping>
+		<!--
 		<servlet-name>VerifyAuthBlock</servlet-name>
+		-->
+		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 	</servlet-mapping>
 <!-- 	<servlet-mapping>
-- 
cgit v1.2.3


From ad40ae9233c5f2a32c983962d655e686af546677 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 22 Jan 2015 12:13:07 +0100
Subject: Add mandate process support (MOAID-60).

- Refactor moa-id auth web.xml
-- Group the servlets with their corresponding mappings.
-- Replace servlets for mappings "/GetMISSessionID", "/VerifyAuthBlock", "/VerifyCertificate" and "/VerifyIdentityLink".
-- Remove disabled declarations.
- Replace link http://jigsaw.w3.org/css-validator/images/vcss-blue with https://... within the internal templates (loginFormFull.html, sendAssertionFormFull.html, ...).
- Set classes deprecated: GetMISSessionIDServlet, VerifyCertificateServlet
- ProcessEngineSignalServlet: make GET delegate to PUT
- Replace some "implements MOAIDAuthConstants" with "import static MOAIDAuthConstants.*".
- Add detailed Javadoc to *Task.java.
- Update DefaultAuthentication.process.xml for mandate
- Add GetMISSessionIDTask and VerifyCertificateTask.
- Add adapter class for iaik.IAIKRuntimeException in order to satisfy some library's bogus dependendies.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 272 +++++++------------------
 1 file changed, 72 insertions(+), 200 deletions(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 477cce57b..1dd3b7a40 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -36,41 +36,67 @@
 		<filter-name>requestContextFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
+	
+	<filter>
+		<filter-name>UrlRewriteFilter</filter-name>
+		<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>UrlRewriteFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 
-
-<!-- 	<servlet>
-		<servlet-name>SelectBKU</servlet-name>
-		<display-name>SelectBKU</display-name>
-		<description>Select Bürgerkartenartenumgebung</description>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SelectBKUServlet</servlet-class>
-	</servlet> -->
 	<servlet>
 		<description>Generate BKU Request template</description>
 		<display-name>GenerateIframeTemplate</display-name>
 		<servlet-name>GenerateIframeTemplate</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>GenerateIframeTemplate</servlet-name>
+		<url-pattern>/GenerateIframeTemplate</url-pattern>
+	</servlet-mapping>
+	
 	<servlet>
 		<display-name>RedirectServlet</display-name>
 		<servlet-name>RedirectServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.RedirectServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>RedirectServlet</servlet-name>
+		<url-pattern>/RedirectServlet</url-pattern>
+	</servlet-mapping>
+	
 	<servlet>
 		<display-name>MonitoringServlet</display-name>
 		<servlet-name>MonitoringServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>MonitoringServlet</servlet-name>
+		<url-pattern>/MonitoringServlet</url-pattern>
+	</servlet-mapping>
+	
 	<servlet>
 		<display-name>SSOSendAssertionServlet</display-name>
 		<servlet-name>SSOSendAssertionServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet</servlet-class>
-	</servlet>	
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>SSOSendAssertionServlet</servlet-name>
+		<url-pattern>/SSOSendAssertionServlet</url-pattern>
+	</servlet-mapping>
+	
 	<servlet>
 		<description>SSO LogOut</description>
 		<display-name>LogOut</display-name>
 		<servlet-name>LogOut</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.LogOutServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>LogOut</servlet-name>
+		<url-pattern>/LogOut</url-pattern>
+	</servlet-mapping>
 	
 	<servlet>
 		<description>IDP Single LogOut Service</description>
@@ -78,25 +104,10 @@
 		<servlet-name>IDPSLO</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet</servlet-class>
 	</servlet>
-	
-	<servlet>
-		<description>Verify identity link coming from security layer</description>
-		<display-name>VerifyIdentityLink</display-name>
-		<servlet-name>VerifyIdentityLink</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<description>Verify the certificate coming from security layer</description>
-		<display-name>VerifyCertificate</display-name>
-		<servlet-name>VerifyCertificate</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<description>Get the MIS session ID coming from security layer</description>
-		<display-name>GetMISSessionID</display-name>
-		<servlet-name>GetMISSessionID</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet</servlet-class>
-	</servlet>
+	<servlet-mapping>
+		<servlet-name>IDPSLO</servlet-name>
+		<url-pattern>/idpSingleLogout</url-pattern>
+	</servlet-mapping>
 
 	<servlet>
 		<description>Gets the foreign eID from security layer</description>
@@ -104,223 +115,84 @@
 		<servlet-name>GetForeignID</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
 	</servlet>
-<!-- 	<servlet>
-		<servlet-name>ProcessInput</servlet-name>
-		<display-name>ProcessInput</display-name>
-		<description>Process user input needed by infobox validators</description>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessValidatorInputServlet</servlet-class>
-	</servlet> -->
-	<servlet>
-		<description>Verify AUTH block coming from security layer</description>
-		<display-name>VerifyAuthBlock</display-name>
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class>
-	</servlet>
-<!-- 	<servlet>
-		<servlet-name>ConfigurationUpdate</servlet-name>
-		<display-name>ConfigurationUpdate</display-name>
-		<description>Update MOA-ID Auth configuration from the configuration
-			file</description>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class>
-	</servlet> -->
+	<servlet-mapping>
+		<servlet-name>GetForeignID</servlet-name>
+		<url-pattern>/GetForeignID</url-pattern>
+	</servlet-mapping>
+	
 	<servlet>
 		<display-name>Apache-Axis Servlet</display-name>
 		<servlet-name>AxisServlet</servlet-name>
 		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>AxisServlet</servlet-name>
+		<url-pattern>/services/*</url-pattern>
+	</servlet-mapping>
 
- 	<!-- JSP servlet -->
-<!--	<servlet>
-		<servlet-name>jspservlet</servlet-name>
-		<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-	</servlet> -->
 	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from
-			different C-PEPS</description>
+		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
 		<display-name>PEPSConnectorServlet</display-name>
 		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<servlet-class>
-			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>PEPSConnectorServlet</servlet-name>
+		<url-pattern>/PEPSConnector</url-pattern>
+	</servlet-mapping>
+
 	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from
-			different C-PEPS</description>
+		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
 		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
 		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<servlet-class>
-			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
 	</servlet>
-
-	<!-- Dispatcher servlets 
-	<servlet>
-		<servlet-name>AuthDispatcherServlet</servlet-name>
-		<display-name>AuthDispatcher Servlet</display-name>
-		<servlet-class>at.gv.egovernment.moa.id.entrypoints.AuthDispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>-->
+	<servlet-mapping>
+		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
+		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
+	</servlet-mapping>
+	
 	<servlet>
 		<display-name>Dispatcher Servlet</display-name>
 		<servlet-name>DispatcherServlet</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-
-	<!-- Servlet Registration -->
-	<servlet>
-		<servlet-name>at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet</servlet-class>
-	</servlet>
+	<servlet-mapping>
+		<servlet-name>DispatcherServlet</servlet-name>
+		<url-pattern>/dispatcher</url-pattern>
+	</servlet-mapping>
 
 	<servlet>
-		<description>Resumes a suspended process engine task.</description>
+		<description>Resumes a suspended process task.</description>
 		<display-name>ProcessEngineSignal</display-name>
 		<servlet-name>ProcessEngineSignal</servlet-name>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet</servlet-class>
 	</servlet>
-
-
-
-	<servlet-mapping>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<url-pattern>/dispatcher</url-pattern>
-	</servlet-mapping>
-	<!-- servlet-mapping>
-		<servlet-name>AuthDispatcherServlet</servlet-name>
-		<url-pattern>/AuthDispatcher</url-pattern>
-	</servlet-mapping -->
-
-
-	<!-- servlet mapping for jsp pages -->
-	<!-- errorpage.jsp (customizeable) -->
-<!-- 	<servlet-mapping>
-		<servlet-name>jspservlet</servlet-name>
-		<url-pattern>/errorpage-auth.jsp</url-pattern>
-	</servlet-mapping>
-	message.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate)
-	<servlet-mapping>
-		<servlet-name>jspservlet</servlet-name>
-		<url-pattern>/message-auth.jsp</url-pattern>
-	</servlet-mapping> -->
-
-<!-- 	<servlet-mapping>
-		<servlet-name>SelectBKU</servlet-name>
-		<url-pattern>/SelectBKU</url-pattern>
-	</servlet-mapping> -->
-	<servlet-mapping>
-		<servlet-name>GenerateIframeTemplate</servlet-name>
-		<url-pattern>/GenerateIframeTemplate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>RedirectServlet</servlet-name>
-		<url-pattern>/RedirectServlet</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>MonitoringServlet</servlet-name>
-		<url-pattern>/MonitoringServlet</url-pattern>
-	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>SSOSendAssertionServlet</servlet-name>
-		<url-pattern>/SSOSendAssertionServlet</url-pattern>
-	</servlet-mapping>	
- 	<servlet-mapping>
-		<servlet-name>LogOut</servlet-name>
-		<url-pattern>/LogOut</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>IDPSLO</servlet-name>
-		<url-pattern>/idpSingleLogout</url-pattern>
-	</servlet-mapping>	
-	<servlet-mapping>
-		<!--
-		<servlet-name>VerifyIdentityLink</servlet-name>
-		-->
 		<servlet-name>ProcessEngineSignal</servlet-name>
-		<url-pattern>/VerifyIdentityLink</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>VerifyCertificate</servlet-name>
-		<url-pattern>/VerifyCertificate</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>GetMISSessionID</servlet-name>
 		<url-pattern>/GetMISSessionID</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>GetForeignID</servlet-name>
-		<url-pattern>/GetForeignID</url-pattern>
-	</servlet-mapping>
-
-<!-- 	<servlet-mapping>
-		<servlet-name>ProcessInput</servlet-name>
-		<url-pattern>/ProcessInput</url-pattern>
-	</servlet-mapping> -->
-	
-	<servlet-mapping>
-		<!--
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		-->
-		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
+		<url-pattern>/VerifyCertificate</url-pattern>
+		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
-<!-- 	<servlet-mapping>
-		<servlet-name>ConfigurationUpdate</servlet-name>
-		<url-pattern>/ConfigurationUpdate</url-pattern>
-	</servlet-mapping> -->
-	<servlet-mapping>
-		<servlet-name>AxisServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<url-pattern>/PEPSConnector</url-pattern>
-	</servlet-mapping>
-<servlet-mapping>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
-	</servlet-mapping>
-	<!-- Filters -->
-	<!-- <filter> <filter-name>DispatcherDecoratorFilter</filter-name> <filter-class>at.gv.egovernment.moa.id.sso.DispatcherDecoratorFilter</filter-class> 
-		</filter> -->
-
-	<filter>
-		<filter-name>UrlRewriteFilter</filter-name>
-		<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>UrlRewriteFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	<!-- <filter-mapping> <filter-name>DispatcherDecoratorFilter</filter-name> 
-		<url-pattern>/AuthDispatcher</url-pattern> <dispatcher>REQUEST</dispatcher> 
-		<dispatcher>FORWARD</dispatcher> </filter-mapping> <filter-mapping> <filter-name>DispatcherDecoratorFilter</filter-name> 
-		<url-pattern>/StartAuthentication</url-pattern> <dispatcher>REQUEST</dispatcher> 
-		<dispatcher>FORWARD</dispatcher> </filter-mapping> -->
 
 	<session-config>
 		<session-timeout>5</session-timeout>
 	</session-config>
+	
 	<error-page>
 		<error-code>500</error-code>
 		<location>/errorpage.jsp</location>
 	</error-page>
-<!-- 	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>ConfigurationUpdate</web-resource-name>
-			<url-pattern>/ConfigurationUpdate</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>moa-admin</role-name>
-		</auth-constraint>
-	</security-constraint> -->
+	
 	<login-config>
 		<auth-method>BASIC</auth-method>
 		<realm-name>UserDatabase</realm-name>
 	</login-config>
 	<security-role>
-		<description>
-			The role that is required to log in to the moa Application
-		</description>
+		<description>The role that is required to log in to the moa Application</description>
 		<role-name>moa-admin</role-name>
 	</security-role>
+
 </web-app>
-- 
cgit v1.2.3


From 745272fe66f04fee6976e6a187e308bb7a5987a1 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 23 Jan 2015 11:22:07 +0100
Subject: Add foreign identity process support (MOAID-61).

- moa-id auth web.xml: Replace servlet mapping "/GetForeignID".
- Fix some javadoc of AuthenticationServer.
- Set GetForeignIDServlet deprecated.
- Remove redundant code across several classes.
- VerifyIdentityLinkTask: Separate identity link verification from subsequent (a) creation of CreateXMLSignatureRequest (ProcessIdentityLinkTask) and (b) creation of InfoBoxReadRequest (CertificateReadRequestTask).
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 1dd3b7a40..4548e05d9 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -108,17 +108,6 @@
 		<servlet-name>IDPSLO</servlet-name>
 		<url-pattern>/idpSingleLogout</url-pattern>
 	</servlet-mapping>
-
-	<servlet>
-		<description>Gets the foreign eID from security layer</description>
-		<display-name>GetForeignID</display-name>
-		<servlet-name>GetForeignID</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>GetForeignID</servlet-name>
-		<url-pattern>/GetForeignID</url-pattern>
-	</servlet-mapping>
 	
 	<servlet>
 		<display-name>Apache-Axis Servlet</display-name>
@@ -172,6 +161,7 @@
 	<servlet-mapping>
 		<servlet-name>ProcessEngineSignal</servlet-name>
 		<url-pattern>/GetMISSessionID</url-pattern>
+		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 		<url-pattern>/VerifyCertificate</url-pattern>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
-- 
cgit v1.2.3


From 8579cf80c3602f963566d31eaf04f59f68d3bf11 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 10:56:18 +0100
Subject: Add STORK process (MOAID-58).

- Add STORKAuthentication.process.xml
- Add PepsConnectorTask using code from PEPSConnectorServlet.
- Split code from PEPSConnectorWithLocalSigningServlet into PepsConnectorHandleResponseWithoutSignatureTask and PepsConnectorHandleLocalSignResponseTask.
- Replace SpringExpressionEvaluator within applicationContext.xml with SpringWebExpressionEvaluator (allowing expressions using request parameter(s)).
- Make servlet mappings /PEPSConnectorWithLocalSigning and /PEPSConnector point to the process engine signaling servlet.
- Add many FIXMEs marking problematic code.
- Move code to start stork authentication from StartAuthenticationBuilder to CreateStorkAuthRequestFormTask.
- Mark PEPSConnectorServlet and PEPSConnectorWithLocalSigningServlet deprecated.
- Remove @author tknall from classes assembled using existing (bogus) code.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 4548e05d9..2dbceb4e9 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -119,28 +119,6 @@
 		<url-pattern>/services/*</url-pattern>
 	</servlet-mapping>
 
-	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
-		<display-name>PEPSConnectorServlet</display-name>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>PEPSConnectorServlet</servlet-name>
-		<url-pattern>/PEPSConnector</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
-		<display-name>PEPSConnectorWithLocalSigningServlet</display-name>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
-		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
-	</servlet-mapping>
-	
 	<servlet>
 		<display-name>Dispatcher Servlet</display-name>
 		<servlet-name>DispatcherServlet</servlet-name>
@@ -165,6 +143,8 @@
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 		<url-pattern>/VerifyCertificate</url-pattern>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
+		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
+		<url-pattern>/PEPSConnector</url-pattern>
 	</servlet-mapping>
 
 	<session-config>
-- 
cgit v1.2.3


From 88f2ac75cf316c755e35303cf2d6faa2343b9408 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 17:13:21 +0100
Subject: Perform some cleanup

- Remove ProcessDefinitionFactoryBean from applicationContext.xml.
- Minor code cleanup.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 2dbceb4e9..10c772aca 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -138,6 +138,8 @@
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>ProcessEngineSignal</servlet-name>
+		<url-pattern>/signalProcess</url-pattern>
+		<!-- legacy url patterns -->
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
-- 
cgit v1.2.3


From 6371e01c520de77b0f37f59c72dbe20fce88c91a Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 08:53:27 +0100
Subject: Add Spring based discovery for STORKAuthModule

- Add wildcard import to applicationContext.xml
- Add some javadoc to AuthModule interface.
- Remove STORKAuthModuleImpl from serviceloader based registration.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 10c772aca..f81e01ccd 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -138,8 +138,9 @@
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>ProcessEngineSignal</servlet-name>
+		<!-- Use this url-pattern in order to signal the next (asynchronous) task. -->
 		<url-pattern>/signalProcess</url-pattern>
-		<!-- legacy url patterns -->
+		<!-- legacy url patterns for asynchronous tasks -->
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
-- 
cgit v1.2.3


From 373641cfb0e404e89f4d9a011ae53d8b8cfc06c5 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 10:45:59 +0100
Subject: Add dynamic servlet registration for STORK processes.

- Add STORKWebApplicationInitializer.java
- Adjust web.xml
- Move STORK.authmodule.beans.xml to src/main/resources/...
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index f81e01ccd..41c46bd22 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -140,14 +140,17 @@
 		<servlet-name>ProcessEngineSignal</servlet-name>
 		<!-- Use this url-pattern in order to signal the next (asynchronous) task. -->
 		<url-pattern>/signalProcess</url-pattern>
-		<!-- legacy url patterns for asynchronous tasks -->
+		<!-- legacy url patterns for asynchronous tasks (internal default module/processes) -->
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 		<url-pattern>/VerifyCertificate</url-pattern>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
+		<!-- STORK servlet mappings; automatically registered by the stork module -->
+		<!--
 		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
 		<url-pattern>/PEPSConnector</url-pattern>
+		-->
 	</servlet-mapping>
 
 	<session-config>
-- 
cgit v1.2.3


From a9dc7e094a8732f9826ab77648758dd39adc7324 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 13:54:32 +0100
Subject: Add logging for automatic servlet registration.

---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 41c46bd22..930b10f43 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -137,16 +137,23 @@
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet</servlet-class>
 	</servlet>
 	<servlet-mapping>
+		<!-- do not change this servlet-name -->
 		<servlet-name>ProcessEngineSignal</servlet-name>
+		
 		<!-- Use this url-pattern in order to signal the next (asynchronous) task. -->
 		<url-pattern>/signalProcess</url-pattern>
+		
 		<!-- legacy url patterns for asynchronous tasks (internal default module/processes) -->
 		<url-pattern>/GetMISSessionID</url-pattern>
 		<url-pattern>/GetForeignID</url-pattern>
 		<url-pattern>/VerifyAuthBlock</url-pattern>
 		<url-pattern>/VerifyCertificate</url-pattern>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
-		<!-- STORK servlet mappings; automatically registered by the stork module -->
+		
+		<!--
+			STORK servlet mappings; automatically registered by the stork module;
+			refer to at.gv.egovernment.moa.id.auth.modules.stork.STORKWebApplicationInitializer
+		-->
 		<!--
 		<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
 		<url-pattern>/PEPSConnector</url-pattern>
-- 
cgit v1.2.3


From 74a42b6128f6f8d21a65dddb9405cd52ebbc0520 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 15:37:10 +0100
Subject: Create exemplary AuthServlet module (MOAID-68)

- Create new module moa-id-module-monitoring.
- Move MonitoringServlet, DatabaseTestModule, IdentityLinkTestModule, TestManager and TestModuleInterface to new module.
- Update pom.xml, adding new module dependency.
- Update web.xml, disabling static servlet registration.
- Add @WebServlet servlet registration for MonitoringServlet.
---
 id/server/auth/src/main/webapp/WEB-INF/web.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'id/server/auth/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 930b10f43..5afc0dee7 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -67,6 +67,8 @@
 		<url-pattern>/RedirectServlet</url-pattern>
 	</servlet-mapping>
 	
+	<!-- automatically registered by module 'moa-id-module-monitoring' using @WebServlet annotation -->
+	<!--
 	<servlet>
 		<display-name>MonitoringServlet</display-name>
 		<servlet-name>MonitoringServlet</servlet-name>
@@ -76,6 +78,7 @@
 		<servlet-name>MonitoringServlet</servlet-name>
 		<url-pattern>/MonitoringServlet</url-pattern>
 	</servlet-mapping>
+	-->
 	
 	<servlet>
 		<display-name>SSOSendAssertionServlet</display-name>
-- 
cgit v1.2.3