diff options
| author | James Moger <james.moger@gitblit.com> | 2012-10-31 23:16:24 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-10-31 23:16:24 -0400 |
| commit | 644bdd5a59a5ed5fbf93a0765f92608b0530c16a (patch) | |
| tree | 011d6f9921cf2affcd720ace8a67c289bf1a6377 /src/com/gitblit/GitBlit.java | |
| parent | 2ea85bfe371215ef21fcd528bc40fa57c48ee698 (diff) | |
| download | gitblit-644bdd5a59a5ed5fbf93a0765f92608b0530c16a.tar.gz gitblit-644bdd5a59a5ed5fbf93a0765f92608b0530c16a.zip | |
Improve transparency of permissions by indicating permission source
Diffstat (limited to 'src/com/gitblit/GitBlit.java')
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 72 |
1 files changed, 25 insertions, 47 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 35451f62..a5d8b9e5 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -80,7 +80,6 @@ import com.gitblit.Constants.FederationRequest; import com.gitblit.Constants.FederationStrategy;
import com.gitblit.Constants.FederationToken;
import com.gitblit.Constants.PermissionType;
-import com.gitblit.Constants.RegistrantType;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
@@ -665,41 +664,22 @@ public class GitBlit implements ServletContextListener { }
/**
- * Returns the list of users and their access permissions for the specified repository.
+ * Returns the list of users and their access permissions for the specified
+ * repository including permission source information such as the team or
+ * regular expression which sets the permission.
*
* @param repository
- * @return a list of User-AccessPermission tuples
+ * @return a list of RegistrantAccessPermissions
*/
public List<RegistrantAccessPermission> getUserAccessPermissions(RepositoryModel repository) {
- Set<RegistrantAccessPermission> permissions = new LinkedHashSet<RegistrantAccessPermission>();
- if (!StringUtils.isEmpty(repository.owner)) {
- UserModel owner = userService.getUserModel(repository.owner);
- if (owner != null) {
- permissions.add(new RegistrantAccessPermission(owner.username, AccessPermission.REWIND, PermissionType.OWNER, RegistrantType.USER, false));
- }
- }
- if (repository.isPersonalRepository()) {
- UserModel owner = userService.getUserModel(repository.projectPath.substring(1));
- if (owner != null) {
- permissions.add(new RegistrantAccessPermission(owner.username, AccessPermission.REWIND, PermissionType.OWNER, RegistrantType.USER, false));
- }
- }
- for (String user : userService.getUsernamesForRepositoryRole(repository.name)) {
- UserModel model = userService.getUserModel(user);
- AccessPermission ap = model.getRepositoryPermission(repository);
- PermissionType pType = PermissionType.REGEX;
- boolean editable = false;
- if (repository.isOwner(model.username)) {
- pType = PermissionType.OWNER;
- } else if (repository.isUsersPersonalRepository(model.username)) {
- pType = PermissionType.OWNER;
- } else if (model.hasExplicitRepositoryPermission(repository.name)) {
- pType = PermissionType.EXPLICIT;
- editable = true;
- }
- permissions.add(new RegistrantAccessPermission(user, ap, pType, RegistrantType.USER, editable));
- }
- return new ArrayList<RegistrantAccessPermission>(permissions);
+ List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();
+ for (UserModel user : userService.getAllUsers()) {
+ RegistrantAccessPermission ap = user.getRepositoryPermission(repository);
+ if (ap.permission.exceeds(AccessPermission.NONE)) {
+ list.add(ap);
+ }
+ }
+ return list;
}
/**
@@ -823,25 +803,23 @@ public class GitBlit implements ServletContextListener { }
/**
- * Returns the list of teams and their access permissions for the specified repository.
+ * Returns the list of teams and their access permissions for the specified
+ * repository including the source of the permission such as the admin flag
+ * or a regular expression.
*
* @param repository
- * @return a list of Team-AccessPermission tuples
+ * @return a list of RegistrantAccessPermissions
*/
public List<RegistrantAccessPermission> getTeamAccessPermissions(RepositoryModel repository) {
- List<RegistrantAccessPermission> permissions = new ArrayList<RegistrantAccessPermission>();
- for (String team : userService.getTeamnamesForRepositoryRole(repository.name)) {
- TeamModel model = userService.getTeamModel(team);
- AccessPermission ap = model.getRepositoryPermission(repository);
- PermissionType pType = PermissionType.REGEX;
- boolean editable = false;
- if (model.hasExplicitRepositoryPermission(repository.name)) {
- pType = PermissionType.EXPLICIT;
- editable = true;
- }
- permissions.add(new RegistrantAccessPermission(team, ap, pType, RegistrantType.TEAM, editable));
- }
- return permissions;
+ List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();
+ for (TeamModel team : userService.getAllTeams()) {
+ RegistrantAccessPermission ap = team.getRepositoryPermission(repository);
+ if (ap.permission.exceeds(AccessPermission.NONE)) {
+ list.add(ap);
+ }
+ }
+ Collections.sort(list);
+ return list;
}
/**
|