Skip to content

Commit ef6818b

Browse files
committed
chore: fix CSP rules for H2 console (when we sort results by one of the fields).
Also remove unused hashes. Address to #226
1 parent a1d8ead commit ef6818b

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,31 +97,23 @@ class ContentSecurityPolicyHeaderWriter implements HeaderWriter {
9797
" https://www.gstatic.com 'sha256-/kXZODfqoc2myS1eI6wr0HH8lUt+vRhW8H/oL+YJcMg='";
9898

9999
// - 'sha256-biL...' is required for 'display: none;' inline CSS
100-
// - 'sha256-ZdH...' is required for 'display: none' inline CSS
101100
// - 'sha256-aqN...' is required for 'display:none' inline CSS
102101
// - 'sha256-tIs...' is required for 'text-decoration: none;' inline CSS
103102
// - 'sha256-VPM...' is required for 'vertical-align: middle;' inline CSS
104103
// - 'sha256-CDs...' is required for 'padding:0px' inline CSS
105-
// - 'sha256-65m...' is required for 'white-space:nowrap' inline CSS
106-
// - 'sha256-xSK...' is required for 'margin: 0px; padding: 0px;' inline CSS
107104
// - 'sha256-Jnn...' is required for 'padding:0;width:10px;height:10px;' inline CSS
108105
// - 'sha256-yBh...' is required for 'margin: 20px' inline CSS
109-
// - 'sha256-ec+...' is required for 'width:300px' inline CSS
110-
// - 'sha256-rqk...' is required for 'width:300px;' inline CSS
106+
// - 'sha256-RZ7...' is required for 'color:gray' inline CSS (table.js:246:4)
111107
// - 'sha256-PGJ...' is required for 'width:200px;' inline CSS
112108
private static final String STYLE_H2_CONSOLE =
113109
" 'sha256-biLFinpqYMtWHmXfkA1BPeCY0/fNt46SAZ+BBk5YUog='"
114-
+ " 'sha256-ZdHxw9eWtnxUb3mk6tBS+gIiVUPE3pGM470keHPDFlE='"
115110
+ " 'sha256-aqNNdDLnnrDOnTNdkJpYlAxKVJtLt9CtFLklmInuUAE='"
116111
+ " 'sha256-tIs8OfjWm8MHgPJrHv7mM4wvA/FDFcra3Pd5icRMX+k='"
117112
+ " 'sha256-VPm872V2JvE+vhivDg7UeH+N9a9YzzqGGow5mzY48hc='"
118113
+ " 'sha256-CDs+xFw5uMoNgtE5XIrz5GXgs3O+/NFkYK2IK/vKSBE='"
119-
+ " 'sha256-65mkwZPt4V1miqNM9CcVYkrpnlQigG9H6Vi9OM/JCgY='"
120-
+ " 'sha256-xSKCQeN6yeCb4HCkijkjoBFHWdJFwmwDiFa3XlZZ6Bs='"
121114
+ " 'sha256-JnnwE+8wsBgf/bh1qyvAsUVHBgiTioeZ1NSUKff7mOM='"
122115
+ " 'sha256-yBhVF062O1IGu3ZngyEhh9l561VFLsJpdSxVtbwisRY='"
123-
+ " 'sha256-eC+jXvbVSsG0J4zQfR5fWxxUCqpaa5DZLbINjWNCu48='"
124-
+ " 'sha256-rqkMEwsWwrInJqctxmIaWOCFPV+Qmym3tMHH3wtq3Y0='"
116+
+ " 'sha256-RZ7vfNSfdJtvDeBSz2SI5g3wroaD1A1SzsDb04Yw9V0='"
125117
+ " 'sha256-PGJ8tjuz2DXGgB1Sie9pW8BrxBGK6EQndbLEkXd44T8='";
126118

127119
// - 'unsafe-inline' is required by jquery.min.js (that is using code inside of

src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,17 +309,13 @@ public void onH2ConsoleWithLocalResources() {
309309
+ "https://cdn.jsdelivr.net"
310310
+ " 'self'"
311311
+ " 'sha256-biLFinpqYMtWHmXfkA1BPeCY0/fNt46SAZ+BBk5YUog='"
312-
+ " 'sha256-ZdHxw9eWtnxUb3mk6tBS+gIiVUPE3pGM470keHPDFlE='"
313312
+ " 'sha256-aqNNdDLnnrDOnTNdkJpYlAxKVJtLt9CtFLklmInuUAE='"
314313
+ " 'sha256-tIs8OfjWm8MHgPJrHv7mM4wvA/FDFcra3Pd5icRMX+k='"
315314
+ " 'sha256-VPm872V2JvE+vhivDg7UeH+N9a9YzzqGGow5mzY48hc='"
316315
+ " 'sha256-CDs+xFw5uMoNgtE5XIrz5GXgs3O+/NFkYK2IK/vKSBE='"
317-
+ " 'sha256-65mkwZPt4V1miqNM9CcVYkrpnlQigG9H6Vi9OM/JCgY='"
318-
+ " 'sha256-xSKCQeN6yeCb4HCkijkjoBFHWdJFwmwDiFa3XlZZ6Bs='"
319316
+ " 'sha256-JnnwE+8wsBgf/bh1qyvAsUVHBgiTioeZ1NSUKff7mOM='"
320317
+ " 'sha256-yBhVF062O1IGu3ZngyEhh9l561VFLsJpdSxVtbwisRY='"
321-
+ " 'sha256-eC+jXvbVSsG0J4zQfR5fWxxUCqpaa5DZLbINjWNCu48='"
322-
+ " 'sha256-rqkMEwsWwrInJqctxmIaWOCFPV+Qmym3tMHH3wtq3Y0='"
318+
+ " 'sha256-RZ7vfNSfdJtvDeBSz2SI5g3wroaD1A1SzsDb04Yw9V0='"
323319
+ " 'sha256-PGJ8tjuz2DXGgB1Sie9pW8BrxBGK6EQndbLEkXd44T8='"
324320
)
325321
.contains("child-src 'self'")

0 commit comments

Comments
 (0)