ConfigWebTool Version 0.9.5

 --PVP2 Login
 --PVP2 Users to UserDatabase functionality
 --Mailaddress verification
 --Mail status messages to users and admin
 --add List with OpenRequests for admins
 --change OA Target configuration
 --add cleanUp Thread to remove old unused UserAccount requests
 --update UserDatabase to support PVP2 logins
 --add formID element validate received forms

 -- add first classes for STORK configuration

make some Bugfixes

1 files changed, 52 insertions, 10 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index 4a1ef9261..e6ff0a166 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -1,15 +1,22 @@
 package at.gv.egovernment.moa.id.configuration.validation.oa;
 
 import java.io.IOException;
+import java.net.URL;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
+import org.opensaml.saml2.metadata.provider.MetadataFilter;
+import org.opensaml.saml2.metadata.provider.MetadataProviderException;
+import org.opensaml.xml.parse.BasicParserPool;
 
 import at.gv.egovernment.moa.id.configuration.data.oa.OAPVP2Config;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.id.protocols.pvp2x.verification.MetadataSignatureFilter;
+import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 public class OAPVP2ConfigValidation {
@@ -19,24 +26,59 @@ public class OAPVP2ConfigValidation {
 	public List<String> validate(OAPVP2Config form) {
 		
 		List<String> errors = new ArrayList<String>();
-		
-		String url = form.getMetaDataURL();
-		if (MiscUtil.isNotEmpty(url) && !ValidationHelper.validateURL(url)) {
-			log.info("MetaDataURL has no valid form.");
-			errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.valid"));
-		}
-		
 		try {
+			byte[] metadata = null;
+			byte[] cert = null;
+			
+			String check = form.getMetaDataURL();
+			if (MiscUtil.isNotEmpty(check)) {
+				if (!ValidationHelper.validateURL(check)) {
+					log.info("MetaDataURL has no valid form.");
+					errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.valid"));
+				
+				} else {
+					metadata = FileUtils.readURL(check);
+					if (MiscUtil.isEmpty(metadata)) {
+						log.info("Filecontent can not be read form MetaDataURL.");
+						errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read"));
+					}
+				}
+			}
+		
 			if (form.getFileUpload() != null)
-				form.getCertificate();
+				cert  = form.getCertificate();
+			
+//			else {
+//				if (metadata != null) {
+//					log.info("No certificate to verify the Metadata defined.");
+//					errors.add(LanguageHelper.getErrorString("validation.pvp2.certificate.notfound"));
+//				}
+//			}
+			
+//			if (cert != null && metadata != null) {
+//				HTTPMetadataProvider httpProvider = new HTTPMetadataProvider(
+//						check, 20000);
+//				httpProvider.setParserPool(new BasicParserPool());
+//				httpProvider.setRequireValidMetadata(true);
+//				MetadataFilter filter = new MetadataSignatureFilter(
+//						check, cert);
+//				httpProvider.setMetadataFilter(filter);
+//				httpProvider.initialize();
+//				
+//			}
+			
 			
 		} catch (CertificateException e) {
 			log.info("Uploaded Certificate can not be found", e);
 			errors.add(LanguageHelper.getErrorString("validation.pvp2.certificate.notfound"));
 			
 		} catch (IOException e) {
-			log.info("Uploaded Certificate can not be parsed", e);
-			errors.add(LanguageHelper.getErrorString("validation.pvp2.certificate.format"));
+			log.info("Metadata can not be loaded from URL", e);
+			errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read"));
+			
+//		} catch (MetadataProviderException e) {
+//			log.info("MetaDate verification failed");
+//			errors.add(LanguageHelper.getErrorString("validation.pvp2.metadata.verify"));
 		}
 		
 		return errors;