From e031b0d5854e4038d28c262109c2529609418ffe Mon Sep 17 00:00:00 2001 From: kstranacher Date: Wed, 12 Oct 2011 10:53:56 +0000 Subject: =?UTF-8?q?*=20Aktualisierung=20imports=20MOA-ID:=20*=20Abfrage=20?= =?UTF-8?q?auf=20Vollmachtenmodus=20bei=20nicht=20=C3=B6ffentlicher=20Andw?= =?UTF-8?q?endung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1222 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .classpath | 1 - .../java/at/gv/egovernment/moa/util/DOMUtils.java | 2 - .../at/gv/egovernment/moa/util/SSLUtilsTest.java | 27 ++++---- id/.classpath | 1 - id/server/auth/src/main/webapp/iframeHandyBKU.html | 6 +- .../auth/src/main/webapp/iframeOnlineBKU.html | 11 +-- id/server/auth/src/main/webapp/index.html | 14 ++-- .../moa/id/auth/AuthenticationServer.java | 30 ++++++--- .../auth/builder/GetIdentityLinkFormBuilder.java | 8 --- .../builder/GetVerifyAuthBlockFormBuilder.java | 6 +- .../moa/id/auth/data/AuthenticationSession.java | 2 - .../moa/id/auth/parser/ErrorResponseParser.java | 3 - .../id/auth/parser/InfoboxReadResponseParser.java | 5 +- .../parser/VerifyXMLSignatureResponseParser.java | 4 +- .../moa/id/auth/servlet/GetForeignIDServlet.java | 74 ++++++++++---------- .../id/auth/servlet/VerifyCertificateServlet.java | 78 ++++++++++------------ .../id/auth/servlet/VerifyIdentityLinkServlet.java | 4 -- .../auth/validator/parep/ParepInputProcessor.java | 13 ++-- .../moa/id/auth/validator/parep/ParepUtils.java | 57 ++++++++-------- .../client/szrgw/CreateIdentityLinkResponse.java | 5 +- .../validator/parep/client/szrgw/SZRGWClient.java | 1 - .../validator/parep/config/ParepConfiguration.java | 38 +++++------ .../moa/id/config/ConfigurationBuilder.java | 33 +-------- .../moa/id/config/OnlineMandatesTemplates.java | 78 ---------------------- .../moa/id/config/TargetsAndSectorNames.java | 2 - .../id/config/auth/AuthConfigurationProvider.java | 34 +++++----- .../moa/id/config/auth/OAAuthParameter.java | 1 - .../parser/AuthenticationDataAssertionParser.java | 1 - .../moa/id/proxy/servlet/ProxyServlet.java | 6 +- .../id/util/client/mis/simple/MISSimpleClient.java | 57 +++++++--------- .../resources/properties/id_messages_de.properties | 1 + .../parser/IdentityLinkAssertionParserTest.java | 30 ++++----- .../spss/server/config/ConfigurationProvider.java | 1 - .../spss/server/iaik/config/IaikConfigurator.java | 14 ++-- .../invoke/VerifyCMSSignatureResponseBuilder.java | 4 -- .../invoke/XMLSignatureVerificationInvoker.java | 1 - 36 files changed, 245 insertions(+), 408 deletions(-) delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OnlineMandatesTemplates.java diff --git a/.classpath b/.classpath index f93d181b5..b6e5f5cd1 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,5 @@ - diff --git a/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java index 13c2809ac..316dee3b8 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java @@ -28,7 +28,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.StringWriter; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -44,7 +43,6 @@ import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; diff --git a/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java b/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java index 8e5b9f82a..2b5094fb8 100644 --- a/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java +++ b/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java @@ -24,8 +24,6 @@ package test.at.gv.egovernment.moa.util; -import java.io.FileInputStream; -import java.io.IOException; import java.net.URL; import java.security.KeyStore; import java.security.Security; @@ -33,13 +31,12 @@ import java.security.Security; import javax.net.ssl.SSLException; import javax.net.ssl.SSLSocketFactory; -import com.sun.net.ssl.HostnameVerifier; -import com.sun.net.ssl.HttpsURLConnection; - +import junit.framework.TestCase; import at.gv.egovernment.moa.util.KeyStoreUtils; import at.gv.egovernment.moa.util.SSLUtils; -import junit.framework.TestCase; +import com.sun.net.ssl.HostnameVerifier; +import com.sun.net.ssl.HttpsURLConnection; /** * @author Paul Ivancsics @@ -167,15 +164,15 @@ public class SSLUtilsTest extends TestCase { assertFalse(shouldOk); } } - private byte[] readTruststore(String filename) throws IOException { - if (filename == null) - return null; - FileInputStream in = new FileInputStream(filename); - byte[] buffer = new byte[in.available()]; - in.read(buffer); - in.close(); - return buffer; - } +// private byte[] readTruststore(String filename) throws IOException { +// if (filename == null) +// return null; +// FileInputStream in = new FileInputStream(filename); +// byte[] buffer = new byte[in.available()]; +// in.read(buffer); +// in.close(); +// return buffer; +// } private class HostnameVerifierHack implements HostnameVerifier { public boolean verify(String arg0, String arg1) { return true; diff --git a/id/.classpath b/id/.classpath index f93d181b5..b6e5f5cd1 100644 --- a/id/.classpath +++ b/id/.classpath @@ -1,6 +1,5 @@ - diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html index f07b73265..a7e541b85 100644 --- a/id/server/auth/src/main/webapp/iframeHandyBKU.html +++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html @@ -8,11 +8,13 @@