From 767eb537d28dccf73c78796b7d6dd27fe7073d66 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 18 Jun 2011 09:24:34 -0400
Subject: [PATCH] Don't show all credentials in debug log, only failures.

---
 src/com/gitblit/utils/StringUtils.java |   86 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index 4a9c88d..b53b5e1 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -18,9 +18,13 @@
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.PatternSyntaxException;
 
 public class StringUtils {
+
+	public static final String MD5_TYPE = "MD5:";
 
 	public static boolean isEmpty(String value) {
 		return value == null || value.trim().length() == 0;
@@ -46,6 +50,22 @@
 				retStr.append("&nbsp;");
 			} else if (changeSpace && inStr.charAt(i) == '\t') {
 				retStr.append(" &nbsp; &nbsp;");
+			} else {
+				retStr.append(inStr.charAt(i));
+			}
+			i++;
+		}
+		return retStr.toString();
+	}
+
+	public static String encodeURL(String inStr) {
+		StringBuffer retStr = new StringBuffer();
+		int i = 0;
+		while (i < inStr.length()) {
+			if (inStr.charAt(i) == '/') {
+				retStr.append("%2F");
+			} else if (inStr.charAt(i) == ' ') {
+				retStr.append("%20");
 			} else {
 				retStr.append(inStr.charAt(i));
 			}
@@ -114,24 +134,70 @@
 		try {
 			MessageDigest md = MessageDigest.getInstance("SHA-1");
 			md.update(bytes, 0, bytes.length);
-			byte[] sha1hash = md.digest();
-			StringBuilder sb = new StringBuilder(sha1hash.length * 2);
-			for (int i = 0; i < sha1hash.length; i++) {
-				if (((int) sha1hash[i] & 0xff) < 0x10) {
-					sb.append('0');
-				}
-				sb.append(Long.toString((int) sha1hash[i] & 0xff, 16));
-			}
-			return sb.toString();
+			byte[] digest = md.digest();
+			return toHex(digest);
 		} catch (NoSuchAlgorithmException t) {
 			throw new RuntimeException(t);
 		}
 	}
 
+	public static String getMD5(String string) {
+		try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			md.reset();
+			md.update(string.getBytes("iso-8859-1"));
+			byte[] digest = md.digest();
+			return toHex(digest);
+		} catch (UnsupportedEncodingException u) {
+			throw new RuntimeException(u);
+		} catch (NoSuchAlgorithmException t) {
+			throw new RuntimeException(t);
+		}
+	}
+
+	private static String toHex(byte[] bytes) {
+		StringBuilder sb = new StringBuilder(bytes.length * 2);
+		for (int i = 0; i < bytes.length; i++) {
+			if (((int) bytes[i] & 0xff) < 0x10) {
+				sb.append('0');
+			}
+			sb.append(Long.toString((int) bytes[i] & 0xff, 16));
+		}
+		return sb.toString();
+	}
+	
 	public static String getRootPath(String path) {
 		if (path.indexOf('/') > -1) {
-			return path.substring(0, path.indexOf('/'));
+			return path.substring(0, path.lastIndexOf('/'));
 		}
 		return "";
 	}
+
+	public static String getRelativePath(String basePath, String fullPath) {
+		String relativePath = fullPath.substring(basePath.length()).replace('\\', '/');
+		if (relativePath.charAt(0) == '/') {
+			relativePath = relativePath.substring(1);
+		}
+		return relativePath;
+	}
+
+	public static List<String> getStringsFromValue(String value) {
+		return getStringsFromValue(value, " ");
+	}
+
+	public static List<String> getStringsFromValue(String value, String separator) {
+		List<String> strings = new ArrayList<String>();
+		try {
+			String[] chunks = value.split(separator);
+			for (String chunk : chunks) {
+				chunk = chunk.trim();
+				if (chunk.length() > 0) {
+					strings.add(chunk);
+				}
+			}
+		} catch (PatternSyntaxException e) {
+			throw new RuntimeException(e);
+		}
+		return strings;
+	}
 }

--
Gitblit v1.9.1