aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-06-06 14:17:03 +0200
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-06-06 14:17:03 +0200
commita2d42868a53c8adc615aaa99fd29770f51573e9f (patch)
treebc82472107f527e9268e7d98354bde97ca24e75b /id/server/auth
parentebe5ab97d0445cc3c882ffa956df17dcd8d2818d (diff)
parentf54870a55c9830caa2862d95e2e7f8f3cd6e0243 (diff)
downloadmoa-id-spss-a2d42868a53c8adc615aaa99fd29770f51573e9f.tar.gz
moa-id-spss-a2d42868a53c8adc615aaa99fd29770f51573e9f.tar.bz2
moa-id-spss-a2d42868a53c8adc615aaa99fd29770f51573e9f.zip
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot
Diffstat (limited to 'id/server/auth')
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml17
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/web.xml13
2 files changed, 25 insertions, 5 deletions
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 6da7396a1..23737452a 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -41,20 +41,29 @@
</rule>
<rule match-type="regex">
<from>^/pvp2/redirect$</from>
- <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Redirect&amp;%{query-string}</to>
+ <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Redirect&amp;endpointtype=idp&amp;%{query-string}</to>
</rule>
<rule match-type="regex">
<from>^/pvp2/post$</from>
- <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Post&amp;%{query-string}</to>
+ <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Post&amp;endpointtype=idp&amp;%{query-string}</to>
</rule>
<rule match-type="regex">
<from>^/pvp2/Soap$</from>
- <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Soap</to>
+ <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Soap&amp;endpointtype=idp</to>
</rule>
<rule match-type="regex">
<from>^/pvp2/attributequery$</from>
- <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=AttributeQuery</to>
+ <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=AttributeQuery&amp;endpointtype=idp</to>
</rule>
+ <rule match-type="regex">
+ <from>^/pvp2/sp/redirect$</from>
+ <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Redirect&amp;endpointtype=sp&amp;%{query-string}</to>
+ </rule>
+ <rule match-type="regex">
+ <from>^/pvp2/sp/post$</from>
+ <to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Post&amp;endpointtype=sp&amp;%{query-string}</to>
+ </rule>
+
<rule match-type="regex">
<from>^/stork2/StartAuthentication$</from>
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 0ef8a568c..d60d73fd2 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -35,8 +35,15 @@
<display-name>LogOut</display-name>
<description>SSO LogOut</description>
<servlet-class>at.gv.egovernment.moa.id.auth.servlet.LogOutServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
</servlet>
+
+ <servlet>
+ <servlet-name>IDPSLO</servlet-name>
+ <display-name>IDP-SLO</display-name>
+ <description>IDP Single LogOut Service</description>
+ <servlet-class>at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet</servlet-class>
+ </servlet>
+
<servlet>
<servlet-name>VerifyIdentityLink</servlet-name>
<display-name>VerifyIdentityLink</display-name>
@@ -171,6 +178,10 @@
<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>
<url-pattern>/VerifyIdentityLink</url-pattern>
</servlet-mapping>