You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/01/17 08:24:40 UTC
[wicket] branch csp updated (56e0331 -> 51455ae)
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a change to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from 56e0331 Merge remote-tracking branch 'origin/master' into csp
new 000cf9d WICKET-6730: Minor code-style improvements
new 51455ae WICKET-6727: do not extend WicketTester but WicketTestCase
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../wicket/core/random/ISecureRandomSupplier.java | 4 +-
.../apache/wicket/settings/SecuritySettings.java | 4 +-
.../csp/CSPSettingRequestCycleListenerTest.java | 45 +++++++++++-----------
.../wicket/pageStore/CryptingPageStoreTest.java | 13 ++++---
4 files changed, 35 insertions(+), 31 deletions(-)
[wicket] 02/02: WICKET-6727: do not extend WicketTester but
WicketTestCase
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 51455aed8f62d2fd02ea29d38f03c13ac135798a
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Fri Jan 17 09:24:21 2020 +0100
WICKET-6727: do not extend WicketTester but WicketTestCase
---
.../csp/CSPSettingRequestCycleListenerTest.java | 45 +++++++++++-----------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java b/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java
index 28b292c..d4893cd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java
@@ -38,13 +38,14 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.wicket.mock.MockHomePage;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@SuppressWarnings("deprecation")
-public class CSPSettingRequestCycleListenerTest extends WicketTester
+public class CSPSettingRequestCycleListenerTest extends WicketTestCase
{
private static String HEADER_CSP = "Content-Security-Policy";
@@ -62,7 +63,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testNullSrcInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, (String) null);
});
@@ -72,7 +73,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testEmptySrcInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, "");
});
@@ -86,7 +87,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testInvalidSrcInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, "abc?^()-_\'xyz");
});
@@ -100,7 +101,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testMultipleSrcInputWithNoneIsRejected1()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, SELF, NONE);
});
@@ -114,7 +115,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testMultipleSrcInputWithNoneIsRejected2()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, NONE, SELF);
});
@@ -128,7 +129,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testMultipleSrcInputWithStarIsRejected1()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(DEFAULT_SRC, SELF);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, WILDCARD);
@@ -143,7 +144,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testMultipleSrcInputWithStarIsRejected2()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(DEFAULT_SRC, WILDCARD);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, SELF);
@@ -154,7 +155,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testWrongSrcInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(DEFAULT_SRC, ALLOW_FORMS);
});
@@ -164,7 +165,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testWrongSandboxInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(SANDBOX, SELF);
});
@@ -174,7 +175,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testNullSandboxInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(SANDBOX, (String) null);
});
@@ -184,7 +185,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testEmptySandboxInputIsAccepted()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(SANDBOX, CSPDirectiveSandboxValue.EMPTY);
}
@@ -192,7 +193,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testInvalidSandboxInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(SANDBOX, "abcxyz");
});
@@ -202,7 +203,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testMultipleSandboxInputWithEmptyStringIsRejected1()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(SANDBOX, ALLOW_FORMS);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(SANDBOX, EMPTY);
@@ -213,7 +214,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testMultipleSandboxInputWithEmptyStringIsRejected2()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(SANDBOX, EMPTY);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(SANDBOX, ALLOW_FORMS);
@@ -224,7 +225,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testNullReportUriInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(REPORT_URI, (String) null);
});
@@ -234,7 +235,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testEmptyReportUriInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(REPORT_URI, "");
});
@@ -244,7 +245,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testInvalidReportUriInputIsRejected()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
Assertions.assertThrows(IllegalArgumentException.class, () -> {
cspListener.blocking().addDirective(REPORT_URI, "abc?^()-_\'xyz");
});
@@ -254,7 +255,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testAllCSPSrcDefaultEnumsAreSetCorrectly() throws NoSuchAlgorithmException
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
final int cspDirectiveCount = CSPDirective.values().length;
final int cspDirectiveSrcValueCount = CSPDirectiveSrcValue.values().length;
@@ -284,7 +285,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testCSPReportUriDirectiveSetCorrectly()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(REPORT_URI, "http://report.example.com");
cspListener.reporting().addDirective(REPORT_URI, "/example-report-uri");
@@ -300,7 +301,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testCSPSandboxDirectiveSetCorrectly()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
final int cspSandboxDirectiveValueCount = CSPDirectiveSandboxValue.values().length;
for (int i = 0; i < cspSandboxDirectiveValueCount; i++)
{
@@ -329,7 +330,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTester
public void testChildSrcDirectiveAlsoSetsFrameSrcDirective()
{
CSPSettingRequestCycleListener cspListener =
- new CSPSettingRequestCycleListener(getApplication());
+ new CSPSettingRequestCycleListener(tester.getApplication());
cspListener.blocking().addDirective(CHILD_SRC, SELF);
cspListener.reporting().addDirective(CHILD_SRC, SELF);
StringBuffer headerErrors = checkHeaders(cspListener);
[wicket] 01/02: WICKET-6730: Minor code-style improvements
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 000cf9d6da4715176ec622bf3a03a4e0ff796983
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Fri Jan 17 09:22:56 2020 +0100
WICKET-6730: Minor code-style improvements
---
.../apache/wicket/core/random/ISecureRandomSupplier.java | 4 ++--
.../java/org/apache/wicket/settings/SecuritySettings.java | 4 ++--
.../org/apache/wicket/pageStore/CryptingPageStoreTest.java | 13 ++++++++-----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java b/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
index 9b9fe14..ed8d131 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
@@ -48,8 +48,8 @@ public interface ISecureRandomSupplier
}
/**
- * Returns a base64 encoded string with random content, base on {@code length} bytes. The length
- * of the returned string will be {@code length/3*4}.
+ * Returns a url-base64 encoded string with random content, base on {@code length} bytes. The
+ * length of the returned string will be {@code length/3*4}.
*
* @param length
* The number of random bytes to use as input.
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java
index 94e2390..6e225a4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java
@@ -125,7 +125,7 @@ public class SecuritySettings
*
* @return The {@link ISecureRandomSupplier} to use for secure random data.
*/
- public ISecureRandomSupplier getRandomSupplier()
+ public synchronized ISecureRandomSupplier getRandomSupplier()
{
if (randomSupplier == null)
{
@@ -193,7 +193,7 @@ public class SecuritySettings
* The new supplier, must not be null.
* @return {@code this} object for chaining
*/
- public SecuritySettings setRandomSupplier(ISecureRandomSupplier randomSupplier)
+ public synchronized SecuritySettings setRandomSupplier(ISecureRandomSupplier randomSupplier)
{
Args.notNull(randomSupplier, "randomSupplier");
this.randomSupplier = randomSupplier;
diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
index 48e3def..970f9fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
@@ -26,6 +26,7 @@ import org.apache.wicket.MockPage;
import org.apache.wicket.mock.MockPageContext;
import org.apache.wicket.mock.MockPageStore;
import org.apache.wicket.serialize.java.JavaSerializer;
+import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.Test;
@@ -34,13 +35,14 @@ import org.junit.jupiter.api.Test;
*
* @author svenmeier
*/
-public class CryptingPageStoreTest extends WicketTester
+public class CryptingPageStoreTest extends WicketTestCase
{
@Test
void test()
{
- CryptingPageStore store = new CryptingPageStore(new MockPageStore(), getApplication());
+ CryptingPageStore store =
+ new CryptingPageStore(new MockPageStore(), tester.getApplication());
JavaSerializer serializer = new JavaSerializer("test");
IPageContext context = new MockPageContext();
@@ -51,8 +53,8 @@ public class CryptingPageStoreTest extends WicketTester
SerializedPage serializedAdd = new SerializedPage(p, "foo", serializer.serialize(add));
store.addPage(context, serializedAdd);
- SerializedPage serializedGot = (SerializedPage)store.getPage(context, p);
- MockPage got = (MockPage)serializer.deserialize(serializedGot.getData());
+ SerializedPage serializedGot = (SerializedPage) store.getPage(context, p);
+ MockPage got = (MockPage) serializer.deserialize(serializedGot.getData());
assertEquals(p, got.getPageId());
}
}
@@ -60,7 +62,8 @@ public class CryptingPageStoreTest extends WicketTester
@Test
void testFail()
{
- CryptingPageStore store = new CryptingPageStore(new MockPageStore(), getApplication());
+ CryptingPageStore store =
+ new CryptingPageStore(new MockPageStore(), tester.getApplication());
JavaSerializer serializer = new JavaSerializer("test");
MockPageContext context = new MockPageContext();