Update branch

Author: pitbulk

README.md

@@ -7,8 +7,7 @@ Version 2.0.0
 
 Not ready yet, it lacks documentation and not officially distributed.
 
-Unit test compatible with java6 / java7 (java8 experiences an issue with PowerMock)
-Make sure maven & your IDE uses this java version.
+Compatible with java6 / java7 / java8.
 
 ## TODOs
 

core/src/main/java/com/onelogin/saml2/util/Util.java

@@ -551,6 +551,80 @@ public static String convertToPem(X509Certificate certificate) {
 			LOGGER.debug("Error converting certificate on PEM format: "+ e.getMessage(), e);
 		}
 		return pemCert;
+	}	
+
+	/**
+	 * Redirect to location url
+	 * 
+	 * @param response
+	 * 				HttpServletResponse object to be used
+	 * @param location
+	 * 				target location url
+	 * @param parameters
+	 * 				GET parameters to be added
+	 *
+	 * @throws IOException
+	 *
+	 * @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
+	 */
+	public static void sendRedirect(HttpServletResponse response, String location, Map<String, String> parameters) throws IOException {
+		String target = location;
+
+		if (!parameters.isEmpty()) {
+			boolean first = !location.contains("?");
+			for (Map.Entry<String, String> parameter : parameters.entrySet())
+			{
+				if (first) {
+					target += "?";
+					first = false;
+				} else {
+					target += "&";
+				}
+				target += parameter.getKey();
+				if (!parameter.getValue().isEmpty()) {
+					target += "=" + Util.urlEncoder(parameter.getValue());
+				}
+			}
+		}
+		response.sendRedirect(target);
+	}
+
+	/**
+	 * Redirect to location url
+	 * 
+	 * @param response
+	 * 				HttpServletResponse object to be used
+	 * @param location
+	 * 				target location url
+	 *
+	 * @throws IOException
+	 *
+	 * @see javax.servlet.http.HttpServletResponse#sendRedirect(String)
+	 */
+	public static void sendRedirect(HttpServletResponse response, String location) throws IOException {
+		Map<String, String> parameters  =new HashMap<String, String>();
+		sendRedirect(response, location, parameters);
+	}
+	
+	
+	/**
+	 * Returns the protocol + the current host + the port (if different than
+	 * common ports).
+	 *
+	 * @param request 
+	 * 				HttpServletRequest object to be processed
+	 *
+	 * @return the HOST URL
+	 */
+	public static String getSelfURLhost(HttpServletRequest request) {
+		String hostUrl = StringUtils.EMPTY;
+		final int serverPort = request.getServerPort();
+		if ((serverPort == 80) || (serverPort == 443) || serverPort == 0) {
+			hostUrl = String.format("%s://%s", request.getScheme(), request.getServerName());
+		} else {
+			hostUrl = String.format("%s://%s:%s", request.getScheme(), request.getServerName(), serverPort);
+		}
+		return hostUrl;
 	}
 
 	/**

core/src/test/java/com/onelogin/saml2/test/util/UtilsTest.java

@@ -32,6 +32,7 @@
 import java.security.PrivateKey;
 import java.security.SignatureException;
 import java.security.spec.InvalidKeySpecException;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -1887,4 +1888,16 @@ public void testQuery() throws XPathExpressionException, URISyntaxException, IOE
 		Node assertion_2 = assertionNodes_2.item(0);
 		assertEquals("saml2:Assertion", assertion_2.getNodeName());
 	}
+
+	@Test
+	public void sendRedirectToShouldHandleUrlsWithQueryParams() throws Exception {
+		// having
+		final HttpServletResponse response = mock(HttpServletResponse.class);
+
+		// when
+		Util.sendRedirect(response, "https://sso.connect.pingidentity.com/sso/idp/SSO.saml2?idpid=ffee-aabbb", Collections.singletonMap("SAMLRequest", "data"));
+
+		// then
+		verify(response).sendRedirect("https://sso.connect.pingidentity.com/sso/idp/SSO.saml2?idpid=ffee-aabbb&SAMLRequest=data");
+	}
 }