From: James Moger <james.moger@gitblit.com>
Date: Fri, 5 Sep 2014 23:19:32 +0000 (-0400)
Subject: New forks shall respect the source repository access restriction
X-Git-Tag: v1.6.1~46^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Ftickets%2F67%2F167%2F1;p=gitblit.git

New forks shall respect the source repository access restriction

If the source repository access restriction exceeds the fork default (push)
then the fork shall inherit the source repository access restriction.
---

diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 98ad33e7..b9ae122f 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -216,6 +216,13 @@ public class GitblitManager implements IGitblit {
 		RepositoryModel cloneModel = repository.cloneAs(cloneName);
 		// owner has REWIND/RW+ permissions
 		cloneModel.addOwner(user.username);
+
+		// ensure initial access restriction of the fork
+		// is not lower than the source repository  (issue-495/ticket-167)
+		if (repository.accessRestriction.exceeds(cloneModel.accessRestriction)) {
+			cloneModel.accessRestriction = repository.accessRestriction;
+		}
+
 		repositoryManager.updateRepositoryModel(cloneName, cloneModel, false);
 
 		// add the owner of the source repository to the clone's access list