Merge pull request #994 from KeDevServices/master

Fix for #993 LIST_BRANCHES without admin

1 files changed, 2 insertions, 13 deletions

diff --git a/src/main/java/com/gitblit/servlet/RpcFilter.java b/src/main/java/com/gitblit/servlet/RpcFilter.java
index 34474d55..355bcb96 100644
--- a/src/main/java/com/gitblit/servlet/RpcFilter.java
+++ b/src/main/java/com/gitblit/servlet/RpcFilter.java
@@ -128,7 +128,7 @@ public class RpcFilter extends AuthenticationFilter {
 				return;

 			} else {

 				// check user access for request

-				if (user.canAdmin() || canAccess(user, requestType)) {

+				if (user.canAdmin() || !adminRequest) {

 					// authenticated request permitted.

 					// pass processing to the restricted servlet.

 					newSession(authenticatedRequest, httpResponse);

@@ -153,15 +153,4 @@ public class RpcFilter extends AuthenticationFilter {
 		// pass processing to the restricted servlet.

 		chain.doFilter(authenticatedRequest, httpResponse);

 	}

-

-	private boolean canAccess(UserModel user, RpcRequest requestType) {

-		switch (requestType) {

-		case GET_PROTOCOL:

-			return true;

-		case LIST_REPOSITORIES:

-			return true;

-		default:

-			return user.canAdmin();

-		}

-	}

-}
\ No newline at end of file
+}