From 9f5a860d1ecaebb80530fc22607d34fc80d8c09d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Oct 2012 08:04:49 -0400
Subject: [PATCH] Fixed duplicate entries in repository cache (issue 140)
---
src/com/gitblit/models/UserModel.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 8349bab..dd41df0 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -20,6 +20,7 @@
import java.util.HashSet;
import java.util.Set;
+import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.utils.StringUtils;
@@ -35,6 +36,8 @@
private static final long serialVersionUID = 1L;
+ public static final UserModel ANONYMOUS = new UserModel();
+
// field names are reflectively mapped in EditUser page
public String username;
public String password;
@@ -42,6 +45,7 @@
public String displayName;
public String emailAddress;
public boolean canAdmin;
+ public boolean canFork;
public boolean excludeFromFederation;
public final Set<String> repositories = new HashSet<String>();
public final Set<TeamModel> teams = new HashSet<TeamModel>();
@@ -52,6 +56,11 @@
public UserModel(String username) {
this.username = username;
this.isAuthenticated = true;
+ }
+
+ private UserModel() {
+ this.username = "$anonymous";
+ this.isAuthenticated = false;
}
/**
@@ -83,6 +92,43 @@
}
return false;
}
+
+ public boolean canViewRepository(RepositoryModel repository) {
+ if (canAdmin) {
+ return true;
+ }
+ if (repository.accessRestriction.atLeast(AccessRestrictionType.VIEW)) {
+ return canAccessRepository(repository);
+ }
+ return true;
+ }
+
+ public boolean canForkRepository(RepositoryModel repository) {
+ if (canAdmin) {
+ return true;
+ }
+ if (!canFork) {
+ // user has been prohibited from forking
+ return false;
+ }
+ if (!isAuthenticated) {
+ // unauthenticated user model
+ return false;
+ }
+ if (("~" + username).equalsIgnoreCase(repository.projectPath)) {
+ // this repository is already a personal repository
+ return false;
+ }
+ if (!repository.allowForks) {
+ // repository prohibits forks
+ return false;
+ }
+ if (repository.accessRestriction.atLeast(AccessRestrictionType.CLONE)) {
+ return canAccessRepository(repository);
+ }
+ // repository is not clone-restricted
+ return true;
+ }
public boolean hasRepository(String name) {
return repositories.contains(name.toLowerCase());
--
Gitblit v1.9.1