diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-06-10 11:08:32 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-06-10 11:08:32 +0200 |
| commit | c553525294ffe87bc05a5b1b100f86ddf0aa2d84 (patch) | |
| tree | 714bfe6587fafc3e27122371d1324aa9497c9b36 /id/server/auth/src/main | |
| parent | c1ee833c415bcce3d7173f0beec0c1ffcd6c6529 (diff) | |
| parent | 8dcf7e74a19986c234888b8b93eda5cbddf8ac76 (diff) | |
| download | moa-id-spss-c553525294ffe87bc05a5b1b100f86ddf0aa2d84.tar.gz moa-id-spss-c553525294ffe87bc05a5b1b100f86ddf0aa2d84.tar.bz2 moa-id-spss-c553525294ffe87bc05a5b1b100f86ddf0aa2d84.zip | |
Merge branch 'moa-2.1-Snapshot' into dokumentservice
Diffstat (limited to 'id/server/auth/src/main')
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 17 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/web.xml | 13 |
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&action=Redirect&%{query-string}</to> + <to type="forward">/dispatcher?mod=id_pvp2x&action=Redirect&endpointtype=idp&%{query-string}</to> </rule> <rule match-type="regex"> <from>^/pvp2/post$</from> - <to type="forward">/dispatcher?mod=id_pvp2x&action=Post&%{query-string}</to> + <to type="forward">/dispatcher?mod=id_pvp2x&action=Post&endpointtype=idp&%{query-string}</to> </rule> <rule match-type="regex"> <from>^/pvp2/Soap$</from> - <to type="forward">/dispatcher?mod=id_pvp2x&action=Soap</to> + <to type="forward">/dispatcher?mod=id_pvp2x&action=Soap&endpointtype=idp</to> </rule> <rule match-type="regex"> <from>^/pvp2/attributequery$</from> - <to type="forward">/dispatcher?mod=id_pvp2x&action=AttributeQuery</to> + <to type="forward">/dispatcher?mod=id_pvp2x&action=AttributeQuery&endpointtype=idp</to> </rule> + <rule match-type="regex"> + <from>^/pvp2/sp/redirect$</from> + <to type="forward">/dispatcher?mod=id_pvp2x&action=Redirect&endpointtype=sp&%{query-string}</to> + </rule> + <rule match-type="regex"> + <from>^/pvp2/sp/post$</from> + <to type="forward">/dispatcher?mod=id_pvp2x&action=Post&endpointtype=sp&%{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> |