You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/11/29 00:19:40 UTC
svn commit: r1039977 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/validation/validator/UrlValidator.java
test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
Author: ivaynberg
Date: Sun Nov 28 23:19:40 2010
New Revision: 1039977
URL: http://svn.apache.org/viewvc?rev=1039977&view=rev
Log:
Issue: WICKET-3196
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java?rev=1039977&r1=1039976&r2=1039977&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java Sun Nov 28 23:19:40 2010
@@ -484,7 +484,7 @@ public class UrlValidator extends Abstra
}
int slashCount = countToken("/", path);
- int dot2Count = countToken("..", path);
+ int dot2Count = countToken("/..", path);
if (dot2Count > 0)
{
if ((slashCount - slash2Count - 1) <= dot2Count)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java?rev=1039977&r1=1039976&r2=1039977&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java Sun Nov 28 23:19:40 2010
@@ -132,7 +132,7 @@ public class UrlValidatorTest extends Te
do
{
String output = "";
- StringBuilder testBuffer = new StringBuilder();
+ StringBuilder testBuffer = new StringBuilder();
boolean expected = true;
for (int testPartsIndexIndex = 0; testPartsIndexIndex < testPartsIndex.length; ++testPartsIndexIndex)
{
@@ -255,7 +255,7 @@ public class UrlValidatorTest extends Te
*/
private String testPartsIndextoString()
{
- StringBuilder carryMsg = new StringBuilder("{");
+ StringBuilder carryMsg = new StringBuilder("{");
for (int testPartsIndexIndex = 0; testPartsIndexIndex < testPartsIndex.length; ++testPartsIndexIndex)
{
carryMsg.append(testPartsIndex[testPartsIndexIndex]);
@@ -312,7 +312,8 @@ public class UrlValidatorTest extends Te
new ResultPair("/$23", true), new ResultPair("/..", false),
new ResultPair("/../", false), new ResultPair("/test1/", true),
new ResultPair("", true), new ResultPair("/test1/file", true),
- new ResultPair("/..//file", false), new ResultPair("/test1//file", false) };
+ new ResultPair("/..//file", false), new ResultPair("/test1//file", false),
+ new ResultPair("/this_one_is_tricky...but...still.....valid", true) };
// Test allow2slash, noFragment
ResultPair[] testUrlPathOptions = { new ResultPair("/test1", true),
new ResultPair("/t123", true), new ResultPair("/$23", true),