Fixed missing format call for certificate authentication logging

James Moger

2012-11-28 579cdd4a691adbbe89f85ce679502cf5d1f045d0

 src/com/gitblit/client/EditUserDialog.java

@@ -27,8 +27,10 @@
import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Set;



import javax.swing.ImageIcon;

@@ -46,7 +48,11 @@
import javax.swing.KeyStroke;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.ServerSettings;

import com.gitblit.models.TeamModel;

@@ -80,10 +86,12 @@
   private JCheckBox canAdminCheckbox;

   

   private JCheckBox canForkCheckbox;

	
   private JCheckBox canCreateCheckbox;



   private JCheckBox notFederatedCheckbox;



   private JPalette<String> repositoryPalette;

   private RegistrantPermissionsPanel repositoryPalette;



   private JPalette<TeamModel> teamsPalette;



@@ -128,7 +136,8 @@
      displayNameField = new JTextField(anUser.displayName == null ? "" : anUser.displayName, 25);

      emailAddressField = new JTextField(anUser.emailAddress == null ? "" : anUser.emailAddress, 25);

      canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);      

      canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);		
      canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);

      canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), anUser.canCreate);

      notFederatedCheckbox = new JCheckBox(

            Translation.get("gb.excludeFromFederationDescription"),

            anUser.excludeFromFederation);

@@ -149,11 +158,12 @@
      fieldsPanel.add(newFieldPanel(Translation.get("gb.emailAddress"), emailAddressField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.canAdmin"), canAdminCheckbox));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.canFork"), canForkCheckbox));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.canCreate"), canCreateCheckbox));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.excludeFromFederation"),

            notFederatedCheckbox));



      final Insets _insets = new Insets(5, 5, 5, 5);

      repositoryPalette = new JPalette<String>();

      repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);

      teamsPalette = new JPalette<TeamModel>();

      teamsPalette.setEnabled(settings.supportsTeamMembershipChanges);



@@ -311,10 +321,12 @@


      user.canAdmin = canAdminCheckbox.isSelected();

      user.canFork = canForkCheckbox.isSelected();

      user.canCreate = canCreateCheckbox.isSelected();

      user.excludeFromFederation = notFederatedCheckbox.isSelected();



      user.repositories.clear();

      user.repositories.addAll(repositoryPalette.getSelections());

      for (RegistrantAccessPermission rp : repositoryPalette.getPermissions()) {

         user.setRepositoryPermission(rp.registrant, rp.permission);

      }



      user.teams.clear();

      user.teams.addAll(teamsPalette.getSelections());

@@ -333,18 +345,69 @@
      }

   }



   public void setRepositories(List<RepositoryModel> repositories, List<String> selected) {

   public void setRepositories(List<RepositoryModel> repositories, List<RegistrantAccessPermission> permissions) {

      Map<String, RepositoryModel> repoMap = new HashMap<String, RepositoryModel>();

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

      for (RepositoryModel repo : repositories) {

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

            restricted.add(repo.name);

         // exclude Owner or personal repositories

         if (!repo.isOwner(username) && !repo.isUsersPersonalRepository(username)) {

            if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)

                  && repo.authorizationControl.equals(AuthorizationControl.NAMED)) {

               restricted.add(repo.name);

            }				
         }

         repoMap.put(repo.name.toLowerCase(), repo);

      }

      StringUtils.sortRepositorynames(restricted);

      if (selected != null) {

         StringUtils.sortRepositorynames(selected);

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

      // repositories

      list.add(".*");

      // all repositories excluding personal repositories

      list.add("[^~].*");

      String lastProject = null;

      for (String repo : restricted) {

         String projectPath = StringUtils.getFirstPathElement(repo).toLowerCase();

         if (lastProject == null || !lastProject.equalsIgnoreCase(projectPath)) {

            lastProject = projectPath;

            if (!StringUtils.isEmpty(projectPath)) {

               // regex for all repositories within a project

               list.add(projectPath + "/.*");

            }

         }

         list.add(repo);

      }

      repositoryPalette.setObjects(restricted, selected);



      // remove repositories for which user already has a permission

      if (permissions == null) {

         permissions = new ArrayList<RegistrantAccessPermission>();

      } else {

         for (RegistrantAccessPermission rp : permissions) {

            list.remove(rp.registrant.toLowerCase());

         }

      }

		
      // update owner and missing permissions for editing

      for (RegistrantAccessPermission permission : permissions) {

         if (permission.mutable && 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 = repoMap.get(permission.registrant.toLowerCase());

            if (rm == null) {

               permission.permissionType = PermissionType.MISSING;

               permission.mutable = false;

               continue;

            }

            boolean isOwner = rm.isOwner(username);

            if (isOwner) {

               permission.permissionType = PermissionType.OWNER;

               permission.mutable = false;

            }

         }

      }



      repositoryPalette.setObjects(list, permissions);

   }



   public void setTeams(List<TeamModel> teams, List<TeamModel> selected) {