From 699e71e76b15081baf746c6ce9c9144f7e5f1ff9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 09:30:04 -0400
Subject: Trim trailing whitespace and organize imports

Change-Id: I9f91138b20219be6e3c4b28251487df262bff6cc
---
 src/main/java/com/gitblit/utils/HttpUtils.java | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/main/java/com/gitblit/utils/HttpUtils.java')

diff --git a/src/main/java/com/gitblit/utils/HttpUtils.java b/src/main/java/com/gitblit/utils/HttpUtils.java
index 86f53cfe..ffea81cd 100644
--- a/src/main/java/com/gitblit/utils/HttpUtils.java
+++ b/src/main/java/com/gitblit/utils/HttpUtils.java
@@ -30,15 +30,15 @@ import com.gitblit.utils.X509Utils.X509Metadata;
 
 /**
  * Collection of utility methods for http requests.
- * 
+ *
  * @author James Moger
- * 
+ *
  */
 public class HttpUtils {
 
 	/**
 	 * Returns the Gitblit URL based on the request.
-	 * 
+	 *
 	 * @param request
 	 * @return the host url
 	 */
@@ -59,7 +59,7 @@ public class HttpUtils {
         	} catch (Throwable t) {
         	}
         }
-        
+
 		// try to use reverse-proxy server's scheme
         String forwardedScheme = request.getHeader("X-Forwarded-Proto");
         if (StringUtils.isEmpty(forwardedScheme)) {
@@ -68,7 +68,7 @@ public class HttpUtils {
         if (!StringUtils.isEmpty(forwardedScheme)) {
         	// reverse-proxy server has supplied the original scheme
         	scheme = forwardedScheme;
-        	
+
         	if ("https".equals(scheme) && port == 80) {
         		// proxy server is https, inside server is 80
         		// this is likely because the proxy server has not supplied
@@ -77,7 +77,7 @@ public class HttpUtils {
         		port = 443;
         	}
         }
-        
+
         String context = request.getContextPath();
         String forwardedContext = request.getHeader("X-Forwarded-Context");
         if (forwardedContext != null) {
@@ -86,12 +86,12 @@ public class HttpUtils {
         if (!StringUtils.isEmpty(forwardedContext)) {
         	context = forwardedContext;
         }
-        
+
         // trim any trailing slash
         if (context.length() > 0 && context.charAt(context.length() - 1) == '/') {
         	context = context.substring(1);
         }
-        
+
 		StringBuilder sb = new StringBuilder();
 		sb.append(scheme);
 		sb.append("://");
@@ -103,11 +103,11 @@ public class HttpUtils {
 		sb.append(context);
 		return sb.toString();
 	}
-	
+
 	/**
 	 * Returns a user model object built from attributes in the SSL certificate.
 	 * This model is not retrieved from the user service.
-	 *  
+	 *
 	 * @param httpRequest
 	 * @param checkValidity ensure certificate can be used now
 	 * @param usernameOIDs if unspecified, CN is used as the username
@@ -136,7 +136,7 @@ public class HttpUtils {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Creates a UserModel from a certificate
 	 * @param cert
@@ -145,16 +145,16 @@ public class HttpUtils {
 	 */
 	public static UserModel getUserModelFromCertificate(X509Certificate cert, String... usernameOIDs) {
 		X509Metadata metadata = X509Utils.getMetadata(cert);
-		
+
 		UserModel user = new UserModel(metadata.commonName);
 		user.emailAddress = metadata.emailAddress;
 		user.isAuthenticated = false;
-		
+
 		if (usernameOIDs == null || usernameOIDs.length == 0) {
 			// use default usename<->CN mapping
 			usernameOIDs = new String [] { "CN" };
 		}
-		
+
 		// determine username from OID fingerprint
 		StringBuilder an = new StringBuilder();
 		for (String oid : usernameOIDs) {
@@ -163,10 +163,10 @@ public class HttpUtils {
 				an.append(val).append(' ');
 			}
 		}
-		user.username = an.toString().trim();		
+		user.username = an.toString().trim();
 		return user;
 	}
-	
+
 	public static X509Metadata getCertificateMetadata(HttpServletRequest httpRequest) {
 		if (httpRequest.getAttribute("javax.servlet.request.X509Certificate") != null) {
 			X509Certificate[] certChain = (X509Certificate[]) httpRequest
@@ -178,7 +178,7 @@ public class HttpUtils {
 		}
 		return null;
 	}
-	
+
 	public static boolean isIpAddress(String address) {
 		if (StringUtils.isEmpty(address)) {
 			return false;
-- 
cgit v1.2.3