Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 07:55:47 +01:00
Code Issues Packages Projects Releases Activity

do not allow "/./" or "//" in repository names

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-05-11 17:00:19 +02:00
parent 0ca618bd03
commit 9850fbbda5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
View File

@@ -143,7 +143,7 @@ public class ValidationUtil
{ {
return Util.isNotEmpty(name) && name.matches(REGEX_REPOSITORYNAME) return Util.isNotEmpty(name) && name.matches(REGEX_REPOSITORYNAME)
&&!name.contains("..") &&!name.endsWith("/.") &&!name.endsWith(".") &&!name.contains("..") &&!name.endsWith("/.") &&!name.endsWith(".")
&&!name.endsWith("/"); &&!name.endsWith("/") &&!name.contains("/./") &&!name.contains("//");
} }
/** /**

4
scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
View File

@@ -151,6 +151,10 @@ public class ValidationUtilTest
assertFalse(ValidationUtil.isRepositoryNameValid("scm/../plugins")); assertFalse(ValidationUtil.isRepositoryNameValid("scm/../plugins"));
assertFalse(ValidationUtil.isRepositoryNameValid("scm/main/")); assertFalse(ValidationUtil.isRepositoryNameValid("scm/main/"));
assertFalse(ValidationUtil.isRepositoryNameValid("/scm/main/")); assertFalse(ValidationUtil.isRepositoryNameValid("/scm/main/"));
// issue 144
assertFalse(ValidationUtil.isRepositoryNameValid("scm/./main"));
assertFalse(ValidationUtil.isRepositoryNameValid("scm//main"));
} }
/** /**

4
scm-webapp/src/main/webapp/resources/js/override/ext.form.vtypes.js
View File

@@ -57,7 +57,9 @@ Ext.apply(Ext.form.VTypes, {
&& ! val.contains('..') && ! val.contains('..')
&& ! val.endsWith('/.') && ! val.endsWith('/.')
&& ! val.endsWith('/') && ! val.endsWith('/')
&& ! val.endsWith('.'); && ! val.endsWith('.')
&& ! val.contains('/./')
&& ! val.contains('//');
}, },
repositoryNameText: 'The name of the repository is invalid.', repositoryNameText: 'The name of the repository is invalid.',