Merge branch 'master' into clarify-relaystate-parameter

Author: mauromol

core/src/main/java/com/onelogin/saml2/authn/SamlResponse.java

@@ -1022,6 +1022,17 @@ public String getError() {
 	public Exception getValidationException() {
 		return validationException;
 	}
+	
+	/**
+	 * Sets the validation exception that this {@link SamlResponse} should return
+	 * when a validation error occurs.
+	 * 
+	 * @param validationException
+	 *              the validation exception to set
+	 */
+	protected void setValidationException(Exception validationException) {
+		this.validationException = validationException;
+	}
 
 	/**
 	 * Extracts a node from the DOMDocument (Assertion).
@@ -1033,7 +1044,7 @@ public Exception getValidationException() {
 	 * @throws XPathExpressionException
 	 *
 	 */
-	private NodeList queryAssertion(String assertionXpath) throws XPathExpressionException {
+	protected NodeList queryAssertion(String assertionXpath) throws XPathExpressionException {
         final String assertionExpr = "/saml:Assertion";
         final String signatureExpr = "ds:Signature/ds:SignedInfo/ds:Reference";
 
@@ -1084,16 +1095,9 @@ private NodeList queryAssertion(String assertionXpath) throws XPathExpressionExc
      *
      * @return DOMNodeList The queried nodes
      */
-	private NodeList query(String nameQuery, Node context) throws XPathExpressionException {
-		Document doc;
-		if (encrypted) {
-			doc = decryptedDocument;
-		} else {
-        	doc = samlResponseDocument;
-		}
-
+	protected NodeList query(String nameQuery, Node context) throws XPathExpressionException {
 		// LOGGER.debug("Executing query " + nameQuery);
-		return Util.query(doc, nameQuery, context);
+		return Util.query(getSAMLResponseDocument(), nameQuery, context);
 	}
 
 	/**

core/src/main/java/com/onelogin/saml2/logout/LogoutRequest.java

@@ -117,10 +117,8 @@ public class LogoutRequest {
 	 *				The NameID NameQualifier that will be set in the LogoutRequest.
 	 * @param nameIdSPNameQualifier
 	 *				The SP Name Qualifier that will be set in the LogoutRequest.
-	 *
-	 * @throws XMLEntityException
 	 */
-	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex, String nameIdFormat, String nameIdNameQualifier, String nameIdSPNameQualifier) throws XMLEntityException {
+	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex, String nameIdFormat, String nameIdNameQualifier, String nameIdSPNameQualifier) {
 		this.settings = settings;
 		this.request = request;
 
@@ -163,10 +161,8 @@ public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId,
 	 *              The nameIdFormat that will be set in the LogoutRequest.
 	 * @param nameIdNameQualifier
 	 *				The NameID NameQualifier will be set in the LogoutRequest.
-	 *
-	 * @throws XMLEntityException
 	 */
-	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex, String nameIdFormat, String nameIdNameQualifier) throws XMLEntityException {
+	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex, String nameIdFormat, String nameIdNameQualifier) {
 		this(settings, request, nameId, sessionIndex, nameIdFormat, nameIdNameQualifier, null);
 	}
 
@@ -183,10 +179,8 @@ public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId,
 	 *              The SessionIndex (taken from the SAML Response in the SSO process).
 	 * @param nameIdFormat
 	 *              The nameIdFormat that will be set in the LogoutRequest.
-	 *
-	 * @throws XMLEntityException
 	 */
-	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex, String nameIdFormat) throws XMLEntityException {
+	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex, String nameIdFormat) {
 		this(settings, request, nameId, sessionIndex, nameIdFormat, null);
 	}
 
@@ -201,10 +195,8 @@ public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId,
 	 *              The NameID that will be set in the LogoutRequest.
 	 * @param sessionIndex
 	 *              The SessionIndex (taken from the SAML Response in the SSO process).
-	 *
-	 * @throws XMLEntityException
 	 */
-	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex) throws XMLEntityException {
+	public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId, String sessionIndex) {
 		this(settings, request, nameId, sessionIndex, null);
 	}
 
@@ -213,10 +205,8 @@ public LogoutRequest(Saml2Settings settings, HttpRequest request, String nameId,
 	 *
 	 * @param settings
 	 *            OneLogin_Saml2_Settings
-	 *
-	 * @throws XMLEntityException 
 	 */
-	public LogoutRequest(Saml2Settings settings) throws XMLEntityException {
+	public LogoutRequest(Saml2Settings settings) {
 		this(settings, null, null, null);
 	}
 
@@ -226,11 +216,9 @@ public LogoutRequest(Saml2Settings settings) throws XMLEntityException {
 	 * @param settings
 	 *            OneLogin_Saml2_Settings
 	 * @param request
-     *              the HttpRequest object to be processed (Contains GET and POST parameters, request URL, ...).
-     *
-	 * @throws XMLEntityException 
+       *              the HttpRequest object to be processed (Contains GET and POST parameters, request URL, ...).
 	 */
-	public LogoutRequest(Saml2Settings settings, HttpRequest request) throws XMLEntityException {
+	public LogoutRequest(Saml2Settings settings, HttpRequest request) {
 		this(settings, request, null, null);
 	}
 
@@ -358,14 +346,12 @@ private static StringBuilder getLogoutRequestTemplate() {
 		return template;
 	}
 
-	 /**
-     * Determines if the SAML LogoutRequest is valid or not
-     *
-     * @return true if the SAML LogoutRequest is valid
-     *
-	 * @throws Exception
-     */
-	public Boolean isValid() throws Exception {
+	/**
+       * Determines if the SAML LogoutRequest is valid or not
+       *
+       * @return true if the SAML LogoutRequest is valid
+       */
+	public Boolean isValid() {
 		validationException = null;
 
 		try {
@@ -758,6 +744,16 @@ public Exception getValidationException() {
 		return validationException;
 	}
 
+	/**
+	 * Sets the validation exception that this {@link LogoutRequest} should return
+	 * when a validation error occurs.
+	 * 
+	 * @param validationException
+	 *              the validation exception to set
+	 */
+	protected void setValidationException(Exception validationException) {
+		this.validationException = validationException;
+	}
 
 	/**
 	 * @return the ID of the Logout Request

core/src/main/java/com/onelogin/saml2/logout/LogoutResponse.java

@@ -338,14 +338,15 @@ public SamlResponseStatus getSamlResponseStatus() throws ValidationError
     }
 
 	/**
-     * Extracts nodes that match the query from the DOMDocument (Logout Response Menssage)
-     *
-     * @param query
-     *				Xpath Expression
-     *
-     * @return DOMNodeList The queried nodes
-     */
-	private NodeList query (String query) throws XPathExpressionException {
+       * Extracts nodes that match the query from the DOMDocument (Logout Response Menssage)
+       *
+       * @param query
+       *				Xpath Expression
+       *
+       * @return DOMNodeList The queried nodes
+	 * @throws XPathExpressionException 
+       */
+	protected NodeList query (String query) throws XPathExpressionException {
 		return Util.query(this.logoutResponseDocument, query, null);
 	}
 
@@ -475,4 +476,15 @@ public String getError() {
 	public Exception getValidationException() {
 		return validationException;
 	}
+	
+	/**
+	 * Sets the validation exception that this {@link LogoutResponse} should return
+	 * when a validation error occurs.
+	 * 
+	 * @param validationException
+	 *              the validation exception to set
+	 */
+	protected void setValidationException(Exception validationException) {
+		this.validationException = validationException;
+	}
 }