Added null checkinng and logging for edit user permissions (issue 155)

James Moger

2012-10-30 a4231d30c4d2765c80f57df79cd1d4d39a9795ea

 src/com/gitblit/wicket/pages/EditUserPage.java

@@ -33,20 +33,22 @@
import org.apache.wicket.model.Model;

import org.apache.wicket.model.util.CollectionModel;

import org.apache.wicket.model.util.ListModel;

import org.slf4j.LoggerFactory;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.RepositoryAccessPermission;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.RepositoryPermissionsPanel;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;



@RequiresAdminRole

public class EditUserPage extends RootSubPage {

@@ -63,6 +65,7 @@
      isCreate = true;

      setupPage(new UserModel(""));

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   public EditUserPage(PageParameters params) {

@@ -73,6 +76,12 @@
      UserModel model = GitBlit.self().getUserModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

   }

	
   @Override

   protected boolean requiresPageMap() {

      return true;

   }



   protected void setupPage(final UserModel userModel) {

@@ -86,13 +95,9 @@
            StringUtils.isEmpty(userModel.password) ? "" : userModel.password);

      CompoundPropertyModel<UserModel> model = new CompoundPropertyModel<UserModel>(userModel);



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

      for (String repo : GitBlit.self().getRepositoryList()) {

         RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repo);

         if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

            repos.add(repo);

         }

      }

      // build list of projects including all repositories wildcards

      List<String> repos = getAccessRestrictedRepositoryList(true, userModel);

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

      for (TeamModel team : userModel.teams) {

         userTeams.add(team.name);

@@ -100,7 +105,24 @@
      Collections.sort(userTeams);

      

      final String oldName = userModel.username;

      final List<RepositoryAccessPermission> permissions = userModel.getRepositoryPermissions();

      final List<RegistrantAccessPermission> permissions = userModel.getRepositoryPermissions();

      for (RegistrantAccessPermission permission : permissions) {

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

            // Ensure this is NOT an owner permission - which is non-editable

            // We don't know this from within the usermodel, ownership is a

            // property of a repository.

            RepositoryModel rm = GitBlit.self().getRepositoryModel(permission.registrant);

            if (rm == null) {

               LoggerFactory.getLogger(getClass()).error("Missing repository " + permission.registrant, new NullPointerException());

               continue;

            }

            boolean isOwner = rm.isOwner(oldName);

            if (isOwner) {

               permission.permissionType = PermissionType.OWNER;

               permission.isEditable = false;

            }

         }

      }



      final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(

            new ArrayList<String>(userTeams)), new CollectionModel<String>(GitBlit.self()

@@ -171,8 +193,8 @@
            }



            // update user permissions

            for (RepositoryAccessPermission repositoryPermission : permissions) {

               userModel.setRepositoryPermission(repositoryPermission.repository, repositoryPermission.permission);

            for (RegistrantAccessPermission repositoryPermission : permissions) {

               userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

            }



            Iterator<String> selectedTeams = teams.getSelectedChoices();

@@ -234,7 +256,7 @@
      form.add(new CheckBox("canFork"));

      form.add(new CheckBox("canCreate"));

      form.add(new CheckBox("excludeFromFederation"));

      form.add(new RepositoryPermissionsPanel("repositories", permissions, getAccessPermissions()));

      form.add(new RegistrantPermissionsPanel("repositories",   RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));

      form.add(teams.setEnabled(editTeams));



      form.add(new Button("save"));