Repository: wicket Updated Branches: refs/heads/wicket-1.5.x fb1f57f4d -> d2b884834
WICKET-5756 Allow to use custom ciphers when using SunJceCrypt class Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d2b88483 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d2b88483 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d2b88483 Branch: refs/heads/wicket-1.5.x Commit: d2b8848346b8f806e747dca18799d70c37fc893f Parents: fb1f57f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 25 12:16:47 2014 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 25 12:16:47 2014 +0100 ---------------------------------------------------------------------- .../apache/wicket/settings/def/SecuritySettings.java | 4 ++-- .../wicket/request/mapper/CryptoMapperTest.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d2b88483/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java index ca144ea..3d993ec 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/def/SecuritySettings.java @@ -23,8 +23,8 @@ import org.apache.wicket.authorization.IAuthorizationStrategy; import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener; import org.apache.wicket.authorization.UnauthorizedInstantiationException; import org.apache.wicket.settings.ISecuritySettings; -import org.apache.wicket.util.crypt.CachingSunJceCryptFactory; import org.apache.wicket.util.crypt.ICryptFactory; +import org.apache.wicket.util.crypt.KeyInSessionSunJceCryptFactory; /** * @author Jonathan Locke @@ -85,7 +85,7 @@ public class SecuritySettings implements ISecuritySettings { if (cryptFactory == null) { - cryptFactory = new CachingSunJceCryptFactory(ISecuritySettings.DEFAULT_ENCRYPTION_KEY); + cryptFactory = new KeyInSessionSunJceCryptFactory(); } return cryptFactory; } http://git-wip-us.apache.org/repos/asf/wicket/blob/d2b88483/wicket-core/src/test/java/org/apache/wicket/request/mapper/CryptoMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/CryptoMapperTest.java index 003b605..9697e3b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/CryptoMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/CryptoMapperTest.java @@ -24,6 +24,10 @@ import org.apache.wicket.request.handler.PageProvider; import org.apache.wicket.request.handler.RenderPageRequestHandler; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.settings.ISecuritySettings; +import org.apache.wicket.util.IProvider; +import org.apache.wicket.util.crypt.CachingSunJceCryptFactory; +import org.apache.wicket.util.crypt.ICrypt; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.tester.DummyHomePage; import org.apache.wicket.util.tester.WicketTester; @@ -63,7 +67,13 @@ public class CryptoMapperTest extends AbstractMapperTest tester = new WicketTester(); WebApplication webApplication = tester.getApplication(); webApplication.mountPage(EXPECTED_URL.toString(), DummyHomePage.class); - mapper = new CryptoMapper(webApplication.getRootRequestMapper(), webApplication); + mapper = new CryptoMapper(webApplication.getRootRequestMapper(), new IProvider<ICrypt>() + { + public ICrypt get() + { + return new CachingSunJceCryptFactory(ISecuritySettings.DEFAULT_ENCRYPTION_KEY).newCrypt(); + } + }); } /** @@ -261,4 +271,4 @@ public class CryptoMapperTest extends AbstractMapperTest assertEquals(getClass(), handler.getResourceReference().getScope()); assertEquals("less-crypt.txt", handler.getResourceReference().getName()); } -} \ No newline at end of file +}
