added new Servlet definitions

added URL rewrite modul

1 files changed, 86 insertions, 29 deletions

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 2a1d093d9..dcacce819 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -34,19 +34,19 @@
 		<description>Get the MIS session ID coming from security layer</description>
 		<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>
 		<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>
+		<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>
 		<servlet-name>VerifyAuthBlock</servlet-name>
 		<display-name>VerifyAuthBlock</display-name>
@@ -56,7 +56,8 @@
 	<servlet>
 		<servlet-name>ConfigurationUpdate</servlet-name>
 		<display-name>ConfigurationUpdate</display-name>
-		<description>Update MOA-ID Auth configuration from the configuration file</description>
+		<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>
@@ -67,28 +68,62 @@
 
 	<!-- JSP servlet -->
 	<servlet>
-        <servlet-name>jspservlet</servlet-name>
-        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    </servlet>
+		<servlet-name>jspservlet</servlet-name>
+		<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>
+		<description>Servlet receiving STORK SAML Response Messages from
+			different C-PEPS</description>
 		<servlet-class>
-		at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
+			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</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>
+		<servlet-name>UnauthDispatcherServlet</servlet-name>
+		<display-name>UnauthDispatcher Servlet</display-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>UnauthDispatcherServlet</servlet-name>
+		<url-pattern>/UnauthDispatcher</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-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-name>jspservlet</servlet-name>
+		<url-pattern>/message-auth.jsp</url-pattern>
+	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>SelectBKU</servlet-name>
@@ -96,7 +131,7 @@
 	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>StartAuthentication</servlet-name>
-		<url-pattern>/StartAuthentication</url-pattern>
+		<url-pattern>/StartBKUAuthentication</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>VerifyIdentityLink</servlet-name>
@@ -114,15 +149,15 @@
 		<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>
-        <url-pattern>/VerifyAuthBlock</url-pattern>
-    </servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>VerifyAuthBlock</servlet-name>
+		<url-pattern>/VerifyAuthBlock</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>ConfigurationUpdate</servlet-name>
 		<url-pattern>/ConfigurationUpdate</url-pattern>
@@ -135,6 +170,28 @@
 		<servlet-name>PEPSConnectorServlet</servlet-name>
 		<url-pattern>/PEPSConnector</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>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>FORWARD</dispatcher>
+	</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>
@@ -157,8 +214,8 @@
 	</login-config>
 	<security-role>
 		<description>
-		    The role that is required to log in to the moa Application
-  		</description>
+			The role that is required to log in to the moa Application
+		</description>
 		<role-name>moa-admin</role-name>
 	</security-role>
 </web-app>