Merge branch 'ticket/100' into release-v1.6.0

2 files changed, 3 insertions, 9 deletions

diff --git a/src/main/java/com/gitblit/servlet/AuthenticationFilter.java b/src/main/java/com/gitblit/servlet/AuthenticationFilter.java
index 5710a4af..c21f8692 100644
--- a/src/main/java/com/gitblit/servlet/AuthenticationFilter.java
+++ b/src/main/java/com/gitblit/servlet/AuthenticationFilter.java
@@ -16,8 +16,6 @@
 package com.gitblit.servlet;

 

 import java.io.IOException;

-import java.io.UnsupportedEncodingException;

-import java.net.URLDecoder;

 import java.security.Principal;

 import java.util.Enumeration;

 import java.util.HashMap;

@@ -103,12 +101,6 @@ public abstract class AuthenticationFilter extends DaggerFilter {
 			url = url.substring(1);

 		}

 		String fullUrl = url + (StringUtils.isEmpty(params) ? "" : ("?" + params));

-		try {

-			fullUrl = URLDecoder.decode(fullUrl, "UTF-8");

-		} catch (UnsupportedEncodingException e) {

-			logger.warn("UTF-8 decoding of URL failed: "+fullUrl, e);

-			e.printStackTrace();

-		}

 		return fullUrl;

 	}

 

diff --git a/src/main/java/com/gitblit/utils/StringUtils.java b/src/main/java/com/gitblit/utils/StringUtils.java
index d7e1ea3d..087de543 100644
--- a/src/main/java/com/gitblit/utils/StringUtils.java
+++ b/src/main/java/com/gitblit/utils/StringUtils.java
@@ -129,6 +129,8 @@ public class StringUtils {
 				retStr.append("%20");

 			} else if (inStr.charAt(i) == '&') {

 				retStr.append("%26");

+			} else if (inStr.charAt(i) == '+') {

+				retStr.append("%2B");

 			} else {

 				retStr.append(inStr.charAt(i));

 			}

@@ -398,7 +400,7 @@ public class StringUtils {
 	 * @return the first invalid character found or null if string is acceptable

 	 */

 	public static Character findInvalidCharacter(String name) {

-		char[] validChars = { '/', '.', '_', '-', '~' };

+		char[] validChars = { '/', '.', '_', '-', '~', '+' };

 		for (char c : name.toCharArray()) {

 			if (!Character.isLetterOrDigit(c)) {

 				boolean ok = false;