solomax commented on a change in pull request #399: WICKET-6727: Configurable Content-Security-Policy URL: https://github.com/apache/wicket/pull/399#discussion_r368205286
########## File path: wicket-core/src/main/java/org/apache/wicket/csp/CSPDirective.java ########## @@ -0,0 +1,191 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.csp; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +import org.apache.wicket.util.string.Strings; + +/** + * An enum holding the possible CSP Directives. Via the + * {@link #checkValueForDirective(CSPRenderable, List)}-method, new values can be verified before + * being added to the list of values for a directive. + */ +public enum CSPDirective +{ + DEFAULT_SRC("default-src"), + SCRIPT_SRC("script-src"), + STYLE_SRC("style-src"), + IMG_SRC("img-src"), + CONNECT_SRC("connect-src"), + FONT_SRC("font-src"), + OBJECT_SRC("object-src"), + MANIFEST_SRC("manifest-src"), + MEDIA_SRC("media-src"), + CHILD_SRC("child-src"), + FRAME_ANCESTORS("frame-ancestors"), + @Deprecated + /** @deprecated Gebruik CHILD-SRC, deze zet ook automatisch FRAME-SRC. */ + FRAME_SRC("frame-src"), + SANDBOX("sandbox") + { + @Override + public void checkValueForDirective(CSPRenderable value, + List<CSPRenderable> existingDirectiveValues) + { + if (!existingDirectiveValues.isEmpty()) + { + if (CSPDirectiveSandboxValue.EMPTY.equals(value)) + { + throw new IllegalArgumentException( + "A sandbox directive can't contain an empty string if it already contains other values "); + } + if (existingDirectiveValues.contains(CSPDirectiveSandboxValue.EMPTY)) + { + throw new IllegalArgumentException( + "A sandbox directive can't contain other values if it already contains an empty string"); + } + } + + if (!(value instanceof CSPDirectiveSandboxValue)) + { + throw new IllegalArgumentException( + "A sandbox directive can only contain values from CSPDirectiveSandboxValue or be empty"); + } + } + }, + REPORT_URI("report-uri") + { + @Override + public void checkValueForDirective(CSPRenderable value, + List<CSPRenderable> existingDirectiveValues) + { + if (!existingDirectiveValues.isEmpty()) + { + throw new IllegalArgumentException( + "A report-uri directive can only contain one uri"); + } + if (!(value instanceof FixedCSPDirective)) + { + throw new IllegalArgumentException( + "A report-uri directive can only contain an URI"); + } + try + { + new URI(value.render(null, null)); + } + catch (URISyntaxException urise) + { + throw new IllegalArgumentException("Illegal URI for report-uri directive", urise); + } + } + }; + + private String value; + + private CSPDirective(String value) + { + this.value = value; + } + + public String getValue() + { + return value; + } + + /** + * Check if {@code value} can be added to the list of other values. + * + * @param value + * The value to add. + * @param existingDirectiveValues + * The other values. + * @throws IllegalArgumentException + * if the given value is invalid. + */ + public void checkValueForDirective(CSPRenderable value, + List<CSPRenderable> existingDirectiveValues) + { + if (!existingDirectiveValues.isEmpty()) + { + if (CSPDirectiveSrcValue.WILDCARD.equals(value) + || CSPDirectiveSrcValue.NONE.equals(value)) + { + throw new IllegalArgumentException( + "A -src directive can't contain an * or a 'none' if it already contains other values "); + } + if (existingDirectiveValues.contains(CSPDirectiveSrcValue.WILDCARD) + || existingDirectiveValues.contains(CSPDirectiveSrcValue.NONE)) + { + throw new IllegalArgumentException( + "A -src directive can't contain other values if it already contains an * or a 'none'"); + } + } + + if (value instanceof CSPDirectiveSrcValue) + { + return; + } + + if (value instanceof CSPDirectiveSandboxValue) + { + throw new IllegalArgumentException( + "A -src directive can't contain any of the sandbox directive values"); + } + + String strValue = value.render(null, null); + if ("data:".equals(strValue) || "https:".equals(strValue)) + { + return; + } + + // strip off "*." so "*.example.com" becomes "example.com" and we can check if + // it + // is a valid uri + if (strValue.startsWith("*.")) + { + strValue = strValue.substring(2); + } + + try + { + new URI(strValue); + } + catch (URISyntaxException urise) + { + throw new IllegalArgumentException("Illegal URI for -src directive", urise); + } + } + + /** + * @return The CSPDirective constant whose value-parameter equals the input-parameter or + * {@code null} if none can be found. + */ + public static CSPDirective fromValue(String value) + { + if (Strings.isEmpty(value)) + return null; Review comment: missing curly braces? (also in some other places) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
