From 2987f602e112d37ff7db522c3cd9e653847a9865 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 06 Aug 2012 17:34:44 -0400
Subject: [PATCH] Restore original team or user object on failure to update (issue 118)

---
 src/com/gitblit/models/UserModel.java |   89 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index aeeecf4..8349bab 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -17,8 +17,11 @@
 
 import java.io.Serializable;
 import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.utils.StringUtils;
 
 /**
  * UserModel is a serializable model class that represents a user and the user's
@@ -28,35 +31,111 @@
  * @author James Moger
  * 
  */
-public class UserModel implements Principal, Serializable {
+public class UserModel implements Principal, Serializable, Comparable<UserModel> {
 
 	private static final long serialVersionUID = 1L;
 
 	// field names are reflectively mapped in EditUser page
 	public String username;
 	public String password;
+	public String cookie;
+	public String displayName;
+	public String emailAddress;
 	public boolean canAdmin;
-	public final List<String> repositories = new ArrayList<String>();
+	public boolean excludeFromFederation;
+	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;
 	}
 
+	/**
+	 * This method does not take into consideration Ownership where the
+	 * administrator has not explicitly granted access to the owner.
+	 * 
+	 * @param repositoryName
+	 * @return
+	 */
+	@Deprecated
 	public boolean canAccessRepository(String repositoryName) {
-		return canAdmin || repositories.contains(repositoryName.toLowerCase());
+		return canAdmin || repositories.contains(repositoryName.toLowerCase())
+				|| hasTeamAccess(repositoryName);
+	}
+
+	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) || allowAuthenticated;
+	}
+
+	public boolean hasTeamAccess(String repositoryName) {
+		for (TeamModel team : teams) {
+			if (team.hasRepository(repositoryName)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean hasRepository(String name) {
+		return repositories.contains(name.toLowerCase());
 	}
 
 	public void addRepository(String name) {
 		repositories.add(name.toLowerCase());
 	}
 
+	public void removeRepository(String name) {
+		repositories.remove(name.toLowerCase());
+	}
+
+	public boolean isTeamMember(String teamname) {
+		for (TeamModel team : teams) {
+			if (team.name.equalsIgnoreCase(teamname)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public TeamModel getTeam(String teamname) {
+		if (teams == null) {
+			return null;
+		}
+		for (TeamModel team : teams) {
+			if (team.name.equalsIgnoreCase(teamname)) {
+				return team;
+			}
+		}
+		return null;
+	}
+
 	@Override
 	public String getName() {
 		return username;
+	}
+	
+	public String getDisplayName() {
+		if (StringUtils.isEmpty(displayName)) {
+			return username;
+		}
+		return displayName;
 	}
 
 	@Override
 	public String toString() {
 		return username;
 	}
+
+	@Override
+	public int compareTo(UserModel o) {
+		return username.compareTo(o.username);
+	}
 }

--
Gitblit v1.9.1