Author: ivaynberg
Date: Wed Nov 23 21:57:49 2011
New Revision: 1205623
URL: http://svn.apache.org/viewvc?rev=1205623&view=rev
Log:
fixed cryptomapper to properly ignore urls it cannot decode
Issue: WICKET-4222
Modified:
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
Modified:
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java?rev=1205623&r1=1205622&r2=1205623&view=diff
==============================================================================
---
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
(original)
+++
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
Wed Nov 23 21:57:49 2011
@@ -170,6 +170,10 @@ public class CryptoMapper implements IRe
}
String decryptedUrl =
getCrypt().decryptUrlSafe(encryptedUrlString);
+ if (decryptedUrl == null)
+ {
+ return null;
+ }
Url originalUrl = Url.parse(decryptedUrl,
request.getCharset());
int originalNumberOfSegments =
originalUrl.getSegments().size();
Modified:
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java?rev=1205623&r1=1205622&r2=1205623&view=diff
==============================================================================
---
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
(original)
+++
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
Wed Nov 23 21:57:49 2011
@@ -67,9 +67,9 @@ public abstract class AbstractCrypt impl
}
catch (Exception ex)
{
- log.error("Error decoding text: " + text, ex);
+ log.debug("Error decoding text: " + text, ex);
+ return null;
}
- return null;
}
/**
