updated for wbPK

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@398 d688527b-c9ab-4aba-bd8d-4036d912da1d

3 files changed, 9 insertions, 6 deletions

diff --git a/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java b/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java
index ed4410521..c3325349d 100644
--- a/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java
+++ b/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java
@@ -39,7 +39,7 @@ public class Test200VerifyIdentityLink extends AbnahmeTestCase {
       Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
 
       VerifyXMLSignatureResponseParser respParser = new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
-      VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames(), VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK);
+      VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames(), VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK, true);
          
       /*
        *    HINWEIS: clearSamlAssertion löscht aus einer beliebiegen String-Repräsentation einer XML-Struktur
@@ -320,7 +320,7 @@ public class Test200VerifyIdentityLink extends AbnahmeTestCase {
       //    String createXMLSignatureResponse = readFile(TESTDATA_ROOT + "xmldata/standard/"+"CreateXMLSignatureResponse.xml");
       //    String samlArtifact = server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
       try {
-        VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), new String[] { "CN=TEST,OU=TEST,O=TEST,C=AT" }, VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK);
+        VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), new String[] { "CN=TEST,OU=TEST,O=TEST,C=AT" }, VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK, true);
         System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
         fail(this.getName() + " hat KEINE FEHLER geworfen");
       }
diff --git a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
index de4fe8fbf..c7ee57f09 100644
--- a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
+++ b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
@@ -534,7 +534,7 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
     CreateXMLSignatureResponse csresp = 
       new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse();
     // validates <CreateXMLSignatureResponse>
-    new CreateXMLSignatureResponseValidator().validate(csresp, session.getTarget(), session.getPublicOAURLPrefix());
+    new CreateXMLSignatureResponseValidator().validate(csresp, session);
     // builds a <VerifyXMLSignatureRequest> for a MOA-SPSS call
     String[] vtids = authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs();
     String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
@@ -544,7 +544,7 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
     // parses the <VerifyXMLSignatureResponse>
     VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponseParser(domVsresp).parseData();
     // validates the <VerifyXMLSignatureResponse>
-    VerifyXMLSignatureResponseValidator.getInstance().validate(vsresp, null, VerifyXMLSignatureResponseValidator.CHECK_AUTH_BLOCK);
+    VerifyXMLSignatureResponseValidator.getInstance().validate(vsresp, null, VerifyXMLSignatureResponseValidator.CHECK_AUTH_BLOCK, true);
     // compares the public keys from the identityLink with the AuthBlock
    
     // builds authentication data and stores it together with a SAML artifact
@@ -583,7 +583,7 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
         oaParam.getProvideIdentityLink() ? DOMUtils.serializeNode(identityLink.getSamlAssertion()) : "";
       String authBlock = oaParam.getProvideAuthBlock() ? session.getAuthBlock() : "";
       String samlAssertion = new AuthenticationDataAssertionBuilder().build(
-        authData, prPerson, authBlock, ilAssertion);
+        authData, prPerson, authBlock, ilAssertion, session.getBkuURL(), "", false);
       authData.setSamlAssertion(samlAssertion);
       return authData;
     }
diff --git a/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java b/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java
index b05e2b92c..e265905b8 100644
--- a/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java
+++ b/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java
@@ -4,7 +4,9 @@ import org.w3c.dom.Element;
 import test.abnahme.AbnahmeTestCase;
 
 import at.gv.egovernment.moa.id.AuthenticationException;
+import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
 import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
@@ -30,6 +32,7 @@ public class Test400GetAuthenticationData extends AbnahmeTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     String sessionID = startAuthentication();
+    AuthenticationSession session = AuthenticationServer.getSession(sessionID);
     String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
     server.verifyIdentityLink(sessionID, infoboxReadResponse);
     InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
@@ -40,7 +43,7 @@ public class Test400GetAuthenticationData extends AbnahmeTestCase {
     //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
     //    System.out.println(createXMLSignatureRequest);
     String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
-    CreateXMLSignatureResponseValidator.getInstance().validate(new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse(), "gb", "https://localhost:9443/");
+    CreateXMLSignatureResponseValidator.getInstance().validate(new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse(), session);
     samlArtifact = server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
   }