Fix previous merge

Author: pitbulk

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

@@ -9,19 +9,13 @@
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Key;
@@ -33,11 +27,8 @@
 import java.security.cert.X509Certificate;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Calendar;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.zip.Deflater;
@@ -553,80 +544,6 @@ public static String convertToPem(X509Certificate certificate) {
 		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;
-	}
-
 	/**
 	 * Loads a resource located at a relative path
 	 *

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

@@ -14,14 +14,12 @@
 import static org.junit.Assert.assertTrue;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
-import java.nio.file.Path;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -32,10 +30,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;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPathExpressionException;
@@ -1889,15 +1884,4 @@ public void testQuery() throws XPathExpressionException, URISyntaxException, IOE
 		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");
-	}
 }

toolkit/src/main/java/com/onelogin/saml2/servlet/ServletUtils.java

@@ -145,7 +145,7 @@ public static void sendRedirect(HttpServletResponse response, String location, M
         String target = location;
 
         if (!parameters.isEmpty()) {
-            Boolean first = true;
+        	boolean first = !location.contains("?");
             for (Map.Entry<String, String> parameter : parameters.entrySet())
             {
                 if (first) {

toolkit/src/test/java/com/onelogin/saml2/test/servlet/ServletUtilsTest.java

@@ -250,4 +250,16 @@ public void testMakeHttpRequest() throws Exception {
         assertThat(httpRequest.getRequestURL(), equalTo(url));
         assertThat(httpRequest.getParameters(), equalTo(singletonMap("name", singletonList("a"))));
     }
+
+	@Test
+	public void sendRedirectToShouldHandleUrlsWithQueryParams() throws Exception {
+		// having
+		final HttpServletResponse response = mock(HttpServletResponse.class);
+
+		// when
+		ServletUtils.sendRedirect(response, "https://sso.connect.pingidentity.com/sso/idp/SSO.saml2?idpid=ffee-aabbb", singletonMap("SAMLRequest", "data"));
+
+		// then
+		verify(response).sendRedirect("https://sso.connect.pingidentity.com/sso/idp/SSO.saml2?idpid=ffee-aabbb&SAMLRequest=data");
+	}
 }