Compare commits
33
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ddc238a49d | ||
|
|
4cff613b18 | ||
|
|
4442c2adca | ||
|
|
80262418fd | ||
|
|
a48938982d | ||
|
|
901ca14f44 | ||
|
|
a42ea2bdb4 | ||
|
|
e2026b6a50 | ||
|
|
e83559d151 | ||
|
|
4d43e6ed87 | ||
|
|
bccf14066c | ||
|
|
14f7feda74 | ||
|
|
d5883a855d | ||
|
|
2222bd21b7 | ||
|
|
1feb709998 | ||
|
|
0ba7036f14 | ||
|
|
8f6a1d361e | ||
|
|
5866e2dbdf | ||
|
|
f5ded534e7 | ||
|
|
7828ba64f2 | ||
|
|
76ea0d0486 | ||
|
|
97fa32aa65 | ||
|
|
9293c2c057 | ||
|
|
732f424d3c | ||
|
|
6d84e02c91 | ||
|
|
5fbd11e75e | ||
|
|
5c414fc6a4 | ||
|
|
91357bbf0e | ||
|
|
26ac709078 | ||
|
|
25e96ca05e | ||
|
|
d6af7a1907 | ||
|
|
982e2d43d2 | ||
|
|
a8f50c5759 |
@@ -0,0 +1,92 @@
|
||||
# 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.
|
||||
|
||||
|
||||
# For most projects, this workflow file will not need changing; you simply need
|
||||
# to commit it to your repository.
|
||||
#
|
||||
# You may wish to alter this file to override the set of languages analyzed,
|
||||
# or to provide custom queries or build logic.
|
||||
#
|
||||
#
|
||||
name: "CodeQL"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ trunk, release* ]
|
||||
paths:
|
||||
- '**.java'
|
||||
- '**.js'
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [ trunk ]
|
||||
paths:
|
||||
- '**.java'
|
||||
- '**.js'
|
||||
schedule:
|
||||
- cron: '27 15 * * 1'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
actions: read
|
||||
contents: read
|
||||
security-events: write
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
#language: [ 'java', 'javascript' ]
|
||||
language: [ 'javascript' ]
|
||||
#language: [ 'javascript' ]
|
||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
|
||||
# Learn more:
|
||||
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v1
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
debug: true
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v1
|
||||
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
|
||||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||
# and modify them (or add more) to build your code if your project
|
||||
# uses a compiled language
|
||||
|
||||
#- run: |
|
||||
# make bootstrap
|
||||
# make release
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v1
|
||||
@@ -0,0 +1,42 @@
|
||||
# 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.
|
||||
|
||||
|
||||
# This workflow will check style in OFBiz with its plugins
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
|
||||
|
||||
name: Java CI with Gradle
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ release18.12 ]
|
||||
pull_request:
|
||||
branches: [ release18.12 ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up JDK 1.8
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 1.8
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew pullAllPluginsSource check
|
||||
@@ -37,3 +37,5 @@ desktop.ini
|
||||
.*.swp
|
||||
.*.swo
|
||||
*.patch
|
||||
/themes/common-theme/webapp/common/js/node_modules/
|
||||
/docs/asciidoc/images/
|
||||
|
||||
@@ -19,6 +19,13 @@ under the License.
|
||||
[[apache-ofbiz]]
|
||||
= Apache OFBiz®
|
||||
|
||||
image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link=http://www.apache.org/licenses/LICENSE-2.0]
|
||||
image:https://img.shields.io/badge/Version-release18.12-green.svg[link=https://github.com/apache/ofbiz-framework/tree/release18.12]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml]
|
||||
image:https://qpkb254zxeu.montastic.io/badge[link=https://qpkb254zxeu.montastic.io]
|
||||
|
||||
|
||||
If you are reading this file in AsciiDoc format you may want to see it in
|
||||
https://ci.apache.org/projects/ofbiz/site/next/readme/html5/README.html[HTML]
|
||||
or https://ci.apache.org/projects/ofbiz/site/next/readme/pdf/README.pdf[PDF] format
|
||||
|
||||
+6
-6
@@ -39,12 +39,12 @@ import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
|
||||
import com.sun.syndication.feed.synd.SyndContent;
|
||||
import com.sun.syndication.feed.synd.SyndContentImpl;
|
||||
import com.sun.syndication.feed.synd.SyndEntry;
|
||||
import com.sun.syndication.feed.synd.SyndEntryImpl;
|
||||
import com.sun.syndication.feed.synd.SyndFeed;
|
||||
import com.sun.syndication.feed.synd.SyndFeedImpl;
|
||||
import com.rometools.rome.feed.synd.SyndContent;
|
||||
import com.rometools.rome.feed.synd.SyndContentImpl;
|
||||
import com.rometools.rome.feed.synd.SyndEntry;
|
||||
import com.rometools.rome.feed.synd.SyndEntryImpl;
|
||||
import com.rometools.rome.feed.synd.SyndFeed;
|
||||
import com.rometools.rome.feed.synd.SyndFeedImpl;
|
||||
|
||||
/**
|
||||
* BlogRssServices
|
||||
|
||||
@@ -28,8 +28,8 @@ import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.UtilMisc;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.service.testtools.OFBizTestCase;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
import org.apache.ofbiz.service.testtools.OFBizTestCase;
|
||||
|
||||
public class PurchaseOrderTest extends OFBizTestCase {
|
||||
public static final String module = OFBizTestCase.class.getName();
|
||||
|
||||
+4
-1
@@ -1055,10 +1055,13 @@ public class ProductServices {
|
||||
String fileToCheck = imageServerPath + "/" + fileLocation + "." + extension.getString("fileExtensionId");
|
||||
File file = new File(fileToCheck);
|
||||
try {
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image", delegator)) {
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
Files.delete(tempFile);
|
||||
RandomAccessFile out = new RandomAccessFile(fileToCheck, "rw");
|
||||
out.write(imageData.array());
|
||||
out.close();
|
||||
|
||||
@@ -35,7 +35,7 @@ under the License.
|
||||
</field>
|
||||
<field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="ProductCategory" key-field-name="productCategoryId">
|
||||
<entity-options entity-name="ProductCategory" key-field-name="productCategoryId" description="${description} ${categoryName} [${productCategoryId}]">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
@@ -377,4 +377,4 @@ under the License.
|
||||
<field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"><display/></field>
|
||||
<field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}"><display/></field>
|
||||
</form>
|
||||
</forms>
|
||||
</forms>
|
||||
|
||||
+10
-12
@@ -134,10 +134,6 @@ allprojects {
|
||||
artifact()
|
||||
}
|
||||
}
|
||||
maven {
|
||||
// com.springsource.com.sun.syndication
|
||||
url "https://repo.spring.io/plugins-release"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,7 +169,7 @@ dependencies {
|
||||
compile 'com.ibm.icu:icu4j:63.1'
|
||||
compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in newer versions, see OFBIZ-10455
|
||||
compile 'com.sun.mail:javax.mail:1.6.2'
|
||||
compile 'com.sun.syndication:com.springsource.com.sun.syndication:1.0.0'
|
||||
compile 'com.rometools:rome:1.16.0'
|
||||
compile 'com.thoughtworks.xstream:xstream:1.4.11.1'
|
||||
compile 'commons-cli:commons-cli:1.4'
|
||||
compile 'commons-net:commons-net:3.6'
|
||||
@@ -194,7 +190,8 @@ dependencies {
|
||||
compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
|
||||
compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
|
||||
compile 'org.apache.httpcomponents:httpclient-cache:4.5.6'
|
||||
compile 'org.apache.logging.log4j:log4j-api:2.11.1' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-api:2.17.0' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-web:2.17.0' //???
|
||||
compile 'org.apache.poi:poi:3.17'
|
||||
compile 'org.apache.pdfbox:pdfbox:2.0.24'
|
||||
compile 'org.apache.shiro:shiro-core:1.4.0'
|
||||
@@ -218,6 +215,7 @@ dependencies {
|
||||
compile 'wsdl4j:wsdl4j:1.6.3'
|
||||
compile 'org.jsoup:jsoup:1.11.3'
|
||||
compile 'com.auth0:java-jwt:3.8.2'
|
||||
compile 'org.jdom:jdom:1.1.3' // don't upgrade above 1.1.3, makes a lot of not obvious and useless complications, see last commits of OFBIZ-12092 for more
|
||||
compile 'net.lingala.zip4j:zip4j:2.6.4'
|
||||
compile 'org.apache.commons:commons-imaging:1.0-alpha2' // Alpha but OK, "Imaging was working and was used by a number of projects in production even before reaching its initial release as an Apache Commons component."
|
||||
compile 'batik:batik-svg-dom:1.6-1'
|
||||
@@ -234,11 +232,11 @@ dependencies {
|
||||
runtime 'org.apache.axis2:axis2-transport-local:1.7.8'
|
||||
runtime 'org.apache.derby:derby:10.14.2.0'
|
||||
runtime 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:1.1'
|
||||
runtime 'org.apache.logging.log4j:log4j-1.2-api:2.11.1' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.11.1' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.11.1' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.11.1' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.apache.logging.log4j:log4j-1.2-api:2.17.0' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.17.0' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.17.0' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.17.0' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
|
||||
|
||||
// plugin libs
|
||||
@@ -299,7 +297,7 @@ sourceSets {
|
||||
resources {
|
||||
srcDirs = getDirectoryInActiveComponentsIfExists('src/main/java')
|
||||
srcDirs += getDirectoryInActiveComponentsIfExists('config')
|
||||
srcDirs += "${rootDir}/framework/base/dtd"
|
||||
srcDirs += getDirectoryInActiveComponentsIfExists('dtd')
|
||||
exclude excludedJavaSources
|
||||
exclude excludedConfigFiles
|
||||
// Below are necessary for unit tests run by Gradle and integration tests
|
||||
|
||||
@@ -20,6 +20,7 @@ package org.apache.ofbiz.base.util;
|
||||
|
||||
import static java.util.stream.Collectors.collectingAndThen;
|
||||
import static java.util.stream.Collectors.joining;
|
||||
|
||||
import static org.apache.ofbiz.base.util.UtilProperties.getPropertyValue;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
+2
-3
@@ -241,9 +241,8 @@ public abstract class FlexibleStringExpander implements Serializable, IsEmpty {
|
||||
private static abstract class Key {
|
||||
@Override
|
||||
public final boolean equals(Object o) {
|
||||
// No class test here, nor null, as this class is only used
|
||||
// internally
|
||||
return toString().equals(o.toString());
|
||||
// No class test here, nor null, as this class is only used internally
|
||||
return (o == null) ? false : toString().equals(o.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -450,7 +450,7 @@ under the License.
|
||||
<attribute name="feedType" type="String" mode="IN" optional="false"/>
|
||||
<attribute name="mainLink" type="String" mode="IN" optional="false"/>
|
||||
<attribute name="entryLink" type="String" mode="IN" optional="false"/>
|
||||
<attribute name="wireFeed" type="com.sun.syndication.feed.WireFeed" mode="OUT" optional="false"/>
|
||||
<attribute name="wireFeed" type="com.rometools.rome.feed.WireFeed" mode="OUT" optional="false"/>
|
||||
</service>
|
||||
|
||||
<!-- User preferences services -->
|
||||
|
||||
@@ -374,7 +374,7 @@ public class EntitySaxReader extends DefaultHandler {
|
||||
}
|
||||
} else {
|
||||
Debug.logWarning("Ignoring invalid field name [" + currentFieldName + "] found for the entity: "
|
||||
+ currentValue.getEntityName() + " with value=" + currentFieldValue.toString(), module);
|
||||
+ currentValue.getEntityName() + " with value=" + new String(currentFieldValue), module);
|
||||
}
|
||||
currentFieldValue = null;
|
||||
}
|
||||
|
||||
+3
-3
@@ -65,11 +65,11 @@ public final class EntityCount extends EntityOperation {
|
||||
this.countFma = FlexibleMapAccessor.getInstance(element.getAttribute("count-field"));
|
||||
int conditionElementCount = 0;
|
||||
Element conditionExprElement = UtilXml.firstChildElement(element, "condition-expr");
|
||||
conditionElementCount = conditionExprElement == null ? conditionElementCount : conditionElementCount++;
|
||||
conditionElementCount = conditionExprElement == null ? conditionElementCount : ++conditionElementCount;
|
||||
Element conditionListElement = UtilXml.firstChildElement(element, "condition-list");
|
||||
conditionElementCount = conditionListElement == null ? conditionElementCount : conditionElementCount++;
|
||||
conditionElementCount = conditionListElement == null ? conditionElementCount : ++conditionElementCount;
|
||||
Element conditionObjectElement = UtilXml.firstChildElement(element, "condition-object");
|
||||
conditionElementCount = conditionObjectElement == null ? conditionElementCount : conditionElementCount++;
|
||||
conditionElementCount = conditionObjectElement == null ? conditionElementCount : ++conditionElementCount;
|
||||
if (conditionElementCount > 1) {
|
||||
MiniLangValidate.handleError("Element must include only one condition child element", simpleMethod, conditionObjectElement);
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ public final class ServiceEcaUtil {
|
||||
|
||||
public static Map<String, List<ServiceEcaRule>> getServiceEventMap(String serviceName) {
|
||||
if (ServiceEcaUtil.ecaCache == null) ServiceEcaUtil.readConfig();
|
||||
return ServiceEcaUtil.ecaCache.get(serviceName);
|
||||
return (serviceName == null) ? null : ServiceEcaUtil.ecaCache.get(serviceName);
|
||||
}
|
||||
|
||||
public static List<ServiceEcaRule> getServiceEventRules(String serviceName, String event) {
|
||||
|
||||
@@ -67,10 +67,11 @@ under the License.
|
||||
<entity-xml action="assert" entity-xml-url="component://service/testdef/data/ServiceEcaGlobalEventAssertData.xml"/>
|
||||
</test-case>
|
||||
|
||||
<test-case case-name="service-xml-rpc">
|
||||
<!-- This alone should allow Buildbot 3.2 to run the integration tests, cf OFBIZ-12456 -->
|
||||
<!-- <test-case case-name="service-xml-rpc">
|
||||
<junit-test-suite class-name="org.apache.ofbiz.service.test.XmlRpcTests"/>
|
||||
</test-case>
|
||||
<test-case case-name="service-xml-rpc-local-engine">
|
||||
<service-test service-name="testXmlRpcClientAdd"/>
|
||||
</test-case>
|
||||
</test-case!-->
|
||||
</test-suite>
|
||||
|
||||
@@ -45,6 +45,3 @@ cookie.domain=
|
||||
# Exclude jsessionid for User-Agents (separated by comma's)
|
||||
link.remove_lsessionid.user_agent_list = googlebot,yahoo,msnbot,mediapartners-google
|
||||
|
||||
# Should HTTP parameters sent to services require encryption?
|
||||
# This is generally advised for more secure webapps as it makes it more difficult to spoof requests (XSRF) that change data.
|
||||
service.http.parameters.require.encrypted=Y
|
||||
|
||||
@@ -30,9 +30,9 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
|
||||
import org.apache.ofbiz.webapp.control.RequestHandler;
|
||||
|
||||
import com.sun.syndication.feed.WireFeed;
|
||||
import com.sun.syndication.io.FeedException;
|
||||
import com.sun.syndication.io.WireFeedOutput;
|
||||
import com.rometools.rome.feed.WireFeed;
|
||||
import com.rometools.rome.io.FeedException;
|
||||
import com.rometools.rome.io.WireFeedOutput;
|
||||
|
||||
/**
|
||||
* RomeEventHandler
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
@@ -35,9 +34,7 @@ import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.UtilGenerics;
|
||||
import org.apache.ofbiz.base.util.UtilHttp;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.entity.Delegator;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.entity.util.EntityUtilProperties;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
@@ -48,7 +45,6 @@ import org.apache.ofbiz.service.ServiceValidationException;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
|
||||
import org.apache.ofbiz.webapp.control.ControlActivationEventListener;
|
||||
import org.apache.ofbiz.widget.renderer.VisualTheme;
|
||||
|
||||
/**
|
||||
@@ -126,8 +122,6 @@ public class ServiceEventHandler implements EventHandler {
|
||||
Map<String, Object> rawParametersMap = UtilHttp.getCombinedMap(request);
|
||||
Map<String, Object> multiPartMap = UtilGenerics.checkMap(request.getAttribute("multiPartMap"));
|
||||
|
||||
Set<String> urlOnlyParameterNames = UtilHttp.getUrlOnlyParameterMap(request).keySet();
|
||||
|
||||
// we have a service and the model; build the context
|
||||
Map<String, Object> serviceContext = new HashMap<String, Object>();
|
||||
for (ModelParam modelParam: model.getInModelParamList()) {
|
||||
@@ -164,8 +158,6 @@ public class ServiceEventHandler implements EventHandler {
|
||||
|
||||
// check the request parameters
|
||||
if (UtilValidate.isEmpty(value)) {
|
||||
ServiceEventHandler.checkSecureParameter(requestMap, urlOnlyParameterNames, name, session, serviceName, dctx.getDelegator());
|
||||
|
||||
// if the service modelParam has allow-html="any" then get this direct from the request instead of in the parameters Map so there will be no canonicalization possibly messing things up
|
||||
if ("any".equals(modelParam.allowHtml)) {
|
||||
value = request.getParameter(name);
|
||||
@@ -295,33 +287,4 @@ public class ServiceEventHandler implements EventHandler {
|
||||
if (Debug.verboseOn()) Debug.logVerbose("[Event Return]: " + responseString, module);
|
||||
return responseString;
|
||||
}
|
||||
|
||||
public static void checkSecureParameter(RequestMap requestMap, Set<String> urlOnlyParameterNames, String name, HttpSession session, String serviceName, Delegator delegator) throws EventHandlerException {
|
||||
// special case for security: if this is a request-map defined as secure in controller.xml then only accept body parameters coming in, ie don't allow the insecure URL parameters
|
||||
// NOTE: the RequestHandler will check the HttpSerletRequest security to make sure it is secure if the request-map -> security -> https=true,
|
||||
// but we can't just look at the request.isSecure() method here because it is allowed to send secure requests for request-map with https=false
|
||||
if (requestMap != null && requestMap.securityHttps) {
|
||||
if (urlOnlyParameterNames.contains(name)) {
|
||||
String errMsg = "Found URL parameter [" + name + "] passed to secure (https) request-map with uri ["
|
||||
+ requestMap.uri + "] with an event that calls service ["
|
||||
+ serviceName + "]; this is not allowed for security reasons! The data should be encrypted by making it part of the request body "
|
||||
+ "(a form field) instead of the request URL."
|
||||
+ " Moreover it would be kind if you could create a Jira sub-task of https://issues.apache.org/jira/browse/OFBIZ-2330 "
|
||||
+ "(check before if a sub-task for this error does not exist)."
|
||||
+ " If you are not sure how to create a Jira issue please have a look before at https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Contributors+Best+Practices"
|
||||
+ " Thank you in advance for your help.";
|
||||
Debug.logError("=============== " + errMsg + "; In session [" + ControlActivationEventListener.showSessionId(session) + "]; Note that this can be changed using the service.http.parameters.require.encrypted property in the url.properties file", module);
|
||||
|
||||
// the default here is true, so anything but N/n is true
|
||||
boolean requireEncryptedServiceWebParameters = !EntityUtilProperties.propertyValueEqualsIgnoreCase("url", "service.http.parameters.require.encrypted", "N", delegator);
|
||||
|
||||
// NOTE: this forces service call event parameters to be in the body and not in the URL! can be issues with existing links, like Delete links or whatever, and those need to be changed to forms!
|
||||
if (requireEncryptedServiceWebParameters) {
|
||||
throw new EventHandlerException(errMsg);
|
||||
}
|
||||
}
|
||||
// NOTTODO: may want to allow parameters that map to entity PK fields to be in the URL, but that might be a big security hole since there are certain security sensitive entities that are made of only PK fields, or that only need PK fields to function (like UserLoginSecurityGroup)
|
||||
// NOTTODO: we could allow URL parameters when it is not a POST (ie when !request.getMethod().equalsIgnoreCase("POST")), but that would open a security hole where sensitive parameters can be passed on the URL in a GET/etc and bypass this security constraint
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-5
@@ -24,7 +24,6 @@ import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
@@ -173,8 +172,6 @@ public class ServiceMultiEventHandler implements EventHandler {
|
||||
throw new EventHandlerException(e);
|
||||
}
|
||||
|
||||
Set<String> urlOnlyParameterNames = UtilHttp.getUrlOnlyParameterMap(request).keySet();
|
||||
|
||||
// big try/finally to make sure commit or rollback are run
|
||||
boolean beganTrans = false;
|
||||
String returnString = null;
|
||||
@@ -234,8 +231,6 @@ public class ServiceMultiEventHandler implements EventHandler {
|
||||
if (value == null) {
|
||||
String name = paramName + curSuffix;
|
||||
|
||||
ServiceEventHandler.checkSecureParameter(requestMap, urlOnlyParameterNames, name, session, serviceName, dctx.getDelegator());
|
||||
|
||||
String[] paramArr = request.getParameterValues(name);
|
||||
if (paramArr != null) {
|
||||
if (paramArr.length > 1) {
|
||||
|
||||
@@ -20,6 +20,7 @@ package org.apache.ofbiz.webapp.stats;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
|
||||
import javax.servlet.http.Cookie;
|
||||
@@ -205,7 +206,7 @@ public class VisitHandler {
|
||||
|
||||
public static GenericValue getVisitor(HttpServletRequest request, HttpServletResponse response) {
|
||||
// this defaults to true: ie if anything but "false" it will be true
|
||||
Delegator delegator = (Delegator) request.getAttribute("delegator");
|
||||
Delegator delegator = (Delegator) request.getAttribute("delegator");
|
||||
if (!EntityUtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist.visitor", "false", delegator)) {
|
||||
HttpSession session = request.getSession();
|
||||
|
||||
@@ -226,7 +227,9 @@ public class VisitHandler {
|
||||
// first try to get the current ID from the visitor cookie
|
||||
String cookieVisitorId = null;
|
||||
Cookie[] cookies = request.getCookies();
|
||||
if (Debug.verboseOn()) Debug.logVerbose("Cookies:" + cookies, module);
|
||||
if (Debug.verboseOn()) {
|
||||
Debug.logVerbose("Cookies:" + String.join(",", Arrays.stream(cookies).toArray(String[]::new)), module);
|
||||
}
|
||||
if (cookies != null) {
|
||||
for (int i = 0; i < cookies.length; i++) {
|
||||
if (cookies[i].getName().equals(visitorCookieName)) {
|
||||
|
||||
@@ -19,13 +19,15 @@
|
||||
package org.apache.ofbiz.webtools;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Locale;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.UtilDateTime;
|
||||
import org.apache.ofbiz.base.util.UtilHttp;
|
||||
import org.apache.ofbiz.base.util.UtilMisc;
|
||||
@@ -38,9 +40,11 @@ import org.apache.ofbiz.security.Security;
|
||||
*/
|
||||
public final class UtilCacheEvents {
|
||||
|
||||
private static final String err_resource = "WebtoolsErrorUiLabels";
|
||||
private static final String ERR_RESOURCE = "WebtoolsErrorUiLabels";
|
||||
private static final String MODULE = UtilCacheEvents.class.getName();
|
||||
|
||||
private UtilCacheEvents() {}
|
||||
private UtilCacheEvents() {
|
||||
}
|
||||
|
||||
/** An HTTP WebEvent handler the specified element from the specified cache
|
||||
* @param request The HTTP request object for the current JSP or Servlet request.
|
||||
@@ -53,21 +57,21 @@ public final class UtilCacheEvents {
|
||||
|
||||
Security security = (Security) request.getAttribute("security");
|
||||
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
|
||||
String name = request.getParameter("UTIL_CACHE_NAME");
|
||||
if (name == null) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.noCacheNameSpecified", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.noCacheNameSpecified", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
String numString = request.getParameter("UTIL_CACHE_ELEMENT_NUMBER");
|
||||
|
||||
if (numString == null) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.noElementNumberSpecified", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.noElementNumberSpecified", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", "");
|
||||
return "error";
|
||||
}
|
||||
@@ -99,15 +103,17 @@ public final class UtilCacheEvents {
|
||||
|
||||
if (key != null) {
|
||||
utilCache.remove(key);
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.removeElementWithKey", UtilMisc.toMap("key", key.toString()), locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.removeElementWithKey", UtilMisc.toMap("key",
|
||||
key.toString()), locale) + ".";
|
||||
request.setAttribute("_EVENT_MESSAGE_", errMsg);
|
||||
} else {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name", name, "numString", numString), locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name",
|
||||
name, "numString", numString), locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
} else {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotRemoveElement", UtilMisc.toMap("name", name), locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotRemoveElement", UtilMisc.toMap("name", name), locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -125,7 +131,7 @@ public final class UtilCacheEvents {
|
||||
|
||||
Security security = (Security) request.getAttribute("security");
|
||||
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -133,7 +139,7 @@ public final class UtilCacheEvents {
|
||||
String name = request.getParameter("UTIL_CACHE_NAME");
|
||||
|
||||
if (name == null) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotClearCache", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotClearCache", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -141,10 +147,10 @@ public final class UtilCacheEvents {
|
||||
|
||||
if (utilCache != null) {
|
||||
utilCache.clear();
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
|
||||
request.setAttribute("_EVENT_MESSAGE_", errMsg);
|
||||
} else {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name), locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name), locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -162,17 +168,16 @@ public final class UtilCacheEvents {
|
||||
|
||||
Security security = (Security) request.getAttribute("security");
|
||||
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
|
||||
UtilCache.clearAllCaches();
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.clearAllCaches", locale);
|
||||
request.setAttribute("_EVENT_MESSAGE_", errMsg + " (" + UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss") + ").");
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.clearAllCaches", locale);
|
||||
request.setAttribute("_EVENT_MESSAGE_", errMsg + " (" + UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss") + ").");
|
||||
return "success";
|
||||
}
|
||||
|
||||
/** An HTTP WebEvent handler that clears the selected caches
|
||||
* @param request The HTTP request object for the current JSP or Servlet request.
|
||||
* @param response The HTTP response object for the current JSP or Servlet request.
|
||||
@@ -185,7 +190,7 @@ public final class UtilCacheEvents {
|
||||
|
||||
Security security = (Security) request.getAttribute("security");
|
||||
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -196,27 +201,27 @@ public final class UtilCacheEvents {
|
||||
int rowCount = UtilHttp.getMultiFormRowCount(ctx);
|
||||
for (int i = 0; i < rowCount; i++) {
|
||||
String suffix = UtilHttp.getMultiRowDelimiter() + i;
|
||||
isSelected = (ctx.containsKey("_rowSubmit" + suffix) && "Y".equalsIgnoreCase((String)ctx.get("_rowSubmit" + suffix)));
|
||||
isSelected = (ctx.containsKey("_rowSubmit" + suffix) && "Y".equalsIgnoreCase((String) ctx.get("_rowSubmit" + suffix)));
|
||||
if (!isSelected) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String name = request.getParameter("cacheName"+suffix);
|
||||
String name = request.getParameter("cacheName" + suffix);
|
||||
|
||||
if (name == null) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotClearCache", locale) + ".";
|
||||
eventList.add(errMsg);
|
||||
}
|
||||
|
||||
UtilCache<?, ?> utilCache = UtilCache.findCache(name);
|
||||
|
||||
if (utilCache != null) {
|
||||
utilCache.clear();
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotClearCache", locale) + ".";
|
||||
eventList.add(errMsg);
|
||||
} else {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name), locale) + ".";
|
||||
eventList.add(errMsg);
|
||||
UtilCache<?, ?> utilCache = UtilCache.findCache(name);
|
||||
if (utilCache != null) {
|
||||
utilCache.clear();
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
|
||||
eventList.add(errMsg);
|
||||
} else {
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotClearCacheNotFoundName",
|
||||
UtilMisc.toMap("name", name), locale) + ".";
|
||||
eventList.add(errMsg);
|
||||
}
|
||||
}
|
||||
}
|
||||
request.setAttribute("_EVENT_MESSAGE_LIST_", eventList);
|
||||
@@ -234,7 +239,7 @@ public final class UtilCacheEvents {
|
||||
|
||||
Security security = (Security) request.getAttribute("security");
|
||||
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCacheEvents.permissionEdit", locale) + ".";
|
||||
request.setAttribute("_EVENT_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -242,7 +247,7 @@ public final class UtilCacheEvents {
|
||||
String name = request.getParameter("UTIL_CACHE_NAME");
|
||||
|
||||
if (name == null) {
|
||||
errMsg = UtilProperties.getMessage(err_resource, "utilCache.couldNotUpdateCacheSetting", locale) + ".";
|
||||
errMsg = UtilProperties.getMessage(ERR_RESOURCE, "utilCache.couldNotUpdateCacheSetting", locale) + ".";
|
||||
request.setAttribute("_ERROR_MESSAGE_", errMsg);
|
||||
return "error";
|
||||
}
|
||||
@@ -255,18 +260,25 @@ public final class UtilCacheEvents {
|
||||
|
||||
try {
|
||||
maxInMemory = Integer.valueOf(maxInMemoryStr);
|
||||
} catch (Exception e) {}
|
||||
} catch (Exception e) {
|
||||
Debug.logError(e, MODULE);
|
||||
}
|
||||
|
||||
try {
|
||||
expireTime = Long.valueOf(expireTimeStr);
|
||||
} catch (Exception e) {}
|
||||
} catch (Exception e) {
|
||||
Debug.logError(e, MODULE);
|
||||
}
|
||||
|
||||
UtilCache<?, ?> utilCache = UtilCache.findCache(name);
|
||||
|
||||
if (utilCache != null) {
|
||||
if (maxInMemory != null)
|
||||
if (maxInMemory != null) {
|
||||
utilCache.setMaxInMemory(maxInMemory);
|
||||
if (expireTime != null)
|
||||
}
|
||||
if (expireTime != null) {
|
||||
utilCache.setExpireTime(expireTime);
|
||||
}
|
||||
if (useSoftReferenceStr != null) {
|
||||
utilCache.setUseSoftReference("true".equals(useSoftReferenceStr));
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ Place your custom jar files in here.
|
||||
If you want to use a public open source library, it is recommended
|
||||
that you do not place the library in here. Instead declare it as a
|
||||
dependency in your build scripts (build.gradle files) by finding the
|
||||
appropriate library in jcenter (https://bintray.com/bintray/jcenter)
|
||||
appropriate library in Maven (https://search.maven.org/)
|
||||
|
||||
@@ -695,7 +695,7 @@ Parameter: delegatorName, String, optional - name of the delegator in context.
|
||||
<#macro makeHyperlinkString hiddenFormName imgSrc title alternate linkUrl description linkStyle="" event="" action="" targetParameters="" targetWindow="" confirmation="" uniqueItemName="" height="" width="" id="">
|
||||
<#if uniqueItemName?has_content>
|
||||
<#local params = "{"presentation": "layer"">
|
||||
<#if targetParameters?has_content>
|
||||
<#if targetParameters?has_content && !targetParameters?is_hash>
|
||||
<#local parameterMap = targetParameters?eval>
|
||||
<#local parameterKeys = parameterMap?keys>
|
||||
<#list parameterKeys as key>
|
||||
|
||||
@@ -746,7 +746,7 @@ function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, def
|
||||
var queryArgs = {"term": request.term};
|
||||
if (typeof args == "object" && jQuery.isArray(args)) {
|
||||
for (var i = 0; i < args.length; i++) {
|
||||
queryArgs["parm" + i] = jQuery(args[i]).val();
|
||||
queryArgs["parm" + i] = jQuery(DOMPurify.sanitize(args[i]).val());
|
||||
}
|
||||
}
|
||||
jQuery.ajax({
|
||||
@@ -771,7 +771,7 @@ function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, def
|
||||
|
||||
if (typeof autocomp != 'undefined') {
|
||||
jQuery.each(autocomp, function(index, item){
|
||||
item.label = jQuery("<div>").html(item.label).text();
|
||||
item.label = DOMPurify.sanitize(jQuery("<div>").html(item.label).text());
|
||||
})
|
||||
// autocomp is the JSON Object which will be used for the autocomplete box
|
||||
response(autocomp);
|
||||
|
||||
@@ -0,0 +1,378 @@
|
||||
DOMPurify
|
||||
Copyright 2015 Mario Heiderich
|
||||
|
||||
DOMPurify is free software; you can redistribute it and/or modify it under the
|
||||
terms of either:
|
||||
|
||||
a) the Apache License Version 2.0, or
|
||||
b) the Mozilla Public License Version 2.0
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
|
||||
Licensed 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.
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
Mozilla Public License, version 2.0
|
||||
|
||||
1. Definitions
|
||||
|
||||
1.1. “Contributor”
|
||||
|
||||
means each individual or legal entity that creates, contributes to the
|
||||
creation of, or owns Covered Software.
|
||||
|
||||
1.2. “Contributor Version”
|
||||
|
||||
means the combination of the Contributions of others (if any) used by a
|
||||
Contributor and that particular Contributor’s Contribution.
|
||||
|
||||
1.3. “Contribution”
|
||||
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
1.4. “Covered Software”
|
||||
|
||||
means Source Code Form to which the initial Contributor has attached the
|
||||
notice in Exhibit A, the Executable Form of such Source Code Form, and
|
||||
Modifications of such Source Code Form, in each case including portions
|
||||
thereof.
|
||||
|
||||
1.5. “Incompatible With Secondary Licenses”
|
||||
means
|
||||
|
||||
a. that the initial Contributor has attached the notice described in
|
||||
Exhibit B to the Covered Software; or
|
||||
|
||||
b. that the Covered Software was made available under the terms of version
|
||||
1.1 or earlier of the License, but not also under the terms of a
|
||||
Secondary License.
|
||||
|
||||
1.6. “Executable Form”
|
||||
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
1.7. “Larger Work”
|
||||
|
||||
means a work that combines Covered Software with other material, in a separate
|
||||
file or files, that is not Covered Software.
|
||||
|
||||
1.8. “License”
|
||||
|
||||
means this document.
|
||||
|
||||
1.9. “Licensable”
|
||||
|
||||
means having the right to grant, to the maximum extent possible, whether at the
|
||||
time of the initial grant or subsequently, any and all of the rights conveyed by
|
||||
this License.
|
||||
|
||||
1.10. “Modifications”
|
||||
|
||||
means any of the following:
|
||||
|
||||
a. any file in Source Code Form that results from an addition to, deletion
|
||||
from, or modification of the contents of Covered Software; or
|
||||
|
||||
b. any new file in Source Code Form that contains any Covered Software.
|
||||
|
||||
1.11. “Patent Claims” of a Contributor
|
||||
|
||||
means any patent claim(s), including without limitation, method, process,
|
||||
and apparatus claims, in any patent Licensable by such Contributor that
|
||||
would be infringed, but for the grant of the License, by the making,
|
||||
using, selling, offering for sale, having made, import, or transfer of
|
||||
either its Contributions or its Contributor Version.
|
||||
|
||||
1.12. “Secondary License”
|
||||
|
||||
means either the GNU General Public License, Version 2.0, the GNU Lesser
|
||||
General Public License, Version 2.1, the GNU Affero General Public
|
||||
License, Version 3.0, or any later versions of those licenses.
|
||||
|
||||
1.13. “Source Code Form”
|
||||
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
1.14. “You” (or “Your”)
|
||||
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, “You” includes any entity that controls, is
|
||||
controlled by, or is under common control with You. For purposes of this
|
||||
definition, “control” means (a) the power, direct or indirect, to cause
|
||||
the direction or management of such entity, whether by contract or
|
||||
otherwise, or (b) ownership of more than fifty percent (50%) of the
|
||||
outstanding shares or beneficial ownership of such entity.
|
||||
|
||||
|
||||
2. License Grants and Conditions
|
||||
|
||||
2.1. Grants
|
||||
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
a. under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or as
|
||||
part of a Larger Work; and
|
||||
|
||||
b. under Patent Claims of such Contributor to make, use, sell, offer for
|
||||
sale, have made, import, and otherwise transfer either its Contributions
|
||||
or its Contributor Version.
|
||||
|
||||
2.2. Effective Date
|
||||
|
||||
The licenses granted in Section 2.1 with respect to any Contribution become
|
||||
effective for each Contribution on the date the Contributor first distributes
|
||||
such Contribution.
|
||||
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
The licenses granted in this Section 2 are the only rights granted under this
|
||||
License. No additional rights or licenses will be implied from the distribution
|
||||
or licensing of Covered Software under this License. Notwithstanding Section
|
||||
2.1(b) above, no patent license is granted by a Contributor:
|
||||
|
||||
a. for any code that a Contributor has removed from Covered Software; or
|
||||
|
||||
b. for infringements caused by: (i) Your and any other third party’s
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
c. under Patent Claims infringed by Covered Software in the absence of its
|
||||
Contributions.
|
||||
|
||||
This License does not grant any rights in the trademarks, service marks, or
|
||||
logos of any Contributor (except as may be necessary to comply with the
|
||||
notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this License
|
||||
(see Section 10.2) or under the terms of a Secondary License (if permitted
|
||||
under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its Contributions
|
||||
are its original creation(s) or it has sufficient rights to grant the
|
||||
rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under applicable
|
||||
copyright doctrines of fair use, fair dealing, or other equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
|
||||
Section 2.1.
|
||||
|
||||
|
||||
3. Responsibilities
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under the
|
||||
terms of this License. You must inform recipients that the Source Code Form
|
||||
of the Covered Software is governed by the terms of this License, and how
|
||||
they can obtain a copy of this License. You may not attempt to alter or
|
||||
restrict the recipients’ rights in the Source Code Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
a. such Covered Software must also be made available in Source Code Form,
|
||||
as described in Section 3.1, and You must inform recipients of the
|
||||
Executable Form how they can obtain a copy of such Source Code Form by
|
||||
reasonable means in a timely manner, at a charge no more than the cost
|
||||
of distribution to the recipient; and
|
||||
|
||||
b. You may distribute such Executable Form under the terms of this License,
|
||||
or sublicense it under different terms, provided that the license for
|
||||
the Executable Form does not attempt to limit or alter the recipients’
|
||||
rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for the
|
||||
Covered Software. If the Larger Work is a combination of Covered Software
|
||||
with a work governed by one or more Secondary Licenses, and the Covered
|
||||
Software is not Incompatible With Secondary Licenses, this License permits
|
||||
You to additionally distribute such Covered Software under the terms of
|
||||
such Secondary License(s), so that the recipient of the Larger Work may, at
|
||||
their option, further distribute the Covered Software under the terms of
|
||||
either this License or such Secondary License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices (including
|
||||
copyright notices, patent notices, disclaimers of warranty, or limitations
|
||||
of liability) contained within the Source Code Form of the Covered
|
||||
Software, except that You may alter any license notices to the extent
|
||||
required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on behalf
|
||||
of any Contributor. You must make it absolutely clear that any such
|
||||
warranty, support, indemnity, or liability obligation is offered by You
|
||||
alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this License
|
||||
with respect to some or all of the Covered Software due to statute, judicial
|
||||
order, or regulation then You must: (a) comply with the terms of this License
|
||||
to the maximum extent possible; and (b) describe the limitations and the code
|
||||
they affect. Such description must be placed in a text file included with all
|
||||
distributions of the Covered Software under this License. Except to the
|
||||
extent prohibited by statute or regulation, such description must be
|
||||
sufficiently detailed for a recipient of ordinary skill to be able to
|
||||
understand it.
|
||||
|
||||
5. Termination
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically if You
|
||||
fail to comply with any of its terms. However, if You become compliant,
|
||||
then the rights granted under this License from a particular Contributor
|
||||
are reinstated (a) provisionally, unless and until such Contributor
|
||||
explicitly and finally terminates Your grants, and (b) on an ongoing basis,
|
||||
if such Contributor fails to notify You of the non-compliance by some
|
||||
reasonable means prior to 60 days after You have come back into compliance.
|
||||
Moreover, Your grants from a particular Contributor are reinstated on an
|
||||
ongoing basis if such Contributor notifies You of the non-compliance by
|
||||
some reasonable means, this is the first time You have received notice of
|
||||
non-compliance with this License from such Contributor, and You become
|
||||
compliant prior to 30 days after Your receipt of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions, counter-claims,
|
||||
and cross-claims) alleging that a Contributor Version directly or
|
||||
indirectly infringes any patent, then the rights granted to You by any and
|
||||
all Contributors for the Covered Software under Section 2.1 of this License
|
||||
shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
|
||||
license agreements (excluding distributors and resellers) which have been
|
||||
validly granted by You or Your distributors under this License prior to
|
||||
termination shall survive termination.
|
||||
|
||||
6. Disclaimer of Warranty
|
||||
|
||||
Covered Software is provided under this License on an “as is” basis, without
|
||||
warranty of any kind, either expressed, implied, or statutory, including,
|
||||
without limitation, warranties that the Covered Software is free of defects,
|
||||
merchantable, fit for a particular purpose or non-infringing. The entire
|
||||
risk as to the quality and performance of the Covered Software is with You.
|
||||
Should any Covered Software prove defective in any respect, You (not any
|
||||
Contributor) assume the cost of any necessary servicing, repair, or
|
||||
correction. This disclaimer of warranty constitutes an essential part of this
|
||||
License. No use of any Covered Software is authorized under this License
|
||||
except under this disclaimer.
|
||||
|
||||
7. Limitation of Liability
|
||||
|
||||
Under no circumstances and under no legal theory, whether tort (including
|
||||
negligence), contract, or otherwise, shall any Contributor, or anyone who
|
||||
distributes Covered Software as permitted above, be liable to You for any
|
||||
direct, indirect, special, incidental, or consequential damages of any
|
||||
character including, without limitation, damages for lost profits, loss of
|
||||
goodwill, work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses, even if such party shall have been
|
||||
informed of the possibility of such damages. This limitation of liability
|
||||
shall not apply to liability for death or personal injury resulting from such
|
||||
party’s negligence to the extent applicable law prohibits such limitation.
|
||||
Some jurisdictions do not allow the exclusion or limitation of incidental or
|
||||
consequential damages, so this exclusion and limitation may not apply to You.
|
||||
|
||||
8. Litigation
|
||||
|
||||
Any litigation relating to this License may be brought only in the courts of
|
||||
a jurisdiction where the defendant maintains its principal place of business
|
||||
and such litigation shall be governed by laws of that jurisdiction, without
|
||||
reference to its conflict-of-law provisions. Nothing in this Section shall
|
||||
prevent a party’s ability to bring cross-claims or counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
|
||||
This License represents the complete agreement concerning the subject matter
|
||||
hereof. If any provision of this License is held to be unenforceable, such
|
||||
provision shall be reformed only to the extent necessary to make it
|
||||
enforceable. Any law or regulation which provides that the language of a
|
||||
contract shall be construed against the drafter shall not be used to construe
|
||||
this License against a Contributor.
|
||||
|
||||
|
||||
10. Versions of the License
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version of
|
||||
the License under which You originally received the Covered Software, or
|
||||
under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a modified
|
||||
version of this License if you rename the license and remove any
|
||||
references to the name of the license steward (except to note that such
|
||||
modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
|
||||
If You choose to distribute Source Code Form that is Incompatible With
|
||||
Secondary Licenses under the terms of this version of the License, the
|
||||
notice described in Exhibit B of this License must be attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
|
||||
This Source Code Form is subject to the
|
||||
terms of the Mozilla Public License, v.
|
||||
2.0. If a copy of the MPL was not
|
||||
distributed with this file, You can
|
||||
obtain one at
|
||||
http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular file, then
|
||||
You may include the notice in a location (such as a LICENSE file in a relevant
|
||||
directory) where a recipient would be likely to look for such a notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - “Incompatible With Secondary Licenses” Notice
|
||||
|
||||
This Source Code Form is “Incompatible
|
||||
With Secondary Licenses”, as defined by
|
||||
the Mozilla Public License, v. 2.0.
|
||||
|
||||
@@ -0,0 +1,348 @@
|
||||
# DOMPurify
|
||||
|
||||
[](http://badge.fury.io/js/dompurify)  [](https://www.npmjs.com/package/dompurify) [](https://cdn.jsdelivr.net/npm/dompurify/dist/purify.min.js) [](https://packagephobia.now.sh/result?p=dompurify) [](https://github.com/cure53/DOMPurify/network/dependents)
|
||||
|
||||
[](https://nodei.co/npm/dompurify/)
|
||||
|
||||
DOMPurify is a DOM-only, super-fast, uber-tolerant XSS sanitizer for HTML, MathML and SVG.
|
||||
|
||||
It's also very simple to use and get started with. DOMPurify was [started in February 2014](https://github.com/cure53/DOMPurify/commit/a630922616927373485e0e787ab19e73e3691b2b) and, meanwhile, has reached version 2.3.3.
|
||||
|
||||
DOMPurify is written in JavaScript and works in all modern browsers (Safari (10+), Opera (15+), Internet Explorer (10+), Edge, Firefox and Chrome - as well as almost anything else using Blink or WebKit). It doesn't break on MSIE6 or other legacy browsers. It either uses [a fall-back](#what-about-older-browsers-like-msie8) or simply does nothing.
|
||||
|
||||
Our automated tests cover [17 different browsers](https://github.com/cure53/DOMPurify/blob/main/test/karma.custom-launchers.config.js#L5) right now, more to come. We also cover Node.js v14.15.1, v15.4.0, running DOMPurify on [jsdom](https://github.com/tmpvar/jsdom). Older Node.js versions are known to work as well.
|
||||
|
||||
DOMPurify is written by security people who have vast background in web attacks and XSS. Fear not. For more details please also read about our [Security Goals & Threat Model](https://github.com/cure53/DOMPurify/wiki/Security-Goals-&-Threat-Model). Please, read it. Like, really.
|
||||
|
||||
## What does it do?
|
||||
|
||||
DOMPurify sanitizes HTML and prevents XSS attacks. You can feed DOMPurify with string full of dirty HTML and it will return a string (unless configured otherwise) with clean HTML. DOMPurify will strip out everything that contains dangerous HTML and thereby prevent XSS attacks and other nastiness. It's also damn bloody fast. We use the technologies the browser provides and turn them into an XSS filter. The faster your browser, the faster DOMPurify will be.
|
||||
|
||||
## How do I use it?
|
||||
|
||||
It's easy. Just include DOMPurify on your website.
|
||||
|
||||
### Using the unminified development version
|
||||
|
||||
```html
|
||||
<script type="text/javascript" src="src/purify.js"></script>
|
||||
```
|
||||
|
||||
### Using the minified and tested production version (source-map available)
|
||||
|
||||
```html
|
||||
<script type="text/javascript" src="dist/purify.min.js"></script>
|
||||
```
|
||||
|
||||
Afterwards you can sanitize strings by executing the following code:
|
||||
|
||||
```js
|
||||
let clean = DOMPurify.sanitize( dirty );
|
||||
```
|
||||
|
||||
The resulting HTML can be written into a DOM element using `innerHTML` or the DOM using `document.write()`. That is fully up to you.
|
||||
Note that by default, we permit HTML, SVG **and** MathML. If you only need HTML, which might be a very common use-case, you can easily set that up as well:
|
||||
|
||||
```js
|
||||
let clean = DOMPurify.sanitize( dirty , {USE_PROFILES: {html: true}} );
|
||||
```
|
||||
|
||||
### Is there any foot-gun potential?
|
||||
|
||||
Well, please note, if you _first_ sanitize HTML and then modify it _afterwards_, you might easily **void the effects of sanitization**. If you feed the sanitized markup to another library _after_ sanitization, please be certain that the library doesn't mess around with the HTML on its own.
|
||||
|
||||
### Okay, makes sense, let's move on
|
||||
|
||||
After sanitizing your markup, you can also have a look at the property `DOMPurify.removed` and find out, what elements and attributes were thrown out. Please **do not use** this property for making any security critical decisions. This is just a little helper for curious minds.
|
||||
|
||||
If you're using an [AMD](https://github.com/amdjs/amdjs-api/wiki/AMD) module loader like [Require.js](http://requirejs.org/), you can load this script asynchronously as well:
|
||||
|
||||
```js
|
||||
import DOMPurify from 'dompurify';
|
||||
|
||||
var clean = DOMPurify.sanitize(dirty);
|
||||
```
|
||||
|
||||
DOMPurify also works server-side with Node.js as well as client-side via [Browserify](http://browserify.org/) or similar translators. At least Node.js 4.x or newer is required. Our support strives to follow the [Node.js release cycle](https://nodejs.org/en/about/releases/). DOMPurify intends to support any version being flagged as active. At the same time we phase out support for any version flagged as maintenance. DOMPurify might not break with all versions in maintenance immediately but stops to run tests against these older versions.
|
||||
|
||||
```bash
|
||||
npm install dompurify
|
||||
```
|
||||
|
||||
For JSDOM v10 or newer
|
||||
|
||||
```js
|
||||
const createDOMPurify = require('dompurify');
|
||||
const { JSDOM } = require('jsdom');
|
||||
|
||||
const window = new JSDOM('').window;
|
||||
const DOMPurify = createDOMPurify(window);
|
||||
|
||||
const clean = DOMPurify.sanitize(dirty);
|
||||
```
|
||||
|
||||
For JSDOM versions older than v10
|
||||
|
||||
```js
|
||||
const createDOMPurify = require('dompurify');
|
||||
const jsdom = require('jsdom').jsdom;
|
||||
|
||||
const window = jsdom('').defaultView;
|
||||
const DOMPurify = createDOMPurify(window);
|
||||
|
||||
const clean = DOMPurify.sanitize(dirty);
|
||||
```
|
||||
|
||||
## Is there a demo?
|
||||
|
||||
Of course there is a demo! [Play with DOMPurify](https://cure53.de/purify)
|
||||
|
||||
## What if I find a _security_ bug?
|
||||
|
||||
First of all, please immediately contact us via [email](mailto:mario@cure53.de) so we can work on a fix. [PGP key](https://keyserver.ubuntu.com/pks/lookup?op=vindex&search=0xC26C858090F70ADA)
|
||||
|
||||
Also, you probably qualify for a bug bounty! The fine folks over at [Fastmail](https://www.fastmail.com/) use DOMPurify for their services and added our library to their bug bounty scope. So, if you find a way to bypass or weaken DOMPurify, please also have a look at their website and the [bug bounty info](https://www.fastmail.com/about/bugbounty.html).
|
||||
|
||||
## Some purification samples please?
|
||||
|
||||
How does purified markup look like? Well, [the demo](https://cure53.de/purify) shows it for a big bunch of nasty elements. But let's also show some smaller examples!
|
||||
|
||||
```js
|
||||
DOMPurify.sanitize('<img src=x onerror=alert(1)//>'); // becomes <img src="x">
|
||||
DOMPurify.sanitize('<svg><g/onload=alert(2)//<p>'); // becomes <svg><g></g></svg>
|
||||
DOMPurify.sanitize('<p>abc<iframe//src=jAva	script:alert(3)>def</p>'); // becomes <p>abc</p>
|
||||
DOMPurify.sanitize('<math><mi//xlink:href="data:x,<script>alert(4)</script>">'); // becomes <math><mi></mi></math>
|
||||
DOMPurify.sanitize('<TABLE><tr><td>HELLO</tr></TABL>'); // becomes <table><tbody><tr><td>HELLO</td></tr></tbody></table>
|
||||
DOMPurify.sanitize('<UL><li><A HREF=//google.com>click</UL>'); // becomes <ul><li><a href="//google.com">click</a></li></ul>
|
||||
```
|
||||
|
||||
## What is supported?
|
||||
|
||||
DOMPurify currently supports HTML5, SVG and MathML. DOMPurify per default allows CSS, HTML custom data attributes. DOMPurify also supports the Shadow DOM - and sanitizes DOM templates recursively. DOMPurify also allows you to sanitize HTML for being used with the jQuery `$()` and `elm.html()` API without any known problems.
|
||||
|
||||
## What about older browsers like MSIE8?
|
||||
|
||||
DOMPurify offers a fall-back behavior for older MSIE browsers. It uses the MSIE-only `toStaticHTML` feature to sanitize. Note however that in this fall-back mode, pretty much none of the configuration flags shown below have any effect. You need to handle that yourself.
|
||||
|
||||
If not even `toStaticHTML` is supported, DOMPurify does nothing at all. It simply returns exactly the string that you fed it.
|
||||
|
||||
DOMPurify also exposes a property called `isSupported`, which tells you whether DOMPurify will be able to do its job.
|
||||
|
||||
## What about DOMPurify and Trusted Types?
|
||||
|
||||
In version 1.0.9, support for [Trusted Types API](https://github.com/WICG/trusted-types) was added to DOMPurify.
|
||||
In version 2.0.0, a config flag was added to control DOMPurify's behavior regarding this.
|
||||
|
||||
When `DOMPurify.sanitize` is used in an environment where the Trusted Types API is available and `RETURN_TRUSTED_TYPE` is set to `true`, it tries to return a `TrustedHTML` value instead of a string (the behavior for `RETURN_DOM`, `RETURN_DOM_FRAGMENT`, and `RETURN_DOM_IMPORT` config options does not change).
|
||||
|
||||
## Can I configure DOMPurify?
|
||||
|
||||
Yes. The included default configuration values are pretty good already - but you can of course override them. Check out the [`/demos`](https://github.com/cure53/DOMPurify/tree/main/demos) folder to see a bunch of examples on how you can [customize DOMPurify](https://github.com/cure53/DOMPurify/tree/main/demos#what-is-this).
|
||||
|
||||
```js
|
||||
/**
|
||||
* General settings
|
||||
*/
|
||||
|
||||
// strip {{ ... }} and <% ... %> to make output safe for template systems
|
||||
// be careful please, this mode is not recommended for production usage.
|
||||
// allowing template parsing in user-controlled HTML is not advised at all.
|
||||
// only use this mode if there is really no alternative.
|
||||
var clean = DOMPurify.sanitize(dirty, {SAFE_FOR_TEMPLATES: true});
|
||||
|
||||
/**
|
||||
* Control our allow-lists and block-lists
|
||||
*/
|
||||
// allow only <b> elements, very strict
|
||||
var clean = DOMPurify.sanitize(dirty, {ALLOWED_TAGS: ['b']});
|
||||
|
||||
// allow only <b> and <q> with style attributes
|
||||
var clean = DOMPurify.sanitize(dirty, {ALLOWED_TAGS: ['b', 'q'], ALLOWED_ATTR: ['style']});
|
||||
|
||||
// allow all safe HTML elements but neither SVG nor MathML
|
||||
// note that the USE_PROFILES setting will override the ALLOWED_TAGS setting
|
||||
// so don't use them together
|
||||
var clean = DOMPurify.sanitize(dirty, {USE_PROFILES: {html: true}});
|
||||
|
||||
// allow all safe SVG elements and SVG Filters, no HTML or MathML
|
||||
var clean = DOMPurify.sanitize(dirty, {USE_PROFILES: {svg: true, svgFilters: true}});
|
||||
|
||||
// allow all safe MathML elements and SVG, but no SVG Filters
|
||||
var clean = DOMPurify.sanitize(dirty, {USE_PROFILES: {mathMl: true, svg: true}});
|
||||
|
||||
// change the default namespace from HTML to something different
|
||||
var clean = DOMPurify.sanitize(dirty, {NAMESPACE: 'http://www.w3.org/2000/svg'});
|
||||
|
||||
// leave all safe HTML as it is and add <style> elements to block-list
|
||||
var clean = DOMPurify.sanitize(dirty, {FORBID_TAGS: ['style']});
|
||||
|
||||
// leave all safe HTML as it is and add style attributes to block-list
|
||||
var clean = DOMPurify.sanitize(dirty, {FORBID_ATTR: ['style']});
|
||||
|
||||
// extend the existing array of allowed tags and add <my-tag> to allow-list
|
||||
var clean = DOMPurify.sanitize(dirty, {ADD_TAGS: ['my-tag']});
|
||||
|
||||
// extend the existing array of allowed attributes and add my-attr to allow-list
|
||||
var clean = DOMPurify.sanitize(dirty, {ADD_ATTR: ['my-attr']});
|
||||
|
||||
// prohibit HTML5 data attributes, leave other safe HTML as is (default is true)
|
||||
var clean = DOMPurify.sanitize(dirty, {ALLOW_DATA_ATTR: false});
|
||||
|
||||
/**
|
||||
* Control behavior relating to URI values
|
||||
*/
|
||||
// extend the existing array of elements that can use Data URIs
|
||||
var clean = DOMPurify.sanitize(dirty, {ADD_DATA_URI_TAGS: ['a', 'area']});
|
||||
|
||||
// extend the existing array of elements that are safe for URI-like values (be careful, XSS risk)
|
||||
var clean = DOMPurify.sanitize(dirty, {ADD_URI_SAFE_ATTR: ['my-attr']});
|
||||
|
||||
/**
|
||||
* Control permitted attribute values
|
||||
*/
|
||||
// allow external protocol handlers in URL attributes (default is false, be careful, XSS risk)
|
||||
// by default only http, https, ftp, ftps, tel, mailto, callto, cid and xmpp are allowed.
|
||||
var clean = DOMPurify.sanitize(dirty, {ALLOW_UNKNOWN_PROTOCOLS: true});
|
||||
|
||||
// allow specific protocols handlers in URL attributes via regex (default is false, be careful, XSS risk)
|
||||
// by default only http, https, ftp, ftps, tel, mailto, callto, cid and xmpp are allowed.
|
||||
// Default RegExp: /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i;
|
||||
var clean = DOMPurify.sanitize(dirty, {ALLOWED_URI_REGEXP: /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp|xxx):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i;});
|
||||
|
||||
/**
|
||||
* Influence the return-type
|
||||
*
|
||||
* Careful, this setting has foot-gun potential! If you set RETURN_DOM or RETURN_DOM_FRAGMENT to true, don't set RETURN_DOM_IMPORT to false!
|
||||
* By default, our settings are secure - we believe - but returning a DOM *and* manually setting RETURN_DOM_IMPORT to false will give you XSS in some situations.
|
||||
*/
|
||||
// return a DOM HTMLBodyElement instead of an HTML string (default is false)
|
||||
var clean = DOMPurify.sanitize(dirty, {RETURN_DOM: true});
|
||||
|
||||
// return a DOM DocumentFragment instead of an HTML string (default is false)
|
||||
var clean = DOMPurify.sanitize(dirty, {RETURN_DOM_FRAGMENT: true});
|
||||
|
||||
// return a DOM DocumentFragment instead of an HTML string (default is false)
|
||||
// also import it into the current document (default is false).
|
||||
// RETURN_DOM_IMPORT must be set if you would like to append
|
||||
// the returned node to the current document (default is true)
|
||||
var clean = DOMPurify.sanitize(dirty, {RETURN_DOM_FRAGMENT: true, RETURN_DOM_IMPORT: true});
|
||||
document.body.appendChild(clean);
|
||||
|
||||
// use the RETURN_TRUSTED_TYPE flag to turn on Trusted Types support if available
|
||||
var clean = DOMPurify.sanitize(dirty, {RETURN_TRUSTED_TYPE: true}); // will return a TrustedHTML object instead of a string if possible
|
||||
|
||||
/**
|
||||
* Influence how we sanitize
|
||||
*/
|
||||
// return entire document including <html> tags (default is false)
|
||||
var clean = DOMPurify.sanitize(dirty, {WHOLE_DOCUMENT: true});
|
||||
|
||||
// disable DOM Clobbering protection on output (default is true, handle with care, minor XSS risks here)
|
||||
var clean = DOMPurify.sanitize(dirty, {SANITIZE_DOM: false});
|
||||
|
||||
// keep an element's content when the element is removed (default is true)
|
||||
var clean = DOMPurify.sanitize(dirty, {KEEP_CONTENT: false});
|
||||
|
||||
// glue elements like style, script or others to document.body and prevent unintuitive browser behavior in several edge-cases (default is false)
|
||||
var clean = DOMPurify.sanitize(dirty, {FORCE_BODY: true});
|
||||
|
||||
// change the parser type so sanitized data is treated as XML and not as HTML, which is the default
|
||||
var clean = DOMPurify.sanitize(dirty, {PARSER_MEDIA_TYPE: 'application/xhtml+xml'});
|
||||
|
||||
/**
|
||||
* Influence where we sanitize
|
||||
*/
|
||||
// use the IN_PLACE mode to sanitize a node "in place", which is much faster depending on how you use DOMPurify
|
||||
var dirty = document.createElement('a');
|
||||
dirty.setAttribute('href', 'javascript:alert(1)');
|
||||
var clean = DOMPurify.sanitize(dirty, {IN_PLACE: true}); // see https://github.com/cure53/DOMPurify/issues/288 for more info
|
||||
```
|
||||
|
||||
There is even [more examples here](https://github.com/cure53/DOMPurify/tree/main/demos#what-is-this), showing how you can run, customize and configure DOMPurify to fit your needs.
|
||||
|
||||
## Persistent Configuration
|
||||
|
||||
Instead of repeatedly passing the same configuration to `DOMPurify.sanitize`, you can use the `DOMPurify.setConfig` method. Your configuration will persist until your next call to `DOMPurify.setConfig`, or until you invoke `DOMPurify.clearConfig` to reset it. Remember that there is only one active configuration, which means once it is set, all extra configuration parameters passed to `DOMPurify.sanitize` are ignored.
|
||||
|
||||
## Hooks
|
||||
|
||||
DOMPurify allows you to augment its functionality by attaching one or more functions with the `DOMPurify.addHook` method to one of the following hooks:
|
||||
|
||||
- `beforeSanitizeElements`
|
||||
- `uponSanitizeElement` (No 's' - called for every element)
|
||||
- `afterSanitizeElements`
|
||||
- `beforeSanitizeAttributes`
|
||||
- `uponSanitizeAttribute`
|
||||
- `afterSanitizeAttributes`
|
||||
- `beforeSanitizeShadowDOM`
|
||||
- `uponSanitizeShadowNode`
|
||||
- `afterSanitizeShadowDOM`
|
||||
|
||||
It passes the currently processed DOM node, when needed a literal with verified node and attribute data and the DOMPurify configuration to the callback. Check out the [MentalJS hook demo](https://github.com/cure53/DOMPurify/blob/main/demos/hooks-mentaljs-demo.html) to see how the API can be used nicely.
|
||||
|
||||
_Example_:
|
||||
|
||||
```js
|
||||
DOMPurify.addHook('beforeSanitizeElements', function (
|
||||
currentNode,
|
||||
hookEvent,
|
||||
config
|
||||
) {
|
||||
// Do something with the current node and return it
|
||||
// You can also mutate hookEvent (i.e. set hookEvent.forceKeepAttr = true)
|
||||
return currentNode;
|
||||
});
|
||||
```
|
||||
|
||||
## Continuous Integration
|
||||
|
||||
We are currently using Github Actions in combination with BrowserStack. This gives us the possibility to confirm for each and every commit that all is going according to plan in all supported browsers. Check out the build logs here: https://github.com/cure53/DOMPurify/actions
|
||||
|
||||
You can further run local tests by executing `npm test`. The tests work fine with Node.js v0.6.2 and jsdom@8.5.0.
|
||||
|
||||
All relevant commits will be signed with the key `0x24BB6BF4` for additional security (since 8th of April 2016).
|
||||
|
||||
### Development and contributing
|
||||
|
||||
#### Installation (`yarn i`)
|
||||
|
||||
We support both `yarn` and `npm@5.2` officially while providing lock-files for either dependency manager to provide reproducible installs and builds on either or. TravisCI itself is configured to install dependencies using `yarn`. When using an older version of `npm` we can not fully ensure the versions of installed dependencies which might lead to unanticipated problems.
|
||||
|
||||
#### Scripts
|
||||
|
||||
We rely on npm run-scripts for integrating with our tooling infrastructure. We use ESLint as a pre-commit hook to ensure code consistency. Moreover, to ease formatting we use [prettier](https://github.com/prettier/prettier) while building the `/dist` assets happens through `rollup`.
|
||||
|
||||
These are our npm scripts:
|
||||
|
||||
- `npm run dev` to start building while watching sources for changes
|
||||
- `npm run test` to run our test suite via jsdom and karma
|
||||
- `test:jsdom` to only run tests through jsdom
|
||||
- `test:karma` to only run tests through karma
|
||||
- `npm run lint` to lint the sources using ESLint (via xo)
|
||||
- `npm run format` to format our sources using prettier to ease to pass ESLint
|
||||
- `npm run build` to build our distribution assets minified and unminified as a UMD module
|
||||
- `npm run build:umd` to only build an unminified UMD module
|
||||
- `npm run build:umd:min` to only build a minified UMD module
|
||||
|
||||
Note: all run scripts triggered via `npm run <script>` can also be started using `yarn <script>`.
|
||||
|
||||
There are more npm scripts but they are mainly to integrate with CI or are meant to be "private" for instance to amend build distribution files with every commit.
|
||||
|
||||
## Security Mailing List
|
||||
|
||||
We maintain a mailing list that notifies whenever a security-critical release of DOMPurify was published. This means, if someone found a bypass and we fixed it with a release (which always happens when a bypass was found) a mail will go out to that list. This usually happens within minutes or few hours after learning about a bypass. The list can be subscribed to here:
|
||||
|
||||
[https://lists.ruhr-uni-bochum.de/mailman/listinfo/dompurify-security](https://lists.ruhr-uni-bochum.de/mailman/listinfo/dompurify-security)
|
||||
|
||||
Feature releases will not be announced to this list.
|
||||
|
||||
## Who contributed?
|
||||
|
||||
Many people helped and help DOMPurify become what it is and need to be acknowledged here!
|
||||
|
||||
[GrantGryczan 💸](https://github.com/GrantGryczan), [lowdefy 💸](https://twitter.com/lowdefy), [granlem 💸](https://twitter.com/MaximeVeit), [oreoshake 💸](https://github.com/oreoshake), [dcramer 💸](https://github.com/dcramer),[tdeekens ❤️](https://github.com/tdeekens), [peernohell ❤️](https://github.com/peernohell), [NateScarlet](https://github.com/NateScarlet), [neilj](https://github.com/neilj), [fhemberger](https://github.com/fhemberger), [Joris-van-der-Wel](https://github.com/Joris-van-der-Wel), [ydaniv](https://github.com/ydaniv), [terjanq](https://twitter.com/terjanq), [filedescriptor](https://github.com/filedescriptor), [ConradIrwin](https://github.com/ConradIrwin), [gibson042](https://github.com/gibson042), [choumx](https://github.com/choumx), [0xSobky](https://github.com/0xSobky), [styfle](https://github.com/styfle), [koto](https://github.com/koto), [tlau88](https://github.com/tlau88), [strugee](https://github.com/strugee), [oparoz](https://github.com/oparoz), [mathiasbynens](https://github.com/mathiasbynens), [edg2s](https://github.com/edg2s), [dnkolegov](https://github.com/dnkolegov), [dhardtke](https://github.com/dhardtke), [wirehead](https://github.com/wirehead), [thorn0](https://github.com/thorn0), [styu](https://github.com/styu), [mozfreddyb](https://github.com/mozfreddyb), [mikesamuel](https://github.com/mikesamuel), [jorangreef](https://github.com/jorangreef), [jimmyhchan](https://github.com/jimmyhchan), [jameydeorio](https://github.com/jameydeorio), [jameskraus](https://github.com/jameskraus), [hyderali](https://github.com/hyderali), [hansottowirtz](https://github.com/hansottowirtz), [hackvertor](https://github.com/hackvertor), [freddyb](https://github.com/freddyb), [flavorjones](https://github.com/flavorjones), [djfarrelly](https://github.com/djfarrelly), [devd](https://github.com/devd), [camerondunford](https://github.com/camerondunford), [buu700](https://github.com/buu700), [buildog](https://github.com/buildog), [alabiaga](https://github.com/alabiaga), [Vector919](https://github.com/Vector919), [Robbert](https://github.com/Robbert), [GreLI](https://github.com/GreLI), [FuzzySockets](https://github.com/FuzzySockets), [ArtemBernatskyy](https://github.com/ArtemBernatskyy), [@garethheyes](https://twitter.com/garethheyes), [@shafigullin](https://twitter.com/shafigullin), [@mmrupp](https://twitter.com/mmrupp), [@irsdl](https://twitter.com/irsdl),[ShikariSenpai](https://github.com/ShikariSenpai), [ansjdnakjdnajkd](https://github.com/ansjdnakjdnajkd), [@asutherland](https://twitter.com/asutherland), [@mathias](https://twitter.com/mathias), [@cgvwzq](https://twitter.com/cgvwzq), [@robbertatwork](https://twitter.com/robbertatwork), [@giutro](https://twitter.com/giutro), [@CmdEngineer_](https://twitter.com/CmdEngineer_), [@avr4mit](https://twitter.com/avr4mit) and especially [@securitymb ❤️](https://twitter.com/securitymb) & [@masatokinugawa ❤️](https://twitter.com/masatokinugawa)
|
||||
|
||||
## Testing powered by
|
||||
<a target="_blank" href="https://www.browserstack.com/"><img width="200" src="https://www.browserstack.com/images/layout/browserstack-logo-600x315.png"></a><br>
|
||||
|
||||
And last but not least, thanks to [BrowserStack Open-Source Program](https://www.browserstack.com/open-source) for supporting this project with their services for free and delivering excellent, dedicated and very professional support on top of that.
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,140 @@
|
||||
{
|
||||
"scripts": {
|
||||
"build-demo": "node scripts/build-demo.js",
|
||||
"lint": "xo src/*.js",
|
||||
"format": "yarn format:js && yarn format:md",
|
||||
"format:md": "prettier --write --parser markdown '**/*.md'",
|
||||
"format:js": "prettier --write '{src,demos,scripts,test,website}/*.js'",
|
||||
"commit-amend-build": "scripts/commit-amend-build.sh",
|
||||
"prebuild": "rimraf dist/**",
|
||||
"dev": "cross-env NODE_ENV=development BABEL_ENV=rollup rollup -w -c -o dist/purify.js",
|
||||
"build": "cross-env run-p build:umd build:umd:min build:es build:cjs",
|
||||
"build:umd": "cross-env NODE_ENV=development BABEL_ENV=rollup rollup -c -f umd -o dist/purify.js",
|
||||
"build:umd:min": "cross-env NODE_ENV=production BABEL_ENV=rollup rollup -c -f umd -o dist/purify.min.js",
|
||||
"build:es": "cross-env NODE_ENV=development BABEL_ENV=rollup rollup -c -f es -o dist/purify.es.js",
|
||||
"build:cjs": "cross-env NODE_ENV=development BABEL_ENV=rollup rollup -c -f cjs -o dist/purify.cjs.js",
|
||||
"test:jsdom": "cross-env NODE_ENV=test BABEL_ENV=rollup node test/jsdom-node-runner --dot",
|
||||
"test:karma": "cross-env NODE_ENV=test BABEL_ENV=rollup karma start test/karma.conf.js --log-level warn ",
|
||||
"test:ci": "cross-env NODE_ENV=test BABEL_ENV=rollup npm run test:jsdom && npm run test:karma -- --log-level error --reporters dots --single-run --shouldTestOnBrowserStack=\"${TEST_BROWSERSTACK}\" --shouldProbeOnly=\"${TEST_PROBE_ONLY}\"",
|
||||
"test": "cross-env NODE_ENV=test BABEL_ENV=rollup npm run lint && npm run test:jsdom && npm run test:karma -- --browsers Chrome"
|
||||
},
|
||||
"main": "dist/purify.cjs.js",
|
||||
"module": "dist/purify.es.js",
|
||||
"browser": "dist/purify.js",
|
||||
"files": [
|
||||
"dist"
|
||||
],
|
||||
"pre-commit": [
|
||||
"lint",
|
||||
"build",
|
||||
"commit-amend-build"
|
||||
],
|
||||
"xo": {
|
||||
"semicolon": true,
|
||||
"space": 2,
|
||||
"extends": [
|
||||
"prettier"
|
||||
],
|
||||
"plugins": [
|
||||
"prettier"
|
||||
],
|
||||
"rules": {
|
||||
"import/no-useless-path-segments": 0,
|
||||
"unicorn/prefer-optional-catch-binding": 0,
|
||||
"unicorn/prefer-node-remove": 0,
|
||||
"prettier/prettier": [
|
||||
"error",
|
||||
{
|
||||
"trailingComma": "es5",
|
||||
"singleQuote": true
|
||||
}
|
||||
],
|
||||
"camelcase": [
|
||||
"error",
|
||||
{
|
||||
"properties": "never"
|
||||
}
|
||||
]
|
||||
},
|
||||
"globals": [
|
||||
"window",
|
||||
"VERSION"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/plugin-external-helpers": "7.12.13",
|
||||
"babel": "^6.23.0",
|
||||
"babel-core": "^6.26.3",
|
||||
"babel-preset-env": "^1.7.0",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-prettier": "^3.4.0",
|
||||
"he": "^1.2.0",
|
||||
"jquery": "^3.6.0",
|
||||
"jsdom": "16.x.x",
|
||||
"karma": "^5.1.0",
|
||||
"karma-browserstack-launcher": "^1.5.1",
|
||||
"karma-chrome-launcher": "^2.2.0",
|
||||
"karma-firefox-launcher": "^1.3.0",
|
||||
"karma-fixture": "^0.2.6",
|
||||
"karma-html2js-preprocessor": "^1.0.0",
|
||||
"karma-json-fixtures-preprocessor": "0.0.6",
|
||||
"karma-qunit": "^1.0.0",
|
||||
"karma-rollup-preprocessor": "^5.0.2",
|
||||
"lodash.isarray": "^4.0.0",
|
||||
"lodash.sample": "^4.2.1",
|
||||
"minimist": "^1.2.5",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"pre-commit": "^1.2.2",
|
||||
"prettier": "^2.3.0",
|
||||
"qunit-parameterize": "^0.4.0",
|
||||
"qunit-tap": "^1.5.0",
|
||||
"qunitjs": "^1.23.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"rollup": "^0.68.2",
|
||||
"rollup-plugin-babel": "^3.0.3",
|
||||
"rollup-plugin-commonjs": "^8.4.1",
|
||||
"rollup-plugin-includepaths": "^0.2.3",
|
||||
"rollup-plugin-node-resolve": "^3.4.0",
|
||||
"rollup-plugin-replace": "^2.2.0",
|
||||
"rollup-plugin-terser": "^7.0.2",
|
||||
"rollup-watch": "^4.3.1",
|
||||
"xo": "^0.40.1"
|
||||
},
|
||||
"resolutions": {
|
||||
"natives": "1.1.6"
|
||||
},
|
||||
"name": "dompurify",
|
||||
"description": "DOMPurify is a DOM-only, super-fast, uber-tolerant XSS sanitizer for HTML, MathML and SVG. It's written in JavaScript and works in all modern browsers (Safari, Opera (15+), Internet Explorer (10+), Firefox and Chrome - as well as almost anything else using Blink or WebKit). DOMPurify is written by security people who have vast background in web attacks and XSS. Fear not.",
|
||||
"version": "2.3.3",
|
||||
"directories": {
|
||||
"test": "test"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/cure53/DOMPurify.git"
|
||||
},
|
||||
"keywords": [
|
||||
"dom",
|
||||
"xss",
|
||||
"html",
|
||||
"svg",
|
||||
"mathml",
|
||||
"security",
|
||||
"secure",
|
||||
"sanitizer",
|
||||
"sanitize",
|
||||
"filter",
|
||||
"purify"
|
||||
],
|
||||
"author": "Mario Heiderich <mario@cure53.de> (https://cure53.de/)",
|
||||
"license": "(MPL-2.0 OR Apache-2.0)",
|
||||
"bugs": {
|
||||
"url": "https://github.com/cure53/DOMPurify/issues"
|
||||
},
|
||||
"homepage": "https://github.com/cure53/DOMPurify"
|
||||
|
||||
,"_resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.3.tgz"
|
||||
,"_integrity": "sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg=="
|
||||
,"_from": "dompurify@2.3.3"
|
||||
}
|
||||
@@ -304,7 +304,7 @@ var Lookup = function(options) {
|
||||
var queryArgs = "presentation=" + options.presentation;
|
||||
if (typeof options.args == "object" && jQuery.isArray(options.args)) {
|
||||
for ( var i = 0; i < options.args.length; i++) {
|
||||
queryArgs += "&parm" + i + "=" + jQuery(options.args[i]).val();
|
||||
queryArgs += "&parm" + i + "=" + jQuery(DOMPurify.sanitize(options.args[i])).val();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -850,4 +850,4 @@ if (typeof String.prototype.trim !== 'function') {
|
||||
String.prototype.trim = function() {
|
||||
return this.replace(/^\s+|\s+$/g, '');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -360,6 +360,7 @@ under the License.
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/browser-plugin/jquery.browser-0.1.0.min.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-migrate-3.3.0.min.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-3.5.1.min.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/common/js/util/dompurify/dist/purify.min.js"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/common/js/util/OfbizUtil.js" global="true"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -457,6 +458,7 @@ under the License.
|
||||
<set field="layoutSettings.styleSheets[+0]" value="/common/js/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.6.3.min.css" global="true" />
|
||||
|
||||
<set field="layoutSettings.javaScripts[]" value="/common/js/plugins/OpenLayers-5.3.0.js" global="true" />
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/common/js/util/dompurify/dist/purify.min.js"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/common/js/util/OfbizUtil.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/common/js/util/fieldlookup.js" global="true"/>
|
||||
<!-- The default (global) shortcut icon -->
|
||||
|
||||
@@ -69,6 +69,7 @@ under the License.
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/plugins/validate/jquery.validate.min.js"/>
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/plugins/OpenLayers-5.3.0.js"/>
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js"/>
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/util/dompurify/dist/purify.min.js"/>
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/util/OfbizUtil.js"/>
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/util/fieldlookup.js"/>
|
||||
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/plugins/date/date.format-1.2.3-min.js"/>
|
||||
|
||||
Reference in New Issue
Block a user