From 5c1ae2385f9e6c0c2050e5b0cb505d25bdbe27e0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 17:21:20 -0400
Subject: [PATCH] Delete the test user account as part of cleanup.
---
src/com/gitblit/models/UserModel.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 797c14e..0d88ce2 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -16,10 +16,19 @@
package com.gitblit.models;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
-public class UserModel implements Serializable {
+/**
+ * UserModel is a serializable model class that represents a user and the user's
+ * restricted repository memberships. Instances of UserModels are also used as
+ * servlet user principals.
+ *
+ * @author James Moger
+ *
+ */
+public class UserModel implements Principal, Serializable {
private static final long serialVersionUID = 1L;
@@ -27,19 +36,15 @@
public String username;
public String password;
public boolean canAdmin;
- public final List<String> repositories = new ArrayList<String>();
+ public boolean excludeFromFederation;
+ public final Set<String> repositories = new HashSet<String>();
public UserModel(String username) {
this.username = username;
}
public boolean canAccessRepository(String repositoryName) {
- return canAdmin || repositories.contains(repositoryName);
- }
-
- public void setRepositories(List<String> repositories) {
- this.repositories.clear();
- this.repositories.addAll(repositories);
+ return canAdmin || repositories.contains(repositoryName.toLowerCase());
}
public void addRepository(String name) {
@@ -47,6 +52,11 @@
}
@Override
+ public String getName() {
+ return username;
+ }
+
+ @Override
public String toString() {
return username;
}
--
Gitblit v1.9.1