Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

1 files changed, 69 insertions, 57 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
index beceac57f..c602ad38a 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
@@ -1,57 +1,69 @@
-package eu.stork.peps.auth.engine.core.validator;

-

-import java.util.List;

-

-import org.opensaml.saml2.common.Extensions;

-import org.opensaml.saml2.core.SubjectQuery;

-import org.opensaml.xml.XMLObject;

-import org.opensaml.xml.util.DatatypeHelper;

-import org.opensaml.xml.validation.ValidationException;

-import org.opensaml.xml.validation.Validator;

-

-import eu.stork.peps.auth.engine.core.CustomAttributeQuery;

-import eu.stork.peps.auth.engine.core.QAAAttribute;

-

-public class CustomAttributeQueryValidator implements Validator<CustomAttributeQuery> {

-	

-	/*

-	 * Validate action.

-	 * 

-	 * @param qaa the quality authentication assurance level attribute

-	 * 

-	 * @throws ValidationException the validation exception

-	 */

-	public final void validate(final CustomAttributeQuery attrQuery) throws ValidationException {

-		validateAssertion(attrQuery);

-		validateSubject(attrQuery);

-		validateDestination(attrQuery);

-	}

-

-

-	/**

-	 * Validate assertion.

-	 * 

-	 * @param attrQuery the attribute query

-	 * 

-	 * @throws ValidationException the validation exception

-	 */

-	protected final void validateAssertion(final CustomAttributeQuery attrQuery)

-	throws ValidationException {

-		if (DatatypeHelper.isEmpty(attrQuery.getAssertionConsumerServiceURL())) {

-			throw new ValidationException("Consumer Service URL must be specified.");

-		}

-	}

-	

-	//Validate subject

-	protected void validateSubject(CustomAttributeQuery query) throws ValidationException {

-        if (query.getSubject() == null)

-            throw new ValidationException("Subject is required");

-    }

-	

-	//Validate destination

-	protected void validateDestination(CustomAttributeQuery query) throws ValidationException {

-        if (query.getDestination() == null)

-            throw new ValidationException("Destination is required");

-    }

-

-}

+package eu.stork.peps.auth.engine.core.validator;
+
+import org.opensaml.xml.util.DatatypeHelper;
+import org.opensaml.xml.validation.ValidationException;
+import org.opensaml.xml.validation.Validator;
+
+import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
+
+public class CustomAttributeQueryValidator implements Validator<CustomAttributeQuery> {
+	
+	/**
+	 * Validate action.
+	 * 
+	 * @param attrQuery the attribute query to validate
+	 * 
+	 * @throws ValidationException the validation exception
+	 */
+	public final void validate(final CustomAttributeQuery attrQuery) throws ValidationException {
+		validateAssertion(attrQuery);
+		validateSubject(attrQuery);
+		validateDestination(attrQuery);
+	}
+
+
+	/**
+	 * Validate assertion.
+	 * 
+	 * @param attrQuery the attribute query
+	 * 
+	 * @throws ValidationException the validation exception
+	 */
+	protected final void validateAssertion(final CustomAttributeQuery attrQuery)
+	throws ValidationException {
+		if (DatatypeHelper.isEmpty(attrQuery.getAssertionConsumerServiceURL())) {
+			throw new ValidationException("Consumer Service URL must be specified.");
+		}
+	}
+	
+	/**
+	 * Validate subject
+	 * @param query the attribute query to validate
+	 * @throws ValidationException the validation exception
+	 */ 
+	protected void validateSubject(CustomAttributeQuery query) throws ValidationException {
+        if (query.getSubject() == null)
+            throw new ValidationException("Subject is required");
+    }
+	
+	/**
+	 * Validate the destination
+	 * @param query the query to validate
+	 * @throws ValidationException the validation exception
+	 */
+	protected void validateDestination(CustomAttributeQuery query) throws ValidationException {
+        if (query.getDestination() == null)
+            throw new ValidationException("Destination is required");
+    }
+	
+	/**
+	 * Validate the destination
+	 * @param query the query to validate
+	 * @throws ValidationException the validation exception
+	 */
+	protected void validateTime(CustomAttributeQuery query) throws ValidationException {
+        if (query.getIssueInstant().isAfterNow())
+            throw new ValidationException("Issue time is in the futue");
+    }
+
+}