From a4d2498b7f94012cfdf481fcf151f8cfd7537a42 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 23 May 2011 16:46:09 -0400
Subject: [PATCH] User list. Revised home page. Updated Jetty. Secure cookies. Docs.
---
src/com/gitblit/GitBlitServlet.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/GitBlitServlet.java b/src/com/gitblit/GitBlitServlet.java
index cb23e47..f703cb2 100644
--- a/src/com/gitblit/GitBlitServlet.java
+++ b/src/com/gitblit/GitBlitServlet.java
@@ -42,16 +42,15 @@
if (forwardSlash > -1) {
String repository = url.substring(0, forwardSlash);
String function = url.substring(forwardSlash + 1);
- String query = req.getQueryString();
+ String query = req.getQueryString() == null ? "":req.getQueryString();
RepositoryModel model = GitBlit.self().getRepositoryModel(repository);
- if (model != null) {
- if (model.accessRestriction.atLeast(AccessRestrictionType.PUSH)) {
+ if (model != null) {
+ if (model.isFrozen || model.accessRestriction.atLeast(AccessRestrictionType.PUSH)) {
boolean authorizedUser = req.isUserInRole(repository);
if (function.startsWith("git-receive-pack") || (query.indexOf("service=git-receive-pack") > -1)) {
// Push request
- boolean pushRestricted = model.accessRestriction.atLeast(AccessRestrictionType.PUSH);
- if (!pushRestricted || (pushRestricted && authorizedUser)) {
- // push-unrestricted or push-authorized
+ if (!model.isFrozen && authorizedUser) {
+ // clone-restricted or push-authorized
super.service(req, rsp);
return;
} else {
@@ -64,7 +63,7 @@
// Clone request
boolean cloneRestricted = model.accessRestriction.atLeast(AccessRestrictionType.CLONE);
if (!cloneRestricted || (cloneRestricted && authorizedUser)) {
- // clone-unrestricted or clone-authorized
+ // push-restricted or clone-authorized
super.service(req, rsp);
return;
} else {
--
Gitblit v1.9.1