James Moger
2016-01-16 3d10bc669a9ba263c2e5884ac3e1a7eb4c2f11b6
Merge pull request #994 from KeDevServices/master

Fix for #993 LIST_BRANCHES without admin
1 files modified
15 ■■■■ changed files
src/main/java/com/gitblit/servlet/RpcFilter.java 15 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/servlet/RpcFilter.java
@@ -128,7 +128,7 @@
                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 @@
        // 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();
        }
    }
}
}