From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 02 Oct 2011 16:59:44 -0400 Subject: [PATCH] Merge branch 'master' into rpc --- src/com/gitblit/GitFilter.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/GitFilter.java b/src/com/gitblit/GitFilter.java index 3011413..83e7ac8 100644 --- a/src/com/gitblit/GitFilter.java +++ b/src/com/gitblit/GitFilter.java @@ -61,7 +61,7 @@ * Analyze the url and returns the action of the request. Return values are * either "/git-receive-pack" or "/git-upload-pack". * - * @param url + * @param serverUrl * @return action of the request */ @Override @@ -106,11 +106,12 @@ // Git Servlet disabled return false; } - if (repository.isFrozen || repository.accessRestriction.atLeast(AccessRestrictionType.PUSH)) { + boolean readOnly = repository.isFrozen; + if (readOnly || repository.accessRestriction.atLeast(AccessRestrictionType.PUSH)) { boolean authorizedUser = user.canAccessRepository(repository.name); if (action.equals(gitReceivePack)) { // Push request - if (!repository.isFrozen && authorizedUser) { + if (!readOnly && authorizedUser) { // clone-restricted or push-authorized return true; } else { -- Gitblit v1.9.1