From 36a3ddc4e108efc7813b655b74e9919c00c9fd94 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
Date: Thu, 2 May 2013 13:35:38 +0200
Subject: PVP2 basic authnrequest handling and assertion building

---
 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml |  8 ++++----
 id/server/auth/src/main/webapp/WEB-INF/web.xml        | 18 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
index 1d75053f2..032f06911 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -22,20 +22,20 @@
     <!-- Legacy Rules -->
     <rule match-type="regex">
         <from>^/StartAuthentication$</from>
-        <to type="forward">/AuthDispatcher?mod=id_saml1&amp;action=GetArtifact</to>
+        <to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact</to>
     </rule>
     <rule match-type="regex">
         <from>^/StartAuthentication\?(.*)$</from>
-        <to type="forward">/AuthDispatcher?mod=id_saml1&amp;action=GetArtifact&amp;$1</to>
+        <to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact&amp;$1</to>
     </rule>
     
 	<rule match-type="regex">
 		<from>^/auth/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)$</from>
-		<to type="forward">/AuthDispatcher?mod=$1&amp;action=$2</to>
+		<to type="forward">/dispatcher?mod=$1&amp;action=$2</to>
 	</rule>
 	<rule match-type="regex">
 		<from>^/auth/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)\?(.*)$</from>
-		<to type="forward">/AuthDispatcher?mod=$1&amp;action=$2&amp;$3</to>
+		<to type="forward">/dispatcher?mod=$1&amp;action=$2&amp;$3</to>
 	</rule>
 
 
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 dcacce819..f2235b91f 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -80,16 +80,16 @@
 			at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
 	</servlet>
 
-	<!-- Dispatcher servlets -->
+	<!-- 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>
-		<servlet-name>UnauthDispatcherServlet</servlet-name>
-		<display-name>UnauthDispatcher Servlet</display-name>
+		<servlet-name>DispatcherServlet</servlet-name>
+		<display-name>Dispatcher Servlet</display-name>
 		<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
@@ -104,13 +104,13 @@
 
 
 	<servlet-mapping>
-		<servlet-name>UnauthDispatcherServlet</servlet-name>
-		<url-pattern>/UnauthDispatcher</url-pattern>
+		<servlet-name>DispatcherServlet</servlet-name>
+		<url-pattern>/dispatcher</url-pattern>
 	</servlet-mapping>
-	<servlet-mapping>
+	<!-- servlet-mapping>
 		<servlet-name>AuthDispatcherServlet</servlet-name>
 		<url-pattern>/AuthDispatcher</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping -->
 
 
 	<!-- servlet mapping for jsp pages -->
@@ -183,8 +183,6 @@
 	<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> 
-- 
cgit v1.2.3