1 files changed, 40 insertions, 3 deletions
diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
index da5693f3..81ee2625 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
@@ -135,7 +135,7 @@ public class Pvp2SProfileEndPointTest {
     httpReq.setParameter("SAMLRequest", b64);
             
     final org.springframework.core.io.Resource resource = resourceLoader.getResource(
-        "classpath:/data/metadata.xml");
+        "classpath:/data/metadata_valid.xml");
     Timer timer = new Timer("PVP metadata-resolver refresh");
     ResourceBackedMetadataResolver fileSystemResolver = 
         new ResourceBackedMetadataResolver(timer, new OpenSaml3ResourceAdapter(resource));
@@ -172,7 +172,44 @@ public class Pvp2SProfileEndPointTest {
     httpReq.setParameter("SAMLRequest", b64);
             
     final org.springframework.core.io.Resource resource = resourceLoader.getResource(
-        "classpath:/data/metadata.xml");
+        "classpath:/data/metadata_valid.xml");
+    Timer timer = new Timer("PVP metadata-resolver refresh");
+    ResourceBackedMetadataResolver fileSystemResolver = 
+        new ResourceBackedMetadataResolver(timer, new OpenSaml3ResourceAdapter(resource));
+    fileSystemResolver.setId("test");
+    fileSystemResolver.setParserPool(XMLObjectProviderRegistrySupport.getParserPool());
+    fileSystemResolver.initialize();                    
+    metadataProvider.addMetadataResolverIntoChain(fileSystemResolver);
+    
+    
+    //request SAML2 authentication
+    try {
+      controller.pvpIdpPostRequest(httpReq, httpResp);
+      Assert.fail("wrong AuthnRequest not detected");
+      
+    }catch (EaafException e) {
+      Assert.assertEquals("wrong errorId", "pvp2.21", e.getErrorId());      
+      
+    }   
+  }
+  
+  @Test
+  public void authnReqMetadataExpired() throws EaafException, XMLParserException, UnmarshallingException, 
+      UnsupportedEncodingException, TransformerException, IOException, MarshallingException, 
+      ComponentInitializationException {
+    //initialize test
+    final RequestAbstractType authnReq = (RequestAbstractType) XMLObjectSupport.unmarshallFromInputStream(
+        XMLObjectProviderRegistrySupport.getParserPool(),
+        Pvp2SProfileEndPointTest.class.getResourceAsStream("/data/pvp2_authn_1.xml"));
+    authnReq.setIssueInstant(DateTime.now());    
+    RequestAbstractType signedAuthnReq = 
+        Saml2Utils.signSamlObject(authnReq, credentialProvider.getMetaDataSigningCredential(), true);           
+    String b64 = Base64Utils.encodeToString(DomUtils.serializeNode(
+          XMLObjectSupport.getMarshaller(signedAuthnReq).marshall(signedAuthnReq)).getBytes("UTF-8"));    
+    httpReq.setParameter("SAMLRequest", b64);
+            
+    final org.springframework.core.io.Resource resource = resourceLoader.getResource(
+        "classpath:/data/metadata_expired.xml");
     Timer timer = new Timer("PVP metadata-resolver refresh");
     ResourceBackedMetadataResolver fileSystemResolver = 
         new ResourceBackedMetadataResolver(timer, new OpenSaml3ResourceAdapter(resource));
@@ -209,7 +246,7 @@ public class Pvp2SProfileEndPointTest {
     httpReq.setParameter("SAMLRequest", b64);
             
     final org.springframework.core.io.Resource resource = resourceLoader.getResource(
-        "classpath:/data/metadata.xml");
+        "classpath:/data/metadata_valid.xml");
     Timer timer = new Timer("PVP metadata-resolver refresh");
     ResourceBackedMetadataResolver fileSystemResolver = 
         new ResourceBackedMetadataResolver(timer, new OpenSaml3ResourceAdapter(resource));