From 3e44b65e329c199f95488f9429c1a20362c70b4d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 22 Oct 2012 08:55:44 -0400 Subject: [PATCH] Ensure illegal repository names are rejected in create-on-push --- src/com/gitblit/client/EditTeamDialog.java | 45 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/com/gitblit/client/EditTeamDialog.java b/src/com/gitblit/client/EditTeamDialog.java index 80e4160..4eb0729 100644 --- a/src/com/gitblit/client/EditTeamDialog.java +++ b/src/com/gitblit/client/EditTeamDialog.java @@ -33,6 +33,7 @@ import javax.swing.ImageIcon; import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JLabel; @@ -44,6 +45,7 @@ import javax.swing.KeyStroke; import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.models.RegistrantAccessPermission; import com.gitblit.models.RepositoryModel; import com.gitblit.models.ServerSettings; import com.gitblit.models.TeamModel; @@ -64,10 +66,16 @@ private boolean canceled = true; private JTextField teamnameField; + + private JCheckBox canAdminCheckbox; + + private JCheckBox canForkCheckbox; + + private JCheckBox canCreateCheckbox; private JTextField mailingListsField; - private JPalette<String> repositoryPalette; + private RegistrantPermissionsPanel repositoryPalette; private JPalette<String> userPalette; @@ -115,17 +123,26 @@ private void initialize(int protocolVersion, TeamModel aTeam) { teamnameField = new JTextField(aTeam.name == null ? "" : aTeam.name, 25); + canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), aTeam.canAdmin); + canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), aTeam.canFork); + canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), aTeam.canCreate); + mailingListsField = new JTextField(aTeam.mailingLists == null ? "" : StringUtils.flattenStrings(aTeam.mailingLists, " "), 50); JPanel fieldsPanel = new JPanel(new GridLayout(0, 1)); fieldsPanel.add(newFieldPanel(Translation.get("gb.teamName"), teamnameField)); + 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.mailingLists"), mailingListsField)); final Insets _insets = new Insets(5, 5, 5, 5); - repositoryPalette = new JPalette<String>(); + repositoryPalette = new RegistrantPermissionsPanel(); userPalette = new JPalette<String>(); - + userPalette.setEnabled(settings.supportsTeamMembershipChanges); + JPanel fieldsPanelTop = new JPanel(new BorderLayout()); fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH); @@ -245,6 +262,10 @@ } team.name = tname; + team.canAdmin = canAdminCheckbox.isSelected(); + team.canFork = canForkCheckbox.isSelected(); + team.canCreate = canCreateCheckbox.isSelected(); + String ml = mailingListsField.getText(); if (!StringUtils.isEmpty(ml)) { Set<String> list = new HashSet<String>(); @@ -258,8 +279,9 @@ team.mailingLists.addAll(list); } - team.repositories.clear(); - team.repositories.addAll(repositoryPalette.getSelections()); + for (RegistrantAccessPermission rp : repositoryPalette.getPermissions()) { + team.setRepositoryPermission(rp.registrant, rp.permission); + } team.users.clear(); team.users.addAll(userPalette.getSelections()); @@ -285,18 +307,21 @@ } } - public void setRepositories(List<RepositoryModel> repositories, List<String> selected) { + public void setRepositories(List<RepositoryModel> repositories, List<RegistrantAccessPermission> permissions) { List<String> restricted = new ArrayList<String>(); for (RepositoryModel repo : repositories) { if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)) { restricted.add(repo.name); } } - StringUtils.sortRepositorynames(restricted); - if (selected != null) { - StringUtils.sortRepositorynames(selected); + + // remove repositories for which team already has a permission + for (RegistrantAccessPermission rp : permissions) { + restricted.remove(rp.registrant); } - repositoryPalette.setObjects(restricted, selected); + + StringUtils.sortRepositorynames(restricted); + repositoryPalette.setObjects(restricted, permissions); } public void setUsers(List<String> users, List<String> selected) { -- Gitblit v1.9.1