diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
| commit | 8074865580b5fa28817b37c9ad2e8c992ebef977 (patch) | |
| tree | 475cd1ed9bc517dffbf023e7d9c7d16ce2bde8c5 /id/server/auth | |
| parent | 234f17d14f9f48655c27d54114df0aa2593cf6d8 (diff) | |
| parent | 714a8cb32dd5585829dfc1926e56971425a2a692 (diff) | |
| download | moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.gz moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.bz2 moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.zip | |
Merge branch 'moa-2.1-Snapshot'
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
pom.xml
Diffstat (limited to 'id/server/auth')
| -rw-r--r-- | id/server/auth/pom.xml | 2 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/web.xml | 13 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/index.html | 2 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/template_localBKU.html | 2 |
5 files changed, 17 insertions, 6 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 20c45b096..b43a0e736 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -98,7 +98,7 @@ <dependency> <groupId>org.tuckey</groupId> <artifactId>urlrewritefilter</artifactId> - <version>4.0.3</version> + <version>4.0.4</version> </dependency> <dependency> <groupId>MOA.spss.server</groupId> 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 23737452a..54debca81 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml @@ -86,8 +86,8 @@ <to type="forward">/dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string}</to> </rule> <rule match-type="regex"> - <from>^/stork2/SendPEPSAuthnRequest$</from> - <to type="forward">/dispatcher?mod=id_stork2&action=AuthenticationRequest&%{query-string}</to> + <from>^/stork2/SendPEPSAuthnRequestWithoutSignedDoc$</from> + <to type="forward">/dispatcher?mod=id_stork2&action=AuthenticationRequest1&%{query-string}</to> </rule> <rule match-type="regex"> <from>^/stork2/RetrieveMandate$</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 4efda0c79..42085b01e 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -107,6 +107,14 @@ <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> + <servlet-class> + at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class> + </servlet> <!-- Dispatcher servlets <servlet> @@ -219,7 +227,10 @@ <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> --> diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index 4d4529730..968f211bc 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -14,7 +14,7 @@ </tr>
</table>
<hr/>
- <p class="title">MOA-ID 2.1.0</p>
+ <p class="title">MOA-ID 2.1.1</p>
<hr/>
<h1>Inhalt</h1>
<ol>
diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/auth/src/main/webapp/template_localBKU.html index f197d2c5c..88fad25ae 100644 --- a/id/server/auth/src/main/webapp/template_localBKU.html +++ b/id/server/auth/src/main/webapp/template_localBKU.html @@ -11,7 +11,7 @@ </script>
</head>
<body onLoad="onAnmeldeSubmit()">
- <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+ <form target=<REDIRECTTARGET> name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
<input type="hidden" name="XMLRequest" value="<XMLRequest>">
|