From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/client/EditRepositoryDialog.java | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 260 insertions(+), 28 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 49d9047..ebc540f 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -24,8 +24,15 @@
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import javax.swing.DefaultComboBoxModel;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
@@ -36,13 +43,16 @@
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JRootPane;
+import javax.swing.JTabbedPane;
import javax.swing.JTextField;
+import javax.swing.KeyStroke;
import javax.swing.ListCellRenderer;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationStrategy;
import com.gitblit.models.RepositoryModel;
-import com.gitblit.models.UserModel;
+import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -54,7 +64,11 @@
private static final long serialVersionUID = 1L;
+ private final String repositoryName;
+
private final RepositoryModel repository;
+
+ private boolean isCreate;
private boolean canceled = true;
@@ -70,48 +84,77 @@
private JCheckBox showReadme;
+ private JCheckBox skipSizeCalculation;
+
+ private JCheckBox skipSummaryMetrics;
+
private JCheckBox isFrozen;
+
+ private JTextField mailingListsField;
private JComboBox accessRestriction;
private JComboBox federationStrategy;
- private JComboBox owner;
+ private JComboBox ownerField;
private JPalette<String> usersPalette;
private JPalette<String> setsPalette;
- public EditRepositoryDialog(List<UserModel> allusers) {
- this(new RepositoryModel(), allusers);
+ private JPalette<String> teamsPalette;
+
+ private JPalette<String> preReceivePalette;
+
+ private JLabel preReceiveInherited;
+
+ private JPalette<String> postReceivePalette;
+
+ private JLabel postReceiveInherited;
+
+ private Set<String> repositoryNames;
+
+ public EditRepositoryDialog(int protocolVersion) {
+ this(protocolVersion, new RepositoryModel());
+ this.isCreate = true;
setTitle(Translation.get("gb.newRepository"));
}
- public EditRepositoryDialog(RepositoryModel aRepository, List<UserModel> allUsers) {
+ public EditRepositoryDialog(int protocolVersion, RepositoryModel aRepository) {
super();
+ this.repositoryName = aRepository.name;
this.repository = new RepositoryModel();
- initialize(aRepository, allUsers);
+ this.repositoryNames = new HashSet<String>();
+ this.isCreate = false;
+ initialize(protocolVersion, aRepository);
setModal(true);
+ setResizable(false);
setTitle(Translation.get("gb.edit") + ": " + aRepository.name);
setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());
}
- private void initialize(RepositoryModel anRepository, List<UserModel> allUsers) {
+ @Override
+ protected JRootPane createRootPane() {
+ KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
+ JRootPane rootPane = new JRootPane();
+ rootPane.registerKeyboardAction(new ActionListener() {
+ public void actionPerformed(ActionEvent actionEvent) {
+ setVisible(false);
+ }
+ }, stroke, JComponent.WHEN_IN_FOCUSED_WINDOW);
+ return rootPane;
+ }
+
+ private void initialize(int protocolVersion, RepositoryModel anRepository) {
nameField = new JTextField(anRepository.name == null ? "" : anRepository.name, 35);
descriptionField = new JTextField(anRepository.description == null ? ""
: anRepository.description, 35);
- owner = new JComboBox(allUsers.toArray());
- if (!StringUtils.isEmpty(anRepository.owner)) {
- UserModel currentOwner = null;
- for (UserModel user : allUsers) {
- if (user.username.equalsIgnoreCase(anRepository.owner)) {
- currentOwner = user;
- break;
- }
- }
- owner.setSelectedItem(currentOwner);
- }
+ JTextField originField = new JTextField(anRepository.origin == null ? ""
+ : anRepository.origin, 40);
+ originField.setEditable(false);
+
+ ownerField = new JComboBox();
useTickets = new JCheckBox(Translation.get("gb.useTicketsDescription"),
anRepository.useTickets);
@@ -120,33 +163,58 @@
anRepository.showRemoteBranches);
showReadme = new JCheckBox(Translation.get("gb.showReadmeDescription"),
anRepository.showReadme);
+ skipSizeCalculation = new JCheckBox(Translation.get("gb.skipSizeCalculationDescription"),
+ anRepository.skipSizeCalculation);
+ skipSummaryMetrics = new JCheckBox(Translation.get("gb.skipSummaryMetricsDescription"),
+ anRepository.skipSummaryMetrics);
isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"), anRepository.isFrozen);
+
+ mailingListsField = new JTextField(ArrayUtils.isEmpty(anRepository.mailingLists) ? ""
+ : StringUtils.flattenStrings(anRepository.mailingLists, " "), 50);
accessRestriction = new JComboBox(AccessRestrictionType.values());
accessRestriction.setRenderer(new AccessRestrictionRenderer());
accessRestriction.setSelectedItem(anRepository.accessRestriction);
- federationStrategy = new JComboBox(FederationStrategy.values());
+ // federation strategies - remove ORIGIN choice if this repository has
+ // no origin.
+ List<FederationStrategy> federationStrategies = new ArrayList<FederationStrategy>(
+ Arrays.asList(FederationStrategy.values()));
+ if (StringUtils.isEmpty(anRepository.origin)) {
+ federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);
+ }
+ federationStrategy = new JComboBox(federationStrategies.toArray());
federationStrategy.setRenderer(new FederationStrategyRenderer());
federationStrategy.setSelectedItem(anRepository.federationStrategy);
JPanel fieldsPanel = new JPanel(new GridLayout(0, 1));
fieldsPanel.add(newFieldPanel(Translation.get("gb.name"), nameField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.description"), descriptionField));
- fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), owner));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.origin"), originField));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"), useTickets));
fieldsPanel.add(newFieldPanel(Translation.get("gb.enableDocs"), useDocs));
fieldsPanel
.add(newFieldPanel(Translation.get("gb.showRemoteBranches"), showRemoteBranches));
fieldsPanel.add(newFieldPanel(Translation.get("gb.showReadme"), showReadme));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.skipSizeCalculation"),
+ skipSizeCalculation));
+ fieldsPanel
+ .add(newFieldPanel(Translation.get("gb.skipSummaryMetrics"), skipSummaryMetrics));
fieldsPanel.add(newFieldPanel(Translation.get("gb.isFrozen"), isFrozen));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"), mailingListsField));
usersPalette = new JPalette<String>();
JPanel accessPanel = new JPanel(new BorderLayout(5, 5));
accessPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"), accessRestriction),
BorderLayout.NORTH);
accessPanel.add(newFieldPanel(Translation.get("gb.permittedUsers"), usersPalette),
+ BorderLayout.CENTER);
+
+ teamsPalette = new JPalette<String>();
+ JPanel teamsPanel = new JPanel(new BorderLayout(5, 5));
+ teamsPanel.add(newFieldPanel(Translation.get("gb.permittedTeams"), teamsPalette),
BorderLayout.CENTER);
setsPalette = new JPalette<String>();
@@ -157,10 +225,27 @@
federationPanel.add(newFieldPanel(Translation.get("gb.federationSets"), setsPalette),
BorderLayout.CENTER);
- JPanel panel = new JPanel(new BorderLayout(5, 5));
- panel.add(fieldsPanel, BorderLayout.NORTH);
- panel.add(accessPanel, BorderLayout.CENTER);
- panel.add(federationPanel, BorderLayout.SOUTH);
+ preReceivePalette = new JPalette<String>(true);
+ preReceiveInherited = new JLabel();
+ JPanel preReceivePanel = new JPanel(new BorderLayout(5, 5));
+ preReceivePanel.add(preReceivePalette, BorderLayout.CENTER);
+ preReceivePanel.add(preReceiveInherited, BorderLayout.WEST);
+
+ postReceivePalette = new JPalette<String>(true);
+ postReceiveInherited = new JLabel();
+ JPanel postReceivePanel = new JPanel(new BorderLayout(5, 5));
+ postReceivePanel.add(postReceivePalette, BorderLayout.CENTER);
+ postReceivePanel.add(postReceiveInherited, BorderLayout.WEST);
+
+ JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);
+ panel.addTab(Translation.get("gb.general"), fieldsPanel);
+ panel.addTab(Translation.get("gb.accessRestriction"), accessPanel);
+ if (protocolVersion >= 2) {
+ panel.addTab(Translation.get("gb.teams"), teamsPanel);
+ }
+ panel.addTab(Translation.get("gb.federation"), federationPanel);
+ panel.addTab(Translation.get("gb.preReceiveScripts"), preReceivePanel);
+ panel.addTab(Translation.get("gb.postReceiveScripts"), postReceivePanel);
JButton createButton = new JButton(Translation.get("gb.save"));
createButton.addActionListener(new ActionListener() {
@@ -200,7 +285,7 @@
getContentPane().setLayout(new BorderLayout(5, 5));
getContentPane().add(centerPanel, BorderLayout.CENTER);
pack();
- setLocationRelativeTo(null);
+ nameField.requestFocus();
}
private JPanel newFieldPanel(String label, JComponent comp) {
@@ -214,21 +299,160 @@
}
private boolean validateFields() {
- // TODO validate input and populate model
+ String rname = nameField.getText();
+ if (StringUtils.isEmpty(rname)) {
+ error("Please enter a repository name!");
+ return false;
+ }
+
+ // automatically convert backslashes to forward slashes
+ rname = rname.replace('\\', '/');
+ // Automatically replace // with /
+ rname = rname.replace("//", "/");
+
+ // prohibit folder paths
+ if (rname.startsWith("/")) {
+ error("Leading root folder references (/) are prohibited.");
+ return false;
+ }
+ if (rname.startsWith("../")) {
+ error("Relative folder references (../) are prohibited.");
+ return false;
+ }
+ if (rname.contains("/../")) {
+ error("Relative folder references (../) are prohibited.");
+ return false;
+ }
+
+ // confirm valid characters in repository name
+ Character c = StringUtils.findInvalidCharacter(rname);
+ if (c != null) {
+ error(MessageFormat.format("Illegal character ''{0}'' in repository name!", c));
+ return false;
+ }
+
+ // verify repository name uniqueness on create
+ if (isCreate) {
+ // force repo names to lowercase
+ // this means that repository name checking for rpc creation
+ // is case-insensitive, regardless of the Gitblit server's
+ // filesystem
+ if (repositoryNames.contains(rname.toLowerCase())) {
+ error(MessageFormat.format(
+ "Can not create repository ''{0}'' because it already exists.", rname));
+ return false;
+ }
+ } else {
+ // check rename collision
+ if (!repositoryName.equalsIgnoreCase(rname)) {
+ if (repositoryNames.contains(rname.toLowerCase())) {
+ error(MessageFormat.format(
+ "Failed to rename ''{0}'' because ''{1}'' already exists.",
+ repositoryName, rname));
+ return false;
+ }
+ }
+ }
+
+ if (accessRestriction.getSelectedItem() == null) {
+ error("Please select access restriction!");
+ return false;
+ }
+
+ if (federationStrategy.getSelectedItem() == null) {
+ error("Please select federation strategy!");
+ return false;
+ }
+
+ repository.name = rname;
+ repository.description = descriptionField.getText();
+ repository.owner = ownerField.getSelectedItem() == null ? null : ownerField
+ .getSelectedItem().toString();
+ repository.useTickets = useTickets.isSelected();
+ repository.useDocs = useDocs.isSelected();
+ repository.showRemoteBranches = showRemoteBranches.isSelected();
+ repository.showReadme = showReadme.isSelected();
+ repository.skipSizeCalculation = skipSizeCalculation.isSelected();
+ repository.skipSummaryMetrics = skipSummaryMetrics.isSelected();
+ repository.isFrozen = isFrozen.isSelected();
+
+ String ml = mailingListsField.getText();
+ if (!StringUtils.isEmpty(ml)) {
+ Set<String> list = new HashSet<String>();
+ for (String address : ml.split("(,|\\s)")) {
+ if (StringUtils.isEmpty(address)) {
+ continue;
+ }
+ list.add(address.toLowerCase());
+ }
+ repository.mailingLists = new ArrayList<String>(list);
+ }
+
+ repository.accessRestriction = (AccessRestrictionType) accessRestriction.getSelectedItem();
+ repository.federationStrategy = (FederationStrategy) federationStrategy.getSelectedItem();
+
+ if (repository.federationStrategy.exceeds(FederationStrategy.EXCLUDE)) {
+ repository.federationSets = setsPalette.getSelections();
+ }
+
+ repository.preReceiveScripts = preReceivePalette.getSelections();
+ repository.postReceiveScripts = postReceivePalette.getSelections();
return true;
}
- private void showValidationError(String message) {
+ private void error(String message) {
JOptionPane.showMessageDialog(EditRepositoryDialog.this, message,
Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
}
- public void setUsers(List<String> all, List<String> selected) {
+ public void setUsers(String owner, List<String> all, List<String> selected) {
+ ownerField.setModel(new DefaultComboBoxModel(all.toArray()));
+ if (!StringUtils.isEmpty(owner)) {
+ ownerField.setSelectedItem(owner);
+ }
usersPalette.setObjects(all, selected);
+ }
+
+ public void setTeams(List<String> all, List<String> selected) {
+ teamsPalette.setObjects(all, selected);
+ }
+
+ public void setRepositories(List<RepositoryModel> repositories) {
+ repositoryNames.clear();
+ for (RepositoryModel repository : repositories) {
+ // force repo names to lowercase
+ // this means that repository name checking for rpc creation
+ // is case-insensitive, regardless of the Gitblit server's
+ // filesystem
+ repositoryNames.add(repository.name.toLowerCase());
+ }
}
public void setFederationSets(List<String> all, List<String> selected) {
setsPalette.setObjects(all, selected);
+ }
+
+ public void setPreReceiveScripts(List<String> all, List<String> inherited, List<String> selected) {
+ preReceivePalette.setObjects(all, selected);
+ showInherited(inherited, preReceiveInherited);
+ }
+
+ public void setPostReceiveScripts(List<String> all, List<String> inherited,
+ List<String> selected) {
+ postReceivePalette.setObjects(all, selected);
+ showInherited(inherited, postReceiveInherited);
+ }
+
+ private void showInherited(List<String> list, JLabel label) {
+ StringBuilder sb = new StringBuilder();
+ if (list != null && list.size() > 0) {
+ sb.append("<html><body><b>INHERITED</b><ul style=\"margin-left:5px;list-style-type: none;\">");
+ for (String script : list) {
+ sb.append("<li>").append(script).append("</li>");
+ }
+ sb.append("</ul></body></html>");
+ }
+ label.setText(sb.toString());
}
public RepositoryModel getRepository() {
@@ -238,6 +462,14 @@
return repository;
}
+ public List<String> getPermittedUsers() {
+ return usersPalette.getSelections();
+ }
+
+ public List<String> getPermittedTeams() {
+ return teamsPalette.getSelections();
+ }
+
/**
* ListCellRenderer to display descriptive text about the access
* restriction.
--
Gitblit v1.9.1