Per-repository authorization control: AUTHENTICATED and NAMED (issue 117)

2 files changed, 11 insertions, 1 deletions

diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 0e0c2df1..27196635 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;

 

 import com.gitblit.Constants.AccessRestrictionType;

+import com.gitblit.Constants.AuthorizationControl;

 import com.gitblit.Constants.FederationStrategy;

 import com.gitblit.utils.ArrayUtils;

 import com.gitblit.utils.StringUtils;

@@ -47,6 +48,8 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 	public boolean useTickets;

 	public boolean useDocs;

 	public AccessRestrictionType accessRestriction;

+	public AuthorizationControl authorizationControl;

+	public boolean allowAuthenticated;

 	public boolean isFrozen;

 	public boolean showReadme;

 	public FederationStrategy federationStrategy;

@@ -77,6 +80,7 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
 		this.owner = owner;

 		this.lastChange = lastchange;

 		this.accessRestriction = AccessRestrictionType.NONE;

+		this.authorizationControl = AuthorizationControl.NAMED;

 		this.federationSets = new ArrayList<String>();

 		this.federationStrategy = FederationStrategy.FEDERATE_THIS;		

 	}

diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 6632c611..8349bab6 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -20,6 +20,7 @@ import java.security.Principal;
 import java.util.HashSet;

 import java.util.Set;

 

+import com.gitblit.Constants.AuthorizationControl;

 import com.gitblit.utils.StringUtils;

 

 /**

@@ -45,8 +46,12 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 	public final Set<String> repositories = new HashSet<String>();

 	public final Set<TeamModel> teams = new HashSet<TeamModel>();

 

+	// non-persisted fields

+	public boolean isAuthenticated;

+	

 	public UserModel(String username) {

 		this.username = username;

+		this.isAuthenticated = true;

 	}

 

 	/**

@@ -65,8 +70,9 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 	public boolean canAccessRepository(RepositoryModel repository) {

 		boolean isOwner = !StringUtils.isEmpty(repository.owner)

 				&& repository.owner.equals(username);

+		boolean allowAuthenticated = isAuthenticated && AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl);

 		return canAdmin || isOwner || repositories.contains(repository.name.toLowerCase())

-				|| hasTeamAccess(repository.name);

+				|| hasTeamAccess(repository.name) || allowAuthenticated;

 	}

 

 	public boolean hasTeamAccess(String repositoryName) {