James Moger
2012-11-06 618d1691dc0003c8243942354d81dd35a195a94e
src/com/gitblit/ConfigUserService.java
@@ -840,16 +840,8 @@
         }
         config.setStringList(USER, model.username, ROLE, roles);
         // repository memberships
         if (model.permissions == null) {
            // null check on "final" repositories because JSON-sourced UserModel
            // can have a null repositories object
            if (!ArrayUtils.isEmpty(model.repositories)) {
               config.setStringList(USER, model.username, REPOSITORY, new ArrayList<String>(
                     model.repositories));
            }
         } else {
            // discrete repository permissions
         // discrete repository permissions
         if (model.permissions != null && !model.canAdmin) {
            List<String> permissions = new ArrayList<String>();
            for (Map.Entry<String, AccessPermission> entry : model.permissions.entrySet()) {
               if (entry.getValue().exceeds(AccessPermission.NONE)) {
@@ -862,23 +854,44 @@
      // write teams
      for (TeamModel model : teams.values()) {
         if (model.permissions == null) {
            // null check on "final" repositories because JSON-sourced TeamModel
            // can have a null repositories object
            if (!ArrayUtils.isEmpty(model.repositories)) {
               config.setStringList(TEAM, model.name, REPOSITORY, new ArrayList<String>(
                     model.repositories));
            }
         } else {
            // discrete repository permissions
            List<String> permissions = new ArrayList<String>();
            for (Map.Entry<String, AccessPermission> entry : model.permissions.entrySet()) {
               if (entry.getValue().exceeds(AccessPermission.NONE)) {
                  // code:repository (e.g. RW+:~james/myrepo.git
                  permissions.add(entry.getValue().asRole(entry.getKey()));
         // team roles
         List<String> roles = new ArrayList<String>();
         if (model.canAdmin) {
            roles.add(Constants.ADMIN_ROLE);
         }
         if (model.canFork) {
            roles.add(Constants.FORK_ROLE);
         }
         if (model.canCreate) {
            roles.add(Constants.CREATE_ROLE);
         }
         if (roles.size() == 0) {
            // we do this to ensure that team record is written.
            // Otherwise, StoredConfig might optimizes that record away.
            roles.add(Constants.NO_ROLE);
         }
         config.setStringList(TEAM, model.name, ROLE, roles);
         if (!model.canAdmin) {
            // write team permission for non-admin teams
            if (model.permissions == null) {
               // null check on "final" repositories because JSON-sourced TeamModel
               // can have a null repositories object
               if (!ArrayUtils.isEmpty(model.repositories)) {
                  config.setStringList(TEAM, model.name, REPOSITORY, new ArrayList<String>(
                        model.repositories));
               }
            } else {
               // discrete repository permissions
               List<String> permissions = new ArrayList<String>();
               for (Map.Entry<String, AccessPermission> entry : model.permissions.entrySet()) {
                  if (entry.getValue().exceeds(AccessPermission.NONE)) {
                     // code:repository (e.g. RW+:~james/myrepo.git
                     permissions.add(entry.getValue().asRole(entry.getKey()));
                  }
               }
               config.setStringList(TEAM, model.name, REPOSITORY, permissions);
            }
            config.setStringList(TEAM, model.name, REPOSITORY, permissions);
         }
         // null check on "final" users because JSON-sourced TeamModel
@@ -965,10 +978,13 @@
               user.excludeFromFederation = roles.contains(Constants.NOT_FEDERATED_ROLE);
               // repository memberships
               Set<String> repositories = new HashSet<String>(Arrays.asList(config
                     .getStringList(USER, username, REPOSITORY)));
               for (String repository : repositories) {
                  user.addRepositoryPermission(repository);
               if (!user.canAdmin) {
                  // non-admin, read permissions
                  Set<String> repositories = new HashSet<String>(Arrays.asList(config
                        .getStringList(USER, username, REPOSITORY)));
                  for (String repository : repositories) {
                     user.addRepositoryPermission(repository);
                  }
               }
               // update cache
@@ -982,8 +998,17 @@
            Set<String> teamnames = config.getSubsections(TEAM);
            for (String teamname : teamnames) {
               TeamModel team = new TeamModel(teamname);
               team.addRepositoryPermissions(Arrays.asList(config.getStringList(TEAM, teamname,
                     REPOSITORY)));
               Set<String> roles = new HashSet<String>(Arrays.asList(config.getStringList(
                     TEAM, teamname, ROLE)));
               team.canAdmin = roles.contains(Constants.ADMIN_ROLE);
               team.canFork = roles.contains(Constants.FORK_ROLE);
               team.canCreate = roles.contains(Constants.CREATE_ROLE);
               if (!team.canAdmin) {
                  // non-admin team, read permissions
                  team.addRepositoryPermissions(Arrays.asList(config.getStringList(TEAM, teamname,
                        REPOSITORY)));
               }
               team.addUsers(Arrays.asList(config.getStringList(TEAM, teamname, USER)));
               team.addMailingLists(Arrays.asList(config.getStringList(TEAM, teamname,
                     MAILINGLIST)));