From 3fb41fdec5712b792da05e8549c2c0a31f112ca0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 10 Jul 2012 23:29:56 -0400
Subject: [PATCH] Prohibit trailing slashes in repository names (issue 104)
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 3 +++
src/com/gitblit/client/EditRepositoryDialog.java | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index f6a315b..77878cb 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -389,6 +389,9 @@
error("Relative folder references (../) are prohibited.");
return false;
}
+ if (rname.endsWith("/")) {
+ rname = rname.substring(0, rname.length() - 1);
+ }
// confirm valid characters in repository name
Character c = StringUtils.findInvalidCharacter(rname);
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index a6f6af0..0176249 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -212,6 +212,9 @@
if (repositoryModel.name.contains("/../")) {
error(getString("gb.illegalRelativeSlash"));
return;
+ }
+ if (repositoryModel.name.endsWith("/")) {
+ repositoryModel.name = repositoryModel.name.substring(0, repositoryModel.name.length() - 1);
}
// confirm valid characters in repository name
--
Gitblit v1.9.1