Merged and enhanced pull request #55 (disallow forks setting)

mschaefers

2012-12-04 428b2244aadeb4724e705044d73ac74be724f6e9

 src/com/gitblit/client/GitblitClient.java

@@ -28,18 +28,20 @@
import java.util.TreeSet;



import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlitException.ForbiddenException;

import com.gitblit.GitBlitException.NotAllowedException;

import com.gitblit.GitBlitException.UnauthorizedException;

import com.gitblit.GitBlitException.UnknownRequestException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.FederationModel;

import com.gitblit.models.FeedEntryModel;

import com.gitblit.models.FeedModel;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.ServerSettings;

import com.gitblit.models.ServerStatus;

@@ -339,6 +341,7 @@
      List<UserModel> users = RpcUtils.getUsers(url, account, password);

      allUsers.clear();

      allUsers.addAll(users);

      Collections.sort(users);

      return allUsers;

   }



@@ -346,6 +349,7 @@
      List<TeamModel> teams = RpcUtils.getTeams(url, account, password);

      allTeams.clear();

      allTeams.addAll(teams);

      Collections.sort(teams);

      return allTeams;

   }



@@ -474,6 +478,15 @@
   public List<UserModel> getUsers() {

      return allUsers;

   }

	
   public UserModel getUser(String username) {

      for (UserModel user : getUsers()) {

         if (user.username.equalsIgnoreCase(username)) {

            return user;

         }

      }

      return null;

   }



   public List<String> getUsernames() {

      List<String> usernames = new ArrayList<String>();

@@ -494,11 +507,61 @@
      return usernames;

   }

   

   /**

    * Returns the effective list of permissions for this user, taking into account

    * team memberships, ownerships.

    * 
    * @param user

    * @return the effective list of permissions for the user

    */

   public List<RegistrantAccessPermission> getUserAccessPermissions(UserModel user) {

      Set<RegistrantAccessPermission> set = new LinkedHashSet<RegistrantAccessPermission>();

      set.addAll(user.getRepositoryPermissions());

      // Flag missing repositories

      for (RegistrantAccessPermission permission : set) {

         if (permission.mutable && PermissionType.EXPLICIT.equals(permission.permissionType)) {

            RepositoryModel rm = getRepository(permission.registrant);

            if (rm == null) {

               permission.permissionType = PermissionType.MISSING;

               permission.mutable = false;

               continue;

            }

         }

      }



      // TODO reconsider ownership as a user property

      // manually specify personal repository ownerships

      for (RepositoryModel rm : allRepositories) {

         if (rm.isUsersPersonalRepository(user.username) || rm.isOwner(user.username)) {

            RegistrantAccessPermission rp = new RegistrantAccessPermission(rm.name, AccessPermission.REWIND,

                  PermissionType.OWNER, RegistrantType.REPOSITORY, null, false);

            // user may be owner of a repository to which they've inherited

            // a team permission, replace any existing perm with owner perm

            set.remove(rp);

            set.add(rp);

         }

      }

		
      List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>(set);

      Collections.sort(list);

      return list;

   }

	
   public List<RegistrantAccessPermission> getUserAccessPermissions(RepositoryModel repository) {

      List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();

      if (AccessRestrictionType.NONE.equals(repository.accessRestriction)) {

         // no permissions needed, REWIND for everyone!

         return list;

      }

      if (AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl)) {

         // no permissions needed, REWIND for authenticated!

         return list;

      }

      // NAMED users and teams

      for (UserModel user : allUsers) {

         if (user.hasRepositoryPermission(repository.name)) {

            list.add(new RegistrantAccessPermission(user.username, user.permissions.get(repository.name), RegistrantType.USER));

         RegistrantAccessPermission ap = user.getRepositoryPermission(repository);

         if (ap.permission.exceeds(AccessPermission.NONE)) {

            list.add(ap);

         }

      }

      return list;

@@ -534,10 +597,12 @@
   public List<RegistrantAccessPermission> getTeamAccessPermissions(RepositoryModel repository) {

      List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>();

      for (TeamModel team : allTeams) {

         if (team.hasRepositoryPermission(repository.name)) {

            list.add(new RegistrantAccessPermission(team.name, team.permissions.get(repository.name), RegistrantType.TEAM));

         RegistrantAccessPermission ap = team.getRepositoryPermission(repository);

         if (ap.permission.exceeds(AccessPermission.NONE)) {

            list.add(ap);

         }

      }

      Collections.sort(list);

      return list;

   }



@@ -561,6 +626,15 @@
   public List<RepositoryModel> getRepositories() {

      return allRepositories;

   }

	
   public RepositoryModel getRepository(String name) {

      for (RepositoryModel repository : allRepositories) {

         if (repository.name.equalsIgnoreCase(name)) {

            return repository;

         }

      }

      return null;

   }



   public boolean createRepository(RepositoryModel repository, List<RegistrantAccessPermission> userPermissions)

         throws IOException {