Compare commits
143
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fcb8bc56c7 | ||
|
|
c0b5072a90 | ||
|
|
598f70f501 | ||
|
|
b2f5822343 | ||
|
|
ff617d4eaa | ||
|
|
1bbb80c425 | ||
|
|
03faa5b187 | ||
|
|
68941bba7e | ||
|
|
8164849e4d | ||
|
|
23ce22c51d | ||
|
|
9c18374ad3 | ||
|
|
cac40a6032 | ||
|
|
c4d3353386 | ||
|
|
d8d1b03722 | ||
|
|
e539734b75 | ||
|
|
3a32a39a6c | ||
|
|
61efccbca0 | ||
|
|
c88074d784 | ||
|
|
a238456f36 | ||
|
|
1663da5a4a | ||
|
|
1ced939556 | ||
|
|
b7b2d1fd6f | ||
|
|
5cc45e8701 | ||
|
|
63ecc059ec | ||
|
|
ce84fdb3ca | ||
|
|
c0511d01cb | ||
|
|
ff92c4bc9c | ||
|
|
16ed130367 | ||
|
|
6789011488 | ||
|
|
bb59eb95b1 | ||
|
|
871ce2aa2e | ||
|
|
b24dcff344 | ||
|
|
9a6b54af2e | ||
|
|
3797e60375 | ||
|
|
843b1c7e71 | ||
|
|
56478e4420 | ||
|
|
3df59b5e6d | ||
|
|
630258751d | ||
|
|
5e76565b04 | ||
|
|
c4bd082359 | ||
|
|
6cf0c732c1 | ||
|
|
7482dc6966 | ||
|
|
fd71686e6a | ||
|
|
71adde61b5 | ||
|
|
d89e8e2789 | ||
|
|
3eea7d967d | ||
|
|
06006f1666 | ||
|
|
f289a80749 | ||
|
|
247b8713ba | ||
|
|
34d68d5f6f | ||
|
|
6da27fd220 | ||
|
|
f65410ba1d | ||
|
|
0de23fa780 | ||
|
|
d54abff8c2 | ||
|
|
1ed929cfc6 | ||
|
|
c638ec26f8 | ||
|
|
50fc66c8e0 | ||
|
|
668e801ada | ||
|
|
e29e9a288a | ||
|
|
4d68d1e92e | ||
|
|
40e525aba4 | ||
|
|
cb5c385286 | ||
|
|
bc0363f12d | ||
|
|
2405ca77a5 | ||
|
|
afd3c36b5f | ||
|
|
61e8ae2f1e | ||
|
|
d4834a0e3a | ||
|
|
9e5fe10736 | ||
|
|
43fe479e58 | ||
|
|
0a25c932ac | ||
|
|
dcb348e5b6 | ||
|
|
03bc88dd15 | ||
|
|
61ddf046a5 | ||
|
|
047849f42b | ||
|
|
9967d30caa | ||
|
|
4ab4b15ade | ||
|
|
e7955fc064 | ||
|
|
77a2c747b0 | ||
|
|
fb95c796bb | ||
|
|
6871ef0c9c | ||
|
|
702fde61bb | ||
|
|
27a9f3fe72 | ||
|
|
accec0efdd | ||
|
|
c8cee7a86e | ||
|
|
c12a801d7b | ||
|
|
40e89450ae | ||
|
|
243127fc92 | ||
|
|
0962230091 | ||
|
|
5132a0653d | ||
|
|
cb7955da16 | ||
|
|
49483e8a7a | ||
|
|
bd95879141 | ||
|
|
0ff3ff00f1 | ||
|
|
817c596e2c | ||
|
|
b3d8434f36 | ||
|
|
71c853fe82 | ||
|
|
7809b73583 | ||
|
|
61c28602c2 | ||
|
|
90d93d5e99 | ||
|
|
87eb402bcd | ||
|
|
015f60f982 | ||
|
|
9020f03390 | ||
|
|
dc9d71fe3b | ||
|
|
d38ff24cf3 | ||
|
|
c4088961d3 | ||
|
|
9853d10bd9 | ||
|
|
5b6e427f24 | ||
|
|
0d8de91657 | ||
|
|
e5b5075126 | ||
|
|
99441469dc | ||
|
|
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,45 @@
|
||||
# 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
|
||||
# Below does not work, see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
|
||||
# - name: Builds with Gradle, checks style and run integration tests (just to know if they pass)
|
||||
# run: ./gradlew pullAllPluginsSource check loadAll testIntegration
|
||||
@@ -37,3 +37,5 @@ desktop.ini
|
||||
.*.swp
|
||||
.*.swo
|
||||
*.patch
|
||||
/themes/common-theme/webapp/common/js/node_modules/
|
||||
/docs/asciidoc/images/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Apache OFBiz
|
||||
Copyright 2001-2018 The Apache Software Foundation
|
||||
Copyright 2001-2022 The Apache Software Foundation
|
||||
|
||||
This product includes software developed at
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
||||
|
||||
+44
-19
@@ -19,9 +19,18 @@ 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://ci2.apache.org/badges/ofbiz18Framework.svg[link=https://ci2.apache.org/badges/ofbizBranch18Framework.svg]
|
||||
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://sonarcloud.io/api/project_badges/measure?project=apache_ofbiz-framework&metric=alert_status&branch=release18.12[link=notReadyYet]
|
||||
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
|
||||
https://nightlies.apache.org/ofbiz/stable/readme/html5/[HTML]
|
||||
//or https://nightlies.apache.org/ofbiz/stable/readme/pdf/[HTML] +[PDF] format Not Ready Yet see
|
||||
or https://ci.apache.org/projects/ofbiz/site/stable/readme/pdf/README.pdf[PDF] format
|
||||
|
||||
---
|
||||
|
||||
@@ -64,13 +73,19 @@ The only requirements to run OFBiz is
|
||||
* to have the Java Development Kit (JDK) version 8 installed on your system
|
||||
(not just the JRE, but the full JDK) that you can download from the below link.
|
||||
Make sure of setting the $JAVA_HOME environment variable. +
|
||||
https://adoptopenjdk.net/[JDK download], https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know more about the JDK]
|
||||
|
||||
https://adoptopenjdk.net/[JDK download].
|
||||
|
||||
https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know more about the JDK]
|
||||
|
||||
[WARNING]
|
||||
==================
|
||||
On Windows don't put OFBiz in a directory with space/s in the path.
|
||||
==================
|
||||
|
||||
* If on Windows, a Powershell version >= 7.1.3 installed that you can download from the below link. +
|
||||
https://github.com/PowerShell/PowerShell[Powershell]
|
||||
|
||||
|
||||
|
||||
[[quick-start]]
|
||||
// tag::quickstart[]
|
||||
== Quick start
|
||||
@@ -82,12 +97,31 @@ the command line at the OFBiz top level directory (folder).
|
||||
=== Download the Gradle wrapper:
|
||||
|
||||
MS Windows: `init-gradle-wrapper`
|
||||
[IMPORTANT]
|
||||
====
|
||||
* If you cross the error
|
||||
[quote]
|
||||
____
|
||||
"Powershell is not recognized as an internal or external command, operable program or batch file"
|
||||
____
|
||||
|
||||
follow the advice there: https://s.apache.org/vdcv8. If you want more details see: https://s.apache.org/ac7no
|
||||
|
||||
* If you run into problems check the the execution policy of PowerShell. See https://s.apache.org/urnju for details.
|
||||
By setting the execution policy to "unrestricted", you'll be prompted to run the script once you run the init-gradle-wrapper command.
|
||||
|
||||
====
|
||||
[NOTE]
|
||||
====
|
||||
If you wonder where are stored the PowerShell Executables, here are the answers: https://s.apache.org/w5dye
|
||||
====
|
||||
|
||||
Unix-like OS: `./gradle/init-gradle-wrapper.sh`
|
||||
|
||||
[[prepare-ofbiz]]
|
||||
=== Prepare OFBiz:
|
||||
|
||||
==== Clean system and load the complete OFBiz data
|
||||
_________________________________________________________________________________________________________________________________________________________________________________________________________________
|
||||
_Note_: Depending on your Internet connection speed it might take a long time
|
||||
for this step to complete if you are using OFBiz for the first time as it needs
|
||||
@@ -134,7 +168,8 @@ Once proper mitigations to the security issues are complete the OFBiz team will
|
||||
disclose this information to the public mailing list.
|
||||
* If you find a post-auth security issue, please https://s.apache.org/dsj2p[create a bug in our issue tracker (Jira)] .
|
||||
|
||||
|
||||
* If you want to use AJP on a non localhost OFBiz instance, you need to set the value of allowedRequestAttributesPattern
|
||||
in framework/catalina/ofbiz-component.xml
|
||||
|
||||
You can find more information about security in OFBiz at
|
||||
https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure[Keeping OFBiz secure]
|
||||
@@ -642,9 +677,8 @@ If you need username and password to access the custom repository:
|
||||
[[pull-an-official-plugin-from-source-control]]
|
||||
=== Pull an official plugin from source control
|
||||
|
||||
Download an official plugin from source control (currently subversion) and place
|
||||
it in the plugins directory. In addition, this task also executes the "install"
|
||||
task if it is defined for the plugin being downloaded.
|
||||
Download an official plugin from source control and place it in the plugins directory.
|
||||
In addition, this task also executes the "install" task if it is defined for the plugin being downloaded.
|
||||
|
||||
This task is mostly useful when working on the trunk branch as it pulls in the
|
||||
latest version of a plugin.
|
||||
@@ -652,15 +686,11 @@ latest version of a plugin.
|
||||
`gradlew pullPluginSource -PpluginId=ecommerce`
|
||||
|
||||
________________________________________________________________________________________
|
||||
_Note_: This plugin will have its own .svn directory placed inside the plugin
|
||||
directory.
|
||||
________________________________________________________________________________________
|
||||
|
||||
[[pull-all-official-plugins-from-source-control]]
|
||||
=== Pull all official plugins from source control
|
||||
|
||||
Download all officially supported plugins from source control (currently
|
||||
subversion) and place them inclusive of their ".svn" directory in /plugins.
|
||||
subversion) and place them in /plugins.
|
||||
WARNING! This task deletes the /plugins directory and replaces it with the
|
||||
official plugins.
|
||||
|
||||
@@ -672,11 +702,6 @@ not recommend using this task on releases of OFBiz, instead consider using the
|
||||
"pullPlugin" task to get the correct version of a plugin compatible with your
|
||||
release.
|
||||
|
||||
____________________________________________________________________________________
|
||||
_Note_: All the plugins will share a .svn directory placed in the plugins
|
||||
directory.
|
||||
____________________________________________________________________________________
|
||||
|
||||
[[install-a-plugin]]
|
||||
=== Install a plugin
|
||||
|
||||
|
||||
@@ -7517,7 +7517,7 @@
|
||||
<property key="AccountingInvNr">
|
||||
<value xml:lang="ar">رقم الفاتورة</value>
|
||||
<value xml:lang="cs">Číslo faktury</value>
|
||||
<value xml:lang="de">Inv.Nr</value>
|
||||
<value xml:lang="de">Rg.Nr</value>
|
||||
<value xml:lang="en">Inv.Nr</value>
|
||||
<value xml:lang="es">Nr.Fact</value>
|
||||
<value xml:lang="fr">Fact. n°</value>
|
||||
|
||||
+16
-5
@@ -37,6 +37,7 @@ import java.util.Map.Entry;
|
||||
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.csv.CSVFormat;
|
||||
import org.apache.commons.csv.CSVFormat.Builder;
|
||||
import org.apache.commons.csv.CSVRecord;
|
||||
import org.apache.ofbiz.accounting.payment.PaymentGatewayServices;
|
||||
import org.apache.ofbiz.accounting.payment.PaymentWorker;
|
||||
@@ -3552,8 +3553,8 @@ public class InvoiceServices {
|
||||
String organizationPartyId = (String) context.get("organizationPartyId");
|
||||
String encoding = System.getProperty("file.encoding");
|
||||
String csvString = Charset.forName(encoding).decode(fileBytes).toString();
|
||||
final BufferedReader csvReader = new BufferedReader(new StringReader(csvString));
|
||||
CSVFormat fmt = CSVFormat.DEFAULT.withHeader();
|
||||
Builder csvFormatBuilder = Builder.create().setHeader();
|
||||
CSVFormat fmt = csvFormatBuilder.build();
|
||||
List<String> errMsgs = new LinkedList<>();
|
||||
List<String> newErrMsgs;
|
||||
String lastInvoiceId = null;
|
||||
@@ -3561,7 +3562,7 @@ public class InvoiceServices {
|
||||
String newInvoiceId = null;
|
||||
int invoicesCreated = 0;
|
||||
|
||||
try {
|
||||
try (BufferedReader csvReader = new BufferedReader(new StringReader(csvString))) {
|
||||
for (final CSVRecord rec : fmt.parse(csvReader)) {
|
||||
currentInvoiceId = rec.get("invoiceId");
|
||||
if (lastInvoiceId == null || !currentInvoiceId.equals(lastInvoiceId)) {
|
||||
@@ -3626,11 +3627,18 @@ public class InvoiceServices {
|
||||
try {
|
||||
invoiceResult = dispatcher.runSync("createInvoice", invoice);
|
||||
if (ServiceUtil.isError(invoiceResult)) {
|
||||
// Eclipse reports here: Resource leak: '<unassigned Closeable value>' is not closed at this location
|
||||
// but it's OK. As csvReader is in a try-with-ressource it will be closed anyway
|
||||
// I prefer to not put @SuppressWarnings("resource") to the whole method
|
||||
// BTW to be consistent Eclipse should also reports the same issue in PartyService (see there)
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(invoiceResult));
|
||||
}
|
||||
} catch (GenericServiceException e) {
|
||||
csvReader.close();
|
||||
Debug.logError(e, module);
|
||||
// Eclipse reports here: Resource leak: '<unassigned Closeable value>' is not closed at this location
|
||||
// but it's OK. As csvReader is in a try-with-ressource it will be closed anyway
|
||||
// I prefer to not put @SuppressWarnings("resource") to the whole method
|
||||
// BTW to be consistent Eclipse should also reports the same issue in PartyService (see there)
|
||||
return ServiceUtil.returnError(e.getMessage());
|
||||
}
|
||||
newInvoiceId = (String) invoiceResult.get("invoiceId");
|
||||
@@ -3685,10 +3693,13 @@ public class InvoiceServices {
|
||||
try {
|
||||
Map<String, Object> result = dispatcher.runSync("createInvoiceItem", invoiceItem);
|
||||
if (ServiceUtil.isError(result)) {
|
||||
// Eclipse reports here: Resource leak: '<unassigned Closeable value>' is not closed at this location
|
||||
// but it's OK. As csvReader is in a try-with-ressource it will be closed anyway
|
||||
// I prefer to not put @SuppressWarnings("resource") to the whole method
|
||||
// BTW to be consistent Eclipse should also reports the same issue in PartyService (see there)
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
|
||||
}
|
||||
} catch (GenericServiceException e) {
|
||||
csvReader.close();
|
||||
Debug.logError(e, module);
|
||||
return ServiceUtil.returnError(e.getMessage());
|
||||
}
|
||||
|
||||
+19
@@ -23,6 +23,7 @@ import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
@@ -49,6 +50,7 @@ import org.apache.ofbiz.entity.condition.EntityOperator;
|
||||
import org.apache.ofbiz.entity.model.ModelUtil;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.entity.util.EntityUtil;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.security.Security;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
@@ -143,6 +145,20 @@ public class ContentManagementServices {
|
||||
Map<String, Object> context = UtilMisc.makeMapWritable(rcontext);
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
|
||||
// Check if a webshell is not uploaded
|
||||
String textData = (String) context.get("textData");
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
try {
|
||||
if (!SecuredUpload.isValidText(textData, Collections.emptyList())) {
|
||||
Debug.logError("================== Not saved for security reason ==================", module);
|
||||
return ServiceUtil.returnError("================== Not saved for security reason ==================");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Debug.logError("================== Not saved for security reason ==================", module);
|
||||
return ServiceUtil.returnError("================== Not saved for security reason ==================");
|
||||
}
|
||||
}
|
||||
|
||||
// Knowing why a request fails permission check is one of the more difficult
|
||||
// aspects of content management. Setting "displayFailCond" to true will
|
||||
// put an html table in result.errorMessage that will show what tests were performed
|
||||
@@ -1638,6 +1654,9 @@ public class ContentManagementServices {
|
||||
File file = new File(objectInfo);
|
||||
if (file.isFile()) {
|
||||
try {
|
||||
// Check if a webshell is not uploaded
|
||||
// This should now be useless after the add of SecuredUpload::isValidFile in GroovyBaseScript for createAnonFile service.
|
||||
// But I prefer to keep it anyway, it's hard to test all cases, better safe than sorry
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(objectInfo, "All", delegator)) {
|
||||
errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
}
|
||||
|
||||
+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
|
||||
|
||||
@@ -21,6 +21,7 @@ package org.apache.ofbiz.content.data;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.Collections;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -41,6 +42,7 @@ import org.apache.ofbiz.entity.GenericEntityException;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.entity.util.EntityUtilProperties;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
@@ -82,10 +84,16 @@ public class DataEvents {
|
||||
// get the permission service required for streaming data; default is always the genericContentPermission
|
||||
String permissionService = EntityUtilProperties.getPropertyValue("content", "stream.permission.service", "genericContentPermission", delegator);
|
||||
|
||||
// This is counterintuitive but it works, for OFBIZ-11840
|
||||
// It could be improved by checking for possible events associated with svg
|
||||
// As listed at https://portswigger.net/web-security/cross-site-scripting/cheat-sheet
|
||||
if (contentId.contains("<svg")) {
|
||||
// For OFBIZ-11840, checks if a webshell is not uploaded
|
||||
// It's counterintuitive to return success but it makes sense if you thing about it.
|
||||
// It simply returns a blank screen.
|
||||
try {
|
||||
if (!SecuredUpload.isValidText(contentId, Collections.emptyList())) {
|
||||
Debug.logError("================== Not saved for security reason ==================", module);
|
||||
return "success";
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Debug.logError("================== Not saved for security reason ==================", module);
|
||||
return "success";
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -408,7 +408,6 @@ public class DataResourceWorker implements org.apache.ofbiz.widget.content.Data
|
||||
|
||||
public static String getMimeTypeWithByteBuffer(java.nio.ByteBuffer buffer) throws IOException {
|
||||
byte[] b = buffer.array();
|
||||
|
||||
Tika tika = new Tika();
|
||||
return tika.detect(b);
|
||||
}
|
||||
|
||||
@@ -49,6 +49,7 @@ import org.apache.ofbiz.entity.Delegator;
|
||||
import org.apache.ofbiz.entity.GenericEntityException;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.ModelService;
|
||||
@@ -195,7 +196,30 @@ public class DataServices {
|
||||
return createFileMethod(dctx, context);
|
||||
}
|
||||
|
||||
public static Map<String, Object> createFileNoPerm(DispatchContext dctx, Map<String, ? extends Object> rcontext) {
|
||||
public static Map<String, Object> createFileNoPerm(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws IOException,
|
||||
ImageReadException {
|
||||
String originalFileName = (String) rcontext.get("dataResourceName");
|
||||
String fileNameAndPath = (String) rcontext.get("objectInfo");
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Locale locale = (Locale) rcontext.get("locale");
|
||||
File file = new File(fileNameAndPath);
|
||||
if (!originalFileName.isEmpty()) {
|
||||
// Check the file name
|
||||
if (!SecuredUpload.isValidFileName(originalFileName, delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
// TODO we could verify the file type (here "All") with dataResourceTypeId. Anyway it's done with isValidFile()
|
||||
// We would just have a better error message
|
||||
if (file.exists()) {
|
||||
// Check if a webshell is not uploaded
|
||||
if (!SecuredUpload.isValidFile(fileNameAndPath, "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, Object> context = UtilMisc.makeMapWritable(rcontext);
|
||||
context.put("skipPermissionCheck", "true");
|
||||
return createFileMethod(dctx, context);
|
||||
@@ -254,7 +278,9 @@ public class DataServices {
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);) {
|
||||
out.write(textData);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedTextFileFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -265,10 +291,11 @@ public class DataServices {
|
||||
}
|
||||
} else if (binData != null) {
|
||||
try {
|
||||
// Check if a webshell is not uploaded
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, binData.array(), StandardOpenOption.APPEND);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "All", delegator)) {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(tempFile.toString(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -460,7 +487,9 @@ public class DataServices {
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);) {
|
||||
out.write(textData);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedTextFileFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -472,9 +501,10 @@ public class DataServices {
|
||||
} else if (binData != null) {
|
||||
try {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, binData.array(), StandardOpenOption.APPEND);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
if (!SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -647,7 +677,8 @@ public class DataServices {
|
||||
try (FileOutputStream out = new FileOutputStream(file);) {
|
||||
out.write(imageData);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -706,7 +737,8 @@ public class DataServices {
|
||||
try (FileOutputStream out = new FileOutputStream(file);) {
|
||||
out.write(imageData);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
|
||||
@@ -2079,6 +2079,7 @@ under the License.
|
||||
<view-map name="EditAddContent" type="screen" page="component://content/widget/cms/CMSScreens.xml#EditAddContent"/>
|
||||
<view-map name="EditAddSubContent" type="screen" page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent"/>
|
||||
|
||||
<view-map name="ViewBinaryDataResource" page="" type="simplecontent"/>
|
||||
<view-map name="ListContentRevisions" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisions"/>
|
||||
<view-map name="EditContentRevision" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentRevision"/>
|
||||
<view-map name="ListContentRevisionItem" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisionItem"/>
|
||||
|
||||
@@ -72,7 +72,7 @@ function lookupInventory() {
|
||||
<td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td>
|
||||
<td width='5%'> </td>
|
||||
<td>
|
||||
<@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate!nowTimestamp}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
|
||||
<@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -80,7 +80,7 @@ under the License.
|
||||
</field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text-find/></field>
|
||||
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find default-value="${nowTimestamp}"/></field>
|
||||
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find/></field>
|
||||
<field name="facilityId" title="${uiLabelMap.ProductFacilityId}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]">
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -24,7 +24,7 @@ under the License.
|
||||
<field name="requirementId"><text-find/></field>
|
||||
<field name="partyId" title="${uiLabelMap.PartySupplier}"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="requirementByDate"><date-find type="date"/></field>
|
||||
<field name="requiredByDate"><date-find type="date"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="RequirementsList" type="multi" use-row-submit="true" target="addRequirementsToCart" title="" list-name="requirementsForSupplier"
|
||||
|
||||
@@ -282,7 +282,7 @@ under the License.
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="requirementByDate"><date-find type="date"/></field>
|
||||
<field name="requiredByDate"><date-find type="date"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ApprovedProductRequirementsList" type="list" title="" list-name="requirementsForSupplier" paginate-target="RequirementsForSupplier"
|
||||
|
||||
@@ -34,6 +34,7 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.csv.CSVFormat;
|
||||
import org.apache.commons.csv.CSVFormat.Builder;
|
||||
import org.apache.commons.csv.CSVRecord;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.UtilDateTime;
|
||||
@@ -2326,7 +2327,8 @@ public class PartyServices {
|
||||
ByteBuffer fileBytes = (ByteBuffer) context.get("uploadedFile");
|
||||
String encoding = System.getProperty("file.encoding");
|
||||
String csvString = Charset.forName(encoding).decode(fileBytes).toString();
|
||||
CSVFormat fmt = CSVFormat.DEFAULT.withHeader();
|
||||
Builder csvFormatBuilder = Builder.create().setHeader();
|
||||
CSVFormat fmt = csvFormatBuilder.build();
|
||||
List<String> errMsgs = new LinkedList<>();
|
||||
List<String> newErrMsgs = new LinkedList<>();
|
||||
String lastPartyId = null; // last partyId read from the csv file
|
||||
@@ -2356,7 +2358,7 @@ public class PartyServices {
|
||||
|
||||
|
||||
try (BufferedReader csvReader = new BufferedReader(new StringReader(csvString))) {
|
||||
for (final CSVRecord rec : fmt.parse(csvReader)) {
|
||||
for (CSVRecord rec : fmt.parse(csvReader)) {
|
||||
if (UtilValidate.isNotEmpty(rec.get("partyId"))) {
|
||||
currentPartyId = rec.get("partyId");
|
||||
}
|
||||
|
||||
@@ -10956,6 +10956,7 @@
|
||||
<value xml:lang="zh-TW">尋找庫存細項標籤</value>
|
||||
</property>
|
||||
<property key="PageTitleFindProduct">
|
||||
<value xml:lang="de">Produkt suchen</value>
|
||||
<value xml:lang="en">Find Product</value>
|
||||
<value xml:lang="fr">Recherche d'articles</value>
|
||||
<value xml:lang="it">Ricerca prodotti</value>
|
||||
@@ -12741,7 +12742,7 @@
|
||||
</property>
|
||||
<property key="ProductAddProductsUsingDefaultQuantities">
|
||||
<value xml:lang="cs">Přidat výrobky této skupiny do košíku v přednastaveném možství</value>
|
||||
<value xml:lang="de">Produkte dieser Produktgruppe in der vorgegebenen Menge in den Warenkorb legen</value>
|
||||
<value xml:lang="de">Produkte dieser Produktkategorie in der vorgegebenen Menge in den Warenkorb legen</value>
|
||||
<value xml:lang="en">Add Products in this Category to the Cart using Default Quantities</value>
|
||||
<value xml:lang="en-GB">Add Products in this Category to the basket using default quantities</value>
|
||||
<value xml:lang="es">Agregue los productos en esta categoría al carro usando cantidades predeterminadas</value>
|
||||
@@ -12979,7 +12980,7 @@
|
||||
</property>
|
||||
<property key="ProductAdvancedSearchInCategory">
|
||||
<value xml:lang="cs">Rozšířené hledání ve skupině výrobků</value>
|
||||
<value xml:lang="de">Erweiterte Suche in der Produktgruppe</value>
|
||||
<value xml:lang="de">Erweiterte Suche in der Produktkategorie</value>
|
||||
<value xml:lang="en">Advanced Search in Category</value>
|
||||
<value xml:lang="es">Búsqueda Avanzada en las Categorías</value>
|
||||
<value xml:lang="fr">Recherche avancée dans la catégorie</value>
|
||||
@@ -14082,7 +14083,7 @@
|
||||
</property>
|
||||
<property key="ProductBrowseCategories">
|
||||
<value xml:lang="cs">Výběr skupiny výrobků</value>
|
||||
<value xml:lang="de">Produktgruppen durchsuchen</value>
|
||||
<value xml:lang="de">Produktkategorien durchsuchen</value>
|
||||
<value xml:lang="en">Browse Categories</value>
|
||||
<value xml:lang="es">Hojear Categorías</value>
|
||||
<value xml:lang="fr">Parcourir les catégories</value>
|
||||
@@ -14562,7 +14563,7 @@
|
||||
</property>
|
||||
<property key="ProductCategory">
|
||||
<value xml:lang="cs">Skupina výrobků</value>
|
||||
<value xml:lang="de">Produktgruppe</value>
|
||||
<value xml:lang="de">Kategorie</value>
|
||||
<value xml:lang="en">Category</value>
|
||||
<value xml:lang="es">Categoría</value>
|
||||
<value xml:lang="fr">Catégorie</value>
|
||||
@@ -14678,7 +14679,7 @@
|
||||
</property>
|
||||
<property key="ProductCategoryNotFoundForCategoryID">
|
||||
<value xml:lang="cs">Skupina výrobků nenalezena</value>
|
||||
<value xml:lang="de">Produktgruppe wurde nicht gefunden mit ID</value>
|
||||
<value xml:lang="de">Kategorie wurde nicht gefunden mit ID</value>
|
||||
<value xml:lang="en">Category not found for Category ID</value>
|
||||
<value xml:lang="es">Categoría no encontrada por ID</value>
|
||||
<value xml:lang="fr">Aucune catégorie pour cet réf.</value>
|
||||
@@ -14695,11 +14696,11 @@
|
||||
<value xml:lang="zh-TW">沒有找到分類識別</value>
|
||||
</property>
|
||||
<property key="ProductCategoryAttrAlreadyExists">
|
||||
<value xml:lang="de">Eine Attribut mit diesem Namen existiert bereits für die Produktgruppe mit dieser ID.</value>
|
||||
<value xml:lang="de">Eine Attribut mit diesem Namen existiert bereits für die Kategorie mit dieser ID.</value>
|
||||
<value xml:lang="en">There already is an attribute with this name for a group with this ID.</value>
|
||||
</property>
|
||||
<property key="ProductCategoryAlreadyExists">
|
||||
<value xml:lang="de">Eine Produktgruppe mit dieser ID existiert bereits.</value>
|
||||
<value xml:lang="de">Eine Kategorie mit dieser ID existiert bereits.</value>
|
||||
<value xml:lang="en">There already is a Category with this ID.</value>
|
||||
</property>
|
||||
<property key="ProductCategoryNoVariants">
|
||||
@@ -15058,7 +15059,7 @@
|
||||
</property>
|
||||
<property key="ProductChooseQuickAddCategory">
|
||||
<value xml:lang="cs">Výběr zrychleným zadáním produktové skupiny</value>
|
||||
<value xml:lang="de">Auswahl einer Produktgruppe für Schnelleingabe</value>
|
||||
<value xml:lang="de">Auswahl einer Produktkategorie für Schnelleingabe</value>
|
||||
<value xml:lang="en">Choose QuickAdd Category</value>
|
||||
<value xml:lang="es">Elegir la categoría Añadir-Rápido</value>
|
||||
<value xml:lang="fr">Choisir une catégorie d'ajout-rapide</value>
|
||||
@@ -20446,6 +20447,10 @@
|
||||
<value xml:lang="zh">这个明细缺货</value>
|
||||
<value xml:lang="zh-TW">這個細項缺貨</value>
|
||||
</property>
|
||||
<property key="ProductCannotReserveInventoryNotEnoughStock">
|
||||
<value xml:lang="it">Impossibile riservare l'articolo ${parameters.productId}: quantità in stock non sufficiente nel deposito ${parameters.facilityId}. Quantità non riservata è ${parameters.quantityNotReserved}</value>
|
||||
<value xml:lang="en">Cannot reserve product ${parameters.productId}: not enough quantity left in stock for facility ${parameters.facilityId}. Quantity not reserved is ${parameters.quantityNotReserved}</value>
|
||||
</property>
|
||||
<property key="ProductItemPrc">
|
||||
<value xml:lang="de">Position Preis</value>
|
||||
<value xml:lang="en">Item Prc</value>
|
||||
@@ -22816,7 +22821,7 @@
|
||||
</property>
|
||||
<property key="ProductNoProductsInThisCategory">
|
||||
<value xml:lang="cs">V této skupině nejsou žádné výrobky</value>
|
||||
<value xml:lang="de">Es gibt keine Produkte in dieser Produktgruppe</value>
|
||||
<value xml:lang="de">Es gibt keine Produkte in dieser Produktkategorie</value>
|
||||
<value xml:lang="en">There are no products in this category</value>
|
||||
<value xml:lang="es">No hay productos en esta categoría</value>
|
||||
<value xml:lang="fr">Aucun article dans cette catégorie</value>
|
||||
@@ -28484,7 +28489,7 @@
|
||||
</property>
|
||||
<property key="ProductSearchInCategory">
|
||||
<value xml:lang="cs">Hledání ve skupině výrobků</value>
|
||||
<value xml:lang="de">Suche in Produktgruppe</value>
|
||||
<value xml:lang="de">Suche in Produktkategorie</value>
|
||||
<value xml:lang="en">Search in Category</value>
|
||||
<value xml:lang="es">Buscar en la Categoría</value>
|
||||
<value xml:lang="fr">Rechercher dans la catégorie</value>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
# -- Image upload path on the server
|
||||
#FIXME the image server path need to be move on runtime
|
||||
#FIXME the image server path need to be moved on runtime
|
||||
image.server.path=${sys:getProperty('ofbiz.home')}/themes/common/images/webapp/images/${tenantId}
|
||||
|
||||
# -- The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want)
|
||||
@@ -37,7 +37,7 @@ all.product.category=CATALOG1
|
||||
reactivate.product.from.receipt=Y
|
||||
|
||||
# Image upload path on the image management
|
||||
#FIXME the image management path need to be move on runtime
|
||||
#FIXME the image management path need to be moved on runtime
|
||||
image.management.path=${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/products/management
|
||||
image.management.url=/images/products/management
|
||||
image.management.nameofthumbnail=-100
|
||||
|
||||
@@ -163,7 +163,14 @@ under the License.
|
||||
-->
|
||||
<if-compare field="parameters.quantityNotReserved" operator="not-equals" value="0" type="BigDecimal">
|
||||
<if-compare field="parameters.requireInventory" operator="equals" value="Y">
|
||||
<!-- use this else pattern to accomplish the anything but Y logic, ie if not specified default to inventory NOT required -->
|
||||
<!-- if there is still quantity not reserved but ProductStore is configured to require inventory, we can
|
||||
assume here that also reserveInventory is set to Y (reserveInventory is checked by caller services).
|
||||
In such a scenario we return an error and avoid order creation.
|
||||
-->
|
||||
<add-error>
|
||||
<fail-property resource="ProductUiLabels" property="ProductCannotReserveInventoryNotEnoughStock"/>
|
||||
</add-error>
|
||||
<check-errors/>
|
||||
<else>
|
||||
<if-not-empty field="lastNonSerInventoryItem">
|
||||
<!-- subtract from quantityNotReserved from the availableToPromise of existing inventory item -->
|
||||
|
||||
@@ -177,7 +177,7 @@ under the License.
|
||||
</else>
|
||||
</if-compare>
|
||||
<else>
|
||||
<entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
|
||||
<entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" filter-by-date="true" use-cache="true">
|
||||
<field-map field-name="productStoreId" from-field="productStore.productStoreId"/>
|
||||
<order-by field-name="sequenceNum"/>
|
||||
</entity-and>
|
||||
@@ -188,24 +188,23 @@ under the License.
|
||||
<!-- Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order. -->
|
||||
<set from-field="parameters.productId" field="callServiceMap.productId"/>
|
||||
<set from-field="productStoreFacility.facilityId" field="callServiceMap.facilityId"/>
|
||||
<log level="info" message="ProductStoreService:In productStoreFacilities loop: [${parameters.facilityId}]"/>
|
||||
<log level="info" message="ProductStoreService:In productStoreFacilities loop: [${productStoreFacility.facilityId}]"/>
|
||||
<call-service service-name="getInventoryAvailableByFacility" in-map-name="callServiceMap">
|
||||
<result-to-field result-name="availableToPromiseTotal"/>
|
||||
</call-service>
|
||||
<clear-field field="callServiceMap"/>
|
||||
|
||||
<if-compare-field field="availableToPromiseTotal" to-field="parameters.quantity" operator="greater-equals" type="BigDecimal">
|
||||
<set field="storeFound" from-field="productStoreFacility"/>
|
||||
</if-compare-field>
|
||||
<clear-field field="availableToPromiseTotal"/>
|
||||
</if-empty>
|
||||
</iterate>
|
||||
|
||||
<!-- didn't find anything? Take the first facility from list -->
|
||||
<if-empty field="storeFound">
|
||||
<first-from-list list="productStoreFacilities" entry="storeFound"/>
|
||||
<get-related-one value-field="productStore" relation-name="Facility" to-value-field="defaultStoreFound" />
|
||||
</if-empty>
|
||||
<set from-field="storeFound.facilityId" field="facilityId" default-value=""/>
|
||||
<set from-field="storeFound.facilityId" field="facilityId" default-value="defaultStoreFound.facilityId"/>
|
||||
<set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>
|
||||
<set from-field="facilityId" field="callServiceMap.facilityId"/>
|
||||
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
|
||||
@@ -213,11 +212,11 @@ under the License.
|
||||
<call-service service-name="reserveProductInventoryByFacility" in-map-name="callServiceMap">
|
||||
<result-to-field result-name="quantityNotReserved"/>
|
||||
</call-service>
|
||||
<log level="info" message="Inventory IS reserved in facility with id [${storeFound.facilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}"/>
|
||||
<log level="warning" message="Inventory IS reserved in facility with id [${facilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}"/>
|
||||
</else>
|
||||
</if-compare>
|
||||
<else>
|
||||
<entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
|
||||
<entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" filter-by-date="true" use-cache="true">
|
||||
<field-map field-name="productStoreId" from-field="productStore.productStoreId"/>
|
||||
<field-map field-name="facilityId" from-field="facilityId"/>
|
||||
<order-by field-name="sequenceNum"/>
|
||||
@@ -350,7 +349,7 @@ under the License.
|
||||
</else>
|
||||
</if-compare-field>
|
||||
<else>
|
||||
<entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
|
||||
<entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" filter-by-date="true" use-cache="true">
|
||||
<field-map field-name="productStoreId" from-field="productStore.productStoreId"/>
|
||||
<order-by field-name="sequenceNum"/>
|
||||
</entity-and>
|
||||
|
||||
+7
-3
@@ -48,6 +48,7 @@ import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
import org.apache.ofbiz.base.util.UtilHttp;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.security.SecurityUtil;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader.ControllerConfig;
|
||||
import org.apache.ofbiz.webapp.control.ControlFilter;
|
||||
@@ -112,7 +113,11 @@ public class SeoContextFilter implements Filter {
|
||||
String queryString = URLEncodedUtils.format(params, Charset.forName("UTF-8"));
|
||||
uri = uri + "?" + queryString;
|
||||
}
|
||||
|
||||
|
||||
if (SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, uri)) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean forwarded = forwardUri(httpResponse, uri);
|
||||
if (forwarded) {
|
||||
return;
|
||||
@@ -167,7 +172,7 @@ public class SeoContextFilter implements Filter {
|
||||
if (pathItemList != null) {
|
||||
viewName = pathItemList.get(0);
|
||||
}
|
||||
|
||||
|
||||
String requestUri = UtilHttp.getRequestUriFromTarget(httpRequest.getRequestURI());
|
||||
|
||||
// check to make sure the requested url is allowed
|
||||
@@ -231,7 +236,6 @@ public class SeoContextFilter implements Filter {
|
||||
|
||||
/**
|
||||
* Forward a uri according to forward pattern regular expressions. Note: this is developed for Filter usage.
|
||||
*
|
||||
* @param uri String to reverse transform
|
||||
* @return String
|
||||
*/
|
||||
|
||||
@@ -215,6 +215,7 @@ public class ScaleImage {
|
||||
try {
|
||||
String fileToCheck = imageServerPath + "/" + newFileLocation + "." + imgExtension;
|
||||
ImageIO.write(bufNewImg, imgExtension, new File(fileToCheck));
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
@@ -383,6 +384,7 @@ public class ScaleImage {
|
||||
try {
|
||||
String fileToCheck = imageServerPath + "/" + newFileLocation + "." + imgExtension;
|
||||
ImageIO.write(bufNewImg, imgExtension, new File(fileToCheck));
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
|
||||
+2
-1
@@ -282,7 +282,7 @@ public class FrameImage {
|
||||
if (UtilValidate.isEmpty(imageName) || UtilValidate.isEmpty(imageData)) {
|
||||
session.setAttribute("frameContentId", request.getParameter("frameExistContentId"));
|
||||
session.setAttribute("frameDataResourceId", request.getParameter("frameExistDataResourceId"));
|
||||
request.setAttribute("_ERROR_MESSAGE_", "There is no frame image, please select the image type *.PNG uploading.");
|
||||
request.setAttribute("_ERROR_MESSAGE_", "There is no frame image, please select the image type *.PNG to upload.");
|
||||
return "error";
|
||||
}
|
||||
if (!"image/png".equals(mimType)) {
|
||||
@@ -312,6 +312,7 @@ public class FrameImage {
|
||||
}
|
||||
Path tmpFile = Files.createTempFile(null, null);
|
||||
Files.write(tmpFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tmpFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
request.setAttribute("_ERROR_MESSAGE_", errorMessage);
|
||||
|
||||
+3
-1
@@ -155,10 +155,10 @@ public class ImageManagementServices {
|
||||
}
|
||||
|
||||
if (UtilValidate.isEmpty(imageResize)) {
|
||||
// check file content
|
||||
try {
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
@@ -187,6 +187,7 @@ public class ImageManagementServices {
|
||||
try {
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
@@ -567,6 +568,7 @@ public class ImageManagementServices {
|
||||
try {
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
|
||||
+6
-1
@@ -1055,10 +1055,14 @@ 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);
|
||||
// Check if a webshell is not uploaded
|
||||
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();
|
||||
@@ -1358,6 +1362,7 @@ public class ProductServices {
|
||||
try {
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
|
||||
+45
-9
@@ -34,6 +34,7 @@ import java.util.Set;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.GeneralException;
|
||||
import org.apache.ofbiz.base.util.UtilDateTime;
|
||||
import org.apache.ofbiz.base.util.UtilGenerics;
|
||||
import org.apache.ofbiz.base.util.UtilMisc;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.common.geo.GeoWorker;
|
||||
@@ -49,6 +50,7 @@ import org.apache.ofbiz.product.config.ProductConfigWrapper.ConfigOption;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.ModelService;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
|
||||
/**
|
||||
* Product Worker class to reduce code in JSPs.
|
||||
@@ -1248,17 +1250,51 @@ nextProd:
|
||||
productsInStock.add(genericRecord);
|
||||
}
|
||||
} else {
|
||||
List<GenericValue> facilities = EntityQuery.use(delegator).from("ProductFacility").where("productId", productId).queryList();
|
||||
BigDecimal availableInventory = BigDecimal.ZERO;
|
||||
if (UtilValidate.isNotEmpty(facilities)) {
|
||||
for (GenericValue facility : facilities) {
|
||||
BigDecimal lastInventoryCount = facility.getBigDecimal("lastInventoryCount");
|
||||
if (lastInventoryCount != null) {
|
||||
availableInventory = lastInventoryCount.add(availableInventory);
|
||||
if ("Y".equals(product.getString("isVirtual"))) {
|
||||
BigDecimal availableInventory = BigDecimal.ZERO;
|
||||
try {
|
||||
Map<String, Object> variantResultOutput = dispatcher.runSync("getAllProductVariants",
|
||||
UtilMisc.toMap("productId", productId));
|
||||
if (ServiceUtil.isError(variantResultOutput)) {
|
||||
Debug.logError("Error in retrieving all product variants for productId " + productId
|
||||
+ " Skip this product. Error is : " + ServiceUtil.getErrorMessage(variantResultOutput), module);
|
||||
continue;
|
||||
}
|
||||
List<GenericValue> productVariants = UtilGenerics.cast(variantResultOutput.get("assocProducts"));
|
||||
for (GenericValue productVariant : productVariants) {
|
||||
List<GenericValue> facilities = EntityQuery.use(delegator)
|
||||
.from("ProductFacility")
|
||||
.where("productId", productVariant.getString("productIdTo"))
|
||||
.queryList();
|
||||
if (UtilValidate.isNotEmpty(facilities)) {
|
||||
for (GenericValue facility : facilities) {
|
||||
BigDecimal lastInventoryCount = facility.getBigDecimal("lastInventoryCount");
|
||||
if (lastInventoryCount != null) {
|
||||
availableInventory = lastInventoryCount.add(availableInventory);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (availableInventory.compareTo(BigDecimal.ZERO) > 0) {
|
||||
productsInStock.add(genericRecord);
|
||||
}
|
||||
} catch (GenericServiceException e) {
|
||||
Debug.logError(e, "Error getting all product variants for productId " + productId
|
||||
+ ", while filtering out of stock products.", module);
|
||||
}
|
||||
if (availableInventory.compareTo(BigDecimal.ZERO) > 0) {
|
||||
productsInStock.add(genericRecord);
|
||||
} else {
|
||||
List<GenericValue> facilities = EntityQuery.use(delegator).from("ProductFacility").where("productId", productId).queryList();
|
||||
BigDecimal availableInventory = BigDecimal.ZERO;
|
||||
if (UtilValidate.isNotEmpty(facilities)) {
|
||||
for (GenericValue facility : facilities) {
|
||||
BigDecimal lastInventoryCount = facility.getBigDecimal("lastInventoryCount");
|
||||
if (lastInventoryCount != null) {
|
||||
availableInventory = lastInventoryCount.add(availableInventory);
|
||||
}
|
||||
}
|
||||
if (availableInventory.compareTo(BigDecimal.ZERO) > 0) {
|
||||
productsInStock.add(genericRecord);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,9 +219,9 @@ function insertImageName(type,nameValue) {
|
||||
<input type="file" size="50" name="fname"/>
|
||||
<br />
|
||||
<span>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl}</label>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl}</label>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="linkTwo"onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkTwo</@ofbizUrl>");'/>${uiLabelMap.ProductLinkTwoImageUrl}</label>
|
||||
</span>
|
||||
<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"/>
|
||||
</td></tr>
|
||||
|
||||
@@ -192,11 +192,11 @@ under the License.
|
||||
</td>
|
||||
<td> </td>
|
||||
<td width="80%" colspan="4" valign="top">
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="small" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'/>${uiLabelMap.CommonSmall}</label>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="medium" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'/>${uiLabelMap.CommonMedium}</label>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'/>${uiLabelMap.CommonLarge}</label>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="detail" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'/>${uiLabelMap.CommonDetail}</label>
|
||||
<label><input type="radio" name="upload_file_type_bogus" value="original" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=original</@ofbizUrl>");'/>${uiLabelMap.ProductOriginal}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="small" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=small</@ofbizUrl>");'/>${uiLabelMap.CommonSmall}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="medium" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=medium</@ofbizUrl>");'/>${uiLabelMap.CommonMedium}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="large"onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=large</@ofbizUrl>");'/>${uiLabelMap.CommonLarge}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="detail" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=detail</@ofbizUrl>");'/>${uiLabelMap.CommonDetail}</label>
|
||||
<label><input type="radio" name="up_load_file_type_bogus" value="original" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadProductImage?productId=${productId}&upload_file_type=original</@ofbizUrl>");'/>${uiLabelMap.ProductOriginal}</label>
|
||||
<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductUploadImage}"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -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>
|
||||
|
||||
+35
-25
@@ -37,11 +37,12 @@ buildscript {
|
||||
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
|
||||
}
|
||||
}
|
||||
apply plugin: 'application'
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'groovy'
|
||||
apply plugin: 'eclipse'
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: "at.bxm.svntools"
|
||||
apply plugin: 'at.bxm.svntools'
|
||||
apply plugin: 'org.asciidoctor.convert'
|
||||
apply plugin: 'checkstyle'
|
||||
|
||||
@@ -50,13 +51,19 @@ apply from: 'common.gradle'
|
||||
// global properties
|
||||
ext.os = System.getProperty('os.name').toLowerCase()
|
||||
ext.pluginsDir = "${rootDir}/plugins"
|
||||
ext.ofbizMainClass = 'org.apache.ofbiz.base.start.Start'
|
||||
|
||||
// java settings
|
||||
List jvmArguments = ['-Xms128M', '-Xmx1024M']
|
||||
List jvmArguments = ['-Xms128M', '-Xmx1024M', '-Djdk.serialFilter=maxarray=100000;maxdepth=20;maxrefs=500;maxbytes=500000']
|
||||
if (project.hasProperty('jvmArgs')) {
|
||||
jvmArguments = jvmArgs.tokenize()
|
||||
}
|
||||
ext.ofbizMainClass = 'org.apache.ofbiz.base.start.Start'
|
||||
|
||||
application {
|
||||
mainClassName = 'org.apache.ofbiz.base.start.Start'
|
||||
// jdk.serialFilter is to "Prevent possible DOS attack done using Java deserialisation" (OFBIZ-12592)
|
||||
applicationDefaultJvmArgs = ['-Djdk.serialFilter=maxarray=100000;maxdepth=20;maxrefs=500;maxbytes=500000']
|
||||
}
|
||||
|
||||
javadoc {
|
||||
title='OFBiz R18.12 API'
|
||||
@@ -82,7 +89,7 @@ checkstyle {
|
||||
// the sum of errors that were present before introducing the
|
||||
// ‘checkstyle’ tool present in the framework and in the official
|
||||
// plugins.
|
||||
maxErrors = 38802
|
||||
maxErrors = 50000
|
||||
// Currently there are a lot of errors so we need to temporarily
|
||||
// hide them to avoid polluting the terminal output.
|
||||
showViolations = false
|
||||
@@ -119,7 +126,7 @@ allprojects {
|
||||
url "https://maven.restlet.talend.com"
|
||||
}
|
||||
maven {
|
||||
// apache-xerces:xercesImpl:2.9.1
|
||||
// xerces:xercesImpl:2.12.2
|
||||
url "https://maven.repository.redhat.com/ga/"
|
||||
}
|
||||
maven {
|
||||
@@ -134,10 +141,6 @@ allprojects {
|
||||
artifact()
|
||||
}
|
||||
}
|
||||
maven {
|
||||
// com.springsource.com.sun.syndication
|
||||
url "https://repo.spring.io/plugins-release"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,16 +167,20 @@ configurations {
|
||||
|
||||
dependencies {
|
||||
// ofbiz compile libs
|
||||
compile 'apache-xerces:xercesImpl:2.9.1'
|
||||
compile 'xerces:xercesImpl:2.12.2'
|
||||
compile 'com.google.zxing:core:3.3.3'
|
||||
compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
|
||||
compile 'com.googlecode.ez-vcard:ez-vcard:0.9.10'
|
||||
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
|
||||
compile 'com.googlecode.libphonenumber:libphonenumber:8.9.16'
|
||||
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.lowagie:itext:2.1.7') { // Don't update due to license change in newer versions, see OFBIZ-10455
|
||||
exclude module: 'bcmail-jdk14'
|
||||
exclude module: 'bcprov-jdk14'
|
||||
exclude module: 'bctsp-jdk14'
|
||||
}
|
||||
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,17 +201,18 @@ 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.2' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-web:2.17.2' //???
|
||||
compile 'org.apache.poi:poi:3.17'
|
||||
compile 'org.apache.pdfbox:pdfbox:2.0.24'
|
||||
compile 'org.apache.shiro:shiro-core:1.4.0'
|
||||
compile 'org.apache.sshd:sshd-core:1.7.0'
|
||||
compile 'org.apache.tika:tika-core:1.26'
|
||||
compile 'org.apache.tika:tika-parsers:1.26'
|
||||
compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.54'
|
||||
compile 'org.apache.tomcat:tomcat-catalina:9.0.54'
|
||||
compile 'org.apache.tomcat:tomcat-jasper:9.0.54'
|
||||
compile 'org.apache.tomcat:tomcat-tribes:9.0.54'
|
||||
compile 'org.apache.tika:tika-core:1.28.4'
|
||||
compile 'org.apache.tika:tika-parsers:1.28.4'
|
||||
compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.60'
|
||||
compile 'org.apache.tomcat:tomcat-catalina:9.0.60'
|
||||
compile 'org.apache.tomcat:tomcat-jasper:9.0.60'
|
||||
compile 'org.apache.tomcat:tomcat-tribes:9.0.60'
|
||||
compile 'org.apache.xmlgraphics:fop:2.3'
|
||||
compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
|
||||
compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
|
||||
@@ -218,9 +226,11 @@ 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'
|
||||
compile 'com.google.re2j:re2j:1.6'
|
||||
|
||||
// ofbiz unit-test compile libs
|
||||
testCompile 'org.mockito:mockito-core:2.23.0'
|
||||
@@ -234,11 +244,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.2' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.17.2' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.17.2' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.17.2' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
|
||||
|
||||
// plugin libs
|
||||
@@ -299,7 +309,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
|
||||
|
||||
@@ -21,16 +21,21 @@ under the License.
|
||||
<!DOCTYPE module PUBLIC
|
||||
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
|
||||
"https://checkstyle.org/dtds/configuration_1_3.dtd">
|
||||
<!-- This configuration corresponds to the OFBiz coding conventions
|
||||
which are simply “Sun Coding Standards” + “120 characters line length” -->
|
||||
<module name="Checker">
|
||||
<!-- This configuration corresponds to the OFBiz coding conventions
|
||||
which are basically “Sun Coding Standards”
|
||||
+ 150 characters line length
|
||||
+ NewlineAtEndOfFile value="lf_cr_crlf" />
|
||||
-->
|
||||
<module name="Checker">
|
||||
<module name="BeforeExecutionExclusionFileFilter">
|
||||
<property name="fileNamePattern" value="module\-info\.java$"/>
|
||||
</module>
|
||||
<property name="fileExtensions" value="java, properties, xml"/>
|
||||
|
||||
<!-- General file conventions -->
|
||||
<module name="NewlineAtEndOfFile"/>
|
||||
<module name="NewlineAtEndOfFile">
|
||||
<property name="lineSeparator" value="lf_cr_crlf" />
|
||||
</module>
|
||||
<module name="FileTabCharacter"/>
|
||||
<module name="RegexpSingleline">
|
||||
<property name="format" value="\s+$"/>
|
||||
|
||||
@@ -235,6 +235,7 @@ public class HttpRequestFileUpload {
|
||||
}
|
||||
fos.flush();
|
||||
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileTocheck, fileType, delegator)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -80,6 +80,9 @@ import org.apache.ofbiz.widget.renderer.VisualTheme;
|
||||
|
||||
import com.ibm.icu.util.Calendar;
|
||||
|
||||
import com.google.re2j.Matcher;
|
||||
import com.google.re2j.Pattern;
|
||||
|
||||
/**
|
||||
* HttpUtil - Misc HTTP Utility Functions
|
||||
*/
|
||||
@@ -1715,7 +1718,7 @@ public final class UtilHttp {
|
||||
public static List<String> extractUrls(String input) {
|
||||
List<String> result = new ArrayList<String>();
|
||||
|
||||
java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(
|
||||
Pattern pattern = Pattern.compile(
|
||||
"\\b(((ht|f)tp(s?)\\:\\/\\/|~\\/|\\/)|www.)" +
|
||||
"(\\w+:\\w+@)?(([-\\w]+\\.)+(com|org|net|gov" +
|
||||
"|mil|biz|info|mobi|name|aero|jobs|museum" +
|
||||
@@ -1735,7 +1738,7 @@ public final class UtilHttp {
|
||||
}
|
||||
|
||||
if (result.isEmpty()) {
|
||||
java.util.regex.Matcher matcher = pattern.matcher(input);
|
||||
Matcher matcher = pattern.matcher(input);
|
||||
while (matcher.find()) {
|
||||
result.add(matcher.group());
|
||||
}
|
||||
|
||||
+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
|
||||
|
||||
@@ -74,9 +74,22 @@ under the License.
|
||||
<property name="secure" value="false"/>
|
||||
<property name="URIEncoding" value="UTF-8"/>
|
||||
<property name="xpoweredBy" value="false"/>
|
||||
<property name="secretRequired" value="false"/>
|
||||
<property name="allowedRequestAttributesPattern" value=".*"/>
|
||||
<!-- AJP/13 connector attributes -->
|
||||
<!-- Despite OFBIZ-11407, allowedRequestAttributesPattern is commented out because of OFBIZ-12558
|
||||
OOTB the Tomcat default values should be used as recommended by
|
||||
https://tomcat.apache.org/tomcat-9.0-doc/config/ajp.html#Introduction
|
||||
This is in relation with
|
||||
https://tomcat.apache.org/security-9.html#Fixed_in_Apache_Tomcat_9.0.31
|
||||
and
|
||||
https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Connectors
|
||||
But secretRequired value must be false because secret value is empty
|
||||
Else a notifying message appears in log saying that AJP is not available.
|
||||
|
||||
Long story short, with this configuration only localhost works.
|
||||
So if you use it you need to use value/s
|
||||
-->
|
||||
<property name="secretRequired" value="false"/>
|
||||
<!-- <property name="allowedRequestAttributesPattern" value=".*"/> -->
|
||||
<!-- commented out because the values match the Tomcat defaults:
|
||||
<property name="tomcatAuthentication" value="true"/>
|
||||
<property name="allowTrace" value="false"/>
|
||||
|
||||
@@ -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 -->
|
||||
|
||||
@@ -45,6 +45,7 @@ import java.util.concurrent.Future;
|
||||
|
||||
import org.apache.ofbiz.base.concurrent.ExecutionPool;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
import org.apache.ofbiz.base.util.UtilTimer;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.entity.GenericEntityException;
|
||||
@@ -58,6 +59,7 @@ import org.apache.ofbiz.entity.model.ModelFieldTypeReader;
|
||||
import org.apache.ofbiz.entity.model.ModelIndex;
|
||||
import org.apache.ofbiz.entity.model.ModelKeyMap;
|
||||
import org.apache.ofbiz.entity.model.ModelRelation;
|
||||
import org.apache.ofbiz.entity.model.ModelUtil;
|
||||
import org.apache.ofbiz.entity.model.ModelViewEntity;
|
||||
import org.apache.ofbiz.entity.transaction.TransactionFactoryLoader;
|
||||
import org.apache.ofbiz.entity.transaction.TransactionUtil;
|
||||
@@ -720,7 +722,7 @@ public class DatabaseUtil {
|
||||
|
||||
// get ALL column info, put into hashmap by table name
|
||||
Map<String, Map<String, ColumnCheckInfo>> colInfo = getColumnInfo(tableNames, true, messages, executor);
|
||||
|
||||
Map<String, Map<String, ReferenceCheckInfo>> refInfo = getReferenceInfo(tableNames, messages);
|
||||
// go through each table and make a ModelEntity object, add to list
|
||||
// for each entity make corresponding ModelField objects
|
||||
// then print out XML for the entities/fields
|
||||
@@ -731,7 +733,8 @@ public class DatabaseUtil {
|
||||
// iterate over the table names is alphabetical order
|
||||
for (String tableName: new TreeSet<String>(colInfo.keySet())) {
|
||||
Map<String, ColumnCheckInfo> colMap = colInfo.get(tableName);
|
||||
ModelEntity newEntity = new ModelEntity(tableName, colMap, modelFieldTypeReader, isCaseSensitive);
|
||||
Map<String, ReferenceCheckInfo> refMap = refInfo.get(tableName);
|
||||
ModelEntity newEntity = new ModelEntity(tableName, colMap, refMap, modelFieldTypeReader, isCaseSensitive);
|
||||
newEntList.add(newEntity);
|
||||
}
|
||||
|
||||
@@ -1229,7 +1232,17 @@ public class DatabaseUtil {
|
||||
return pkCount;
|
||||
}
|
||||
|
||||
public Map<String, Map<String, ReferenceCheckInfo>> getReferenceInfo(Set<String> tableNames, Collection<String> messages) {
|
||||
/**
|
||||
* Gets reference info.
|
||||
* @param tableNames the table names
|
||||
* @param messages the messages
|
||||
* @return the reference info
|
||||
*/
|
||||
public Map<String, Map<String, ReferenceCheckInfo>> getReferenceInfo(Set<String> tableNames,
|
||||
Collection<String> messages) {
|
||||
if (UtilValidate.isEmpty(tableNames)) {
|
||||
return new HashMap<>();
|
||||
}
|
||||
Connection connection = getConnectionLogged(messages);
|
||||
if (connection == null) {
|
||||
return null;
|
||||
@@ -1241,39 +1254,30 @@ public class DatabaseUtil {
|
||||
} catch (SQLException e) {
|
||||
String message = "Unable to get database meta data... Error was:" + e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) messages.add(message);
|
||||
if (messages != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
|
||||
try {
|
||||
connection.close();
|
||||
} catch (SQLException e2) {
|
||||
String message2 = "Unable to close database connection, continuing anyway... Error was:" + e2.toString();
|
||||
String message2 = "Unable to close database connection, continuing anyway... Error was:" + e2
|
||||
.toString();
|
||||
Debug.logError(message2, module);
|
||||
if (messages != null) messages.add(message2);
|
||||
if (messages != null) {
|
||||
messages.add(message2);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
try {
|
||||
if (Debug.infoOn()) Debug.logInfo("Database Product Name is " + dbData.getDatabaseProductName(), module);
|
||||
if (Debug.infoOn()) Debug.logInfo("Database Product Version is " + dbData.getDatabaseProductVersion(), module);
|
||||
} catch (SQLException e) {
|
||||
Debug.logWarning("Unable to get Database name & version information", module);
|
||||
}
|
||||
try {
|
||||
if (Debug.infoOn()) Debug.logInfo("Database Driver Name is " + dbData.getDriverName(), module);
|
||||
if (Debug.infoOn()) Debug.logInfo("Database Driver Version is " + dbData.getDriverVersion(), module);
|
||||
} catch (SQLException e) {
|
||||
Debug.logWarning("Unable to get Driver name & version information", module);
|
||||
}
|
||||
*/
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("Getting Foreign Key (Reference) Info From Database", module);
|
||||
}
|
||||
|
||||
if (Debug.infoOn()) Debug.logInfo("Getting Foreign Key (Reference) Info From Database", module);
|
||||
|
||||
Map<String, Map<String, ReferenceCheckInfo>> refInfo = new HashMap<String, Map<String, ReferenceCheckInfo>>();
|
||||
Map<String, Map<String, ReferenceCheckInfo>> retMap = new HashMap<>();
|
||||
|
||||
try {
|
||||
// ResultSet rsCols = dbData.getCrossReference(null, null, null, null, null, null);
|
||||
String lookupSchemaName = getSchemaName(dbData);
|
||||
boolean needsUpperCase = false;
|
||||
try {
|
||||
@@ -1281,92 +1285,106 @@ public class DatabaseUtil {
|
||||
} catch (SQLException e) {
|
||||
String message = "Error getting identifier case information... Error was:" + e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) messages.add(message);
|
||||
}
|
||||
|
||||
ResultSet rsCols = dbData.getImportedKeys(null, lookupSchemaName, null);
|
||||
int totalFkRefs = 0;
|
||||
|
||||
// Iterator tableNamesIter = tableNames.iterator();
|
||||
// while (tableNamesIter.hasNext()) {
|
||||
// String tableName = (String) tableNamesIter.next();
|
||||
// ResultSet rsCols = dbData.getImportedKeys(null, null, tableName);
|
||||
// Debug.logVerbose("Getting imported keys for table " + tableName, module);
|
||||
|
||||
while (rsCols.next()) {
|
||||
try {
|
||||
ReferenceCheckInfo rcInfo = new ReferenceCheckInfo();
|
||||
|
||||
rcInfo.pkTableName = rsCols.getString("PKTABLE_NAME");
|
||||
if (needsUpperCase && rcInfo.pkTableName != null) {
|
||||
rcInfo.pkTableName = rcInfo.pkTableName.toUpperCase();
|
||||
}
|
||||
rcInfo.pkColumnName = rsCols.getString("PKCOLUMN_NAME");
|
||||
if (needsUpperCase && rcInfo.pkColumnName != null) {
|
||||
rcInfo.pkColumnName = rcInfo.pkColumnName.toUpperCase();
|
||||
}
|
||||
|
||||
rcInfo.fkTableName = rsCols.getString("FKTABLE_NAME");
|
||||
if (needsUpperCase && rcInfo.fkTableName != null) {
|
||||
rcInfo.fkTableName = rcInfo.fkTableName.toUpperCase();
|
||||
}
|
||||
// ignore the column info if the FK table name is not in the list we are concerned with
|
||||
if (!tableNames.contains(rcInfo.fkTableName)) {
|
||||
continue;
|
||||
}
|
||||
rcInfo.fkColumnName = rsCols.getString("FKCOLUMN_NAME");
|
||||
if (needsUpperCase && rcInfo.fkColumnName != null) {
|
||||
rcInfo.fkColumnName = rcInfo.fkColumnName.toUpperCase();
|
||||
}
|
||||
rcInfo.fkName = rsCols.getString("FK_NAME");
|
||||
if (needsUpperCase && rcInfo.fkName != null) {
|
||||
rcInfo.fkName = rcInfo.fkName.toUpperCase();
|
||||
}
|
||||
|
||||
if (Debug.verboseOn()) Debug.logVerbose("Got: " + rcInfo.toString(), module);
|
||||
|
||||
Map<String, ReferenceCheckInfo> tableRefInfo = refInfo.get(rcInfo.fkTableName);
|
||||
if (tableRefInfo == null) {
|
||||
tableRefInfo = new HashMap<String, ReferenceCheckInfo>();
|
||||
refInfo.put(rcInfo.fkTableName, tableRefInfo);
|
||||
if (Debug.verboseOn()) Debug.logVerbose("Adding new Map for table: " + rcInfo.fkTableName, module);
|
||||
}
|
||||
if (!tableRefInfo.containsKey(rcInfo.fkName)) totalFkRefs++;
|
||||
tableRefInfo.put(rcInfo.fkName, rcInfo);
|
||||
} catch (SQLException e) {
|
||||
String message = "Error getting fk reference info for table. Error was:" + e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) messages.add(message);
|
||||
continue;
|
||||
if (messages != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
}
|
||||
|
||||
// if (Debug.infoOn()) Debug.logInfo("There are " + totalFkRefs + " in the database", module);
|
||||
try {
|
||||
rsCols.close();
|
||||
} catch (SQLException e) {
|
||||
String message = "Unable to close ResultSet for fk reference list, continuing anyway... Error was:" + e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) messages.add(message);
|
||||
int totalFkRefs = 0;
|
||||
|
||||
for (String tableName : tableNames) {
|
||||
String shortTableName = tableName.split("\\.").length > 0 ? tableName.split("\\.")[tableName.split(
|
||||
"\\.").length - 1] : tableName;
|
||||
ResultSet rsCols = dbData.getImportedKeys(null, lookupSchemaName, shortTableName);
|
||||
|
||||
Map<String, ReferenceCheckInfo> tableRefInfo = retMap.get(tableName);
|
||||
if (tableRefInfo == null) {
|
||||
tableRefInfo = new HashMap<>();
|
||||
totalFkRefs++;
|
||||
}
|
||||
while (rsCols.next()) {
|
||||
try {
|
||||
String fkName = toUpper(rsCols.getString("FK_NAME"), needsUpperCase);
|
||||
int seq = rsCols.getInt("KEY_SEQ");
|
||||
String fkTableName = toUpper(rsCols.getString("FKTABLE_NAME"), needsUpperCase);
|
||||
String fkColumnName = toUpper(rsCols.getString("FKCOLUMN_NAME"), needsUpperCase);
|
||||
String pkTableName = toUpper(rsCols.getString("PKTABLE_NAME"), needsUpperCase);
|
||||
String pkColumnName = toUpper(rsCols.getString("PKCOLUMN_NAME"), needsUpperCase);
|
||||
|
||||
ReferenceCheckInfo rcInfo = tableRefInfo.get(fkName);
|
||||
if (rcInfo == null) {
|
||||
rcInfo = new ReferenceCheckInfo();
|
||||
|
||||
}
|
||||
|
||||
rcInfo.fkName = fkName;
|
||||
rcInfo.fkTableName = fkTableName;
|
||||
rcInfo.pkTableName = pkTableName;
|
||||
|
||||
if (seq > 1) {
|
||||
rcInfo.pkColumnName = rcInfo.pkColumnName.concat(",").concat(pkColumnName);
|
||||
rcInfo.fkColumnName = rcInfo.fkColumnName.concat(",").concat(fkColumnName);
|
||||
} else {
|
||||
rcInfo.pkColumnName = pkColumnName;
|
||||
rcInfo.fkColumnName = fkColumnName;
|
||||
}
|
||||
|
||||
if (Debug.verboseOn()) {
|
||||
Debug.logVerbose("Got: " + rcInfo.toString(), module);
|
||||
}
|
||||
tableRefInfo.put(fkName, rcInfo);
|
||||
retMap.put(tableName, tableRefInfo);
|
||||
} catch (SQLException e) {
|
||||
String message = "Error getting fk reference info for table. Error was:" + e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
try {
|
||||
rsCols.close();
|
||||
} catch (SQLException e) {
|
||||
String message = "Unable to close ResultSet for fk reference list, continuing anyway... Error was:"
|
||||
+ e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("There are " + totalFkRefs + " foreign key refs in the database", module);
|
||||
}
|
||||
// }
|
||||
if (Debug.infoOn()) Debug.logInfo("There are " + totalFkRefs + " foreign key refs in the database", module);
|
||||
|
||||
} catch (SQLException e) {
|
||||
String message = "Error getting fk reference meta data Error was:" + e.toString() + ". Not checking fk refs.";
|
||||
String message = "Error getting fk reference meta data Error was:" + e.toString()
|
||||
+ ". Not checking fk refs.";
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) messages.add(message);
|
||||
refInfo = null;
|
||||
if (messages != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
retMap = null;
|
||||
} finally {
|
||||
try {
|
||||
connection.close();
|
||||
} catch (SQLException e) {
|
||||
String message = "Unable to close database connection, continuing anyway... Error was:" + e.toString();
|
||||
Debug.logError(message, module);
|
||||
if (messages != null) messages.add(message);
|
||||
if (messages != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
return refInfo;
|
||||
return retMap;
|
||||
}
|
||||
|
||||
private String toUpper(String string, boolean needsUpperCase) {
|
||||
if (needsUpperCase && string != null) {
|
||||
string = string.toUpperCase();
|
||||
}
|
||||
return string;
|
||||
}
|
||||
|
||||
public Map<String, Set<String>> getIndexInfo(Set<String> tableNames, Collection<String> messages, boolean[] needsUpperCase) {
|
||||
@@ -2802,9 +2820,79 @@ public class DatabaseUtil {
|
||||
/** Comma separated list of column names in the primary tables foreign keys */
|
||||
public String fkColumnName;
|
||||
|
||||
/**
|
||||
* Gets pk table name
|
||||
* @return the pk table name
|
||||
*/
|
||||
public String getPkTableName() {
|
||||
return pkTableName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets pk column name
|
||||
* @return the pk column name
|
||||
*/
|
||||
public String getPkColumnName() {
|
||||
return pkColumnName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets fk name
|
||||
* @return the fk name
|
||||
*/
|
||||
public String getFkName() {
|
||||
return fkName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets fk table name
|
||||
* @return the fk table name
|
||||
*/
|
||||
public String getFkTableName() {
|
||||
return fkTableName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets fk column name
|
||||
* @return the fk column name
|
||||
*/
|
||||
public String getFkColumnName() {
|
||||
return fkColumnName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "FK Reference from table " + fkTableName + " called " + fkName + " to PK in table " + pkTableName;
|
||||
StringBuilder ret = new StringBuilder();
|
||||
ret.append("FK Reference from table ");
|
||||
ret.append(fkTableName);
|
||||
ret.append(" called ");
|
||||
ret.append(fkName);
|
||||
ret.append(" to PK in table ");
|
||||
ret.append(pkTableName);
|
||||
return ret.toString();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts the column information into ModelKeyMaps
|
||||
* @return a list of ModelKeyMaps
|
||||
*/
|
||||
public List<ModelKeyMap> toModelKeyMapList() {
|
||||
List<ModelKeyMap> keyMaps = new ArrayList<>();
|
||||
|
||||
List<String> fieldNames = StringUtil.split(fkColumnName, ",");
|
||||
List<String> relFieldNames = StringUtil.split(pkColumnName, ",");
|
||||
if (fieldNames.size() != relFieldNames.size()) {
|
||||
Debug.logError("Count of related fields for relation does not match!", module);
|
||||
return null;
|
||||
}
|
||||
for (int i = 0; i < fieldNames.size(); i++) {
|
||||
String fieldName = ModelUtil.dbNameToVarName(fieldNames.get(i));
|
||||
String relFieldName = ModelUtil.dbNameToVarName(relFieldNames.get(i));
|
||||
ModelKeyMap keyMap = new ModelKeyMap(fieldName, relFieldName);
|
||||
keyMaps.add(keyMap);
|
||||
}
|
||||
|
||||
return keyMaps;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -245,6 +245,33 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
public ModelEntity(String tableName, Map<String, DatabaseUtil.ColumnCheckInfo> colMap,
|
||||
Map<String, DatabaseUtil.ReferenceCheckInfo> refMap, ModelFieldTypeReader modelFieldTypeReader,
|
||||
boolean isCaseSensitive) {
|
||||
// if there is a dot in the name, remove it and everything before it, should be
|
||||
// the schema name
|
||||
this.modelReader = null;
|
||||
this.modelInfo = ModelInfo.DEFAULT;
|
||||
this.tableName = tableName;
|
||||
int dotIndex = this.tableName.indexOf('.');
|
||||
if (dotIndex >= 0) {
|
||||
this.tableName = this.tableName.substring(dotIndex + 1);
|
||||
}
|
||||
this.entityName = ModelUtil.dbNameToClassName(this.tableName);
|
||||
for (Map.Entry<String, DatabaseUtil.ColumnCheckInfo> columnEntry : colMap.entrySet()) {
|
||||
DatabaseUtil.ColumnCheckInfo ccInfo = columnEntry.getValue();
|
||||
ModelField newField = ModelField.create(this, ccInfo, modelFieldTypeReader);
|
||||
addField(newField);
|
||||
}
|
||||
if (UtilValidate.isNotEmpty(refMap)) {
|
||||
for (Map.Entry<String, DatabaseUtil.ReferenceCheckInfo> referenceEntry : refMap.entrySet()) {
|
||||
DatabaseUtil.ReferenceCheckInfo rcInfo = referenceEntry.getValue();
|
||||
ModelRelation newRel = ModelRelation.create(this, rcInfo, false);
|
||||
addRelation(newRel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void populateBasicInfo(Element entityElement) {
|
||||
this.entityName = UtilXml.checkEmpty(entityElement.getAttribute("entity-name")).intern();
|
||||
this.tableName = UtilXml.checkEmpty(entityElement.getAttribute("table-name"), ModelUtil.javaNameToDbName(this.entityName)).intern();
|
||||
|
||||
@@ -28,6 +28,7 @@ import java.util.TreeSet;
|
||||
import org.apache.ofbiz.base.lang.ThreadSafe;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.base.util.UtilXml;
|
||||
import org.apache.ofbiz.entity.jdbc.DatabaseUtil;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
|
||||
@@ -39,6 +40,34 @@ import org.w3c.dom.Element;
|
||||
@SuppressWarnings("serial")
|
||||
public final class ModelRelation extends ModelChild {
|
||||
|
||||
/*
|
||||
* Developers - this is an immutable class. Once constructed, the object should not change state.
|
||||
* Therefore, 'setter' methods are not allowed. If client code needs to modify the object's
|
||||
* state, then it can create a new copy with the changed values.
|
||||
*/
|
||||
|
||||
/** the title, gives a name/description to the relation */
|
||||
private final String title;
|
||||
|
||||
/** the type: either "one" or "many" or "one-nofk" */
|
||||
private final String type;
|
||||
|
||||
/** the name of the related entity */
|
||||
private final String relEntityName;
|
||||
|
||||
/** the name to use for a database foreign key, if applies */
|
||||
private final String fkName;
|
||||
|
||||
/** keyMaps defining how to lookup the relatedTable using columns from this table */
|
||||
private final List<ModelKeyMap> keyMaps;
|
||||
|
||||
private final boolean isAutoRelation;
|
||||
|
||||
/** A String to uniquely identify this relation. */
|
||||
private final String fullName;
|
||||
|
||||
private final String combinedName;
|
||||
|
||||
/**
|
||||
* Returns a new <code>ModelRelation</code> instance, initialized with the specified values.
|
||||
*
|
||||
@@ -100,33 +129,15 @@ public final class ModelRelation extends ModelChild {
|
||||
return new ModelRelation(modelEntity, description, type, title, relEntityName, fkName, keyMaps, isAutoRelation);
|
||||
}
|
||||
|
||||
/*
|
||||
* Developers - this is an immutable class. Once constructed, the object should not change state.
|
||||
* Therefore, 'setter' methods are not allowed. If client code needs to modify the object's
|
||||
* state, then it can create a new copy with the changed values.
|
||||
*/
|
||||
|
||||
/** the title, gives a name/description to the relation */
|
||||
private final String title;
|
||||
|
||||
/** the type: either "one" or "many" or "one-nofk" */
|
||||
private final String type;
|
||||
|
||||
/** the name of the related entity */
|
||||
private final String relEntityName;
|
||||
|
||||
/** the name to use for a database foreign key, if applies */
|
||||
private final String fkName;
|
||||
|
||||
/** keyMaps defining how to lookup the relatedTable using columns from this table */
|
||||
private final List<ModelKeyMap> keyMaps;
|
||||
|
||||
private final boolean isAutoRelation;
|
||||
|
||||
/** A String to uniquely identify this relation. */
|
||||
private final String fullName;
|
||||
|
||||
private final String combinedName;
|
||||
public static ModelRelation create(ModelEntity modelEntity, DatabaseUtil.ReferenceCheckInfo refInfo, boolean isAutoRelation) {
|
||||
String fkName = refInfo.getFkName();
|
||||
String title = null;
|
||||
String type = null;
|
||||
String description = null;
|
||||
String relEntityName = ModelUtil.dbNameToClassName(refInfo.getPkTableName());
|
||||
List<ModelKeyMap> keyMaps = refInfo.toModelKeyMapList();
|
||||
return new ModelRelation(modelEntity, description, type, title, relEntityName, fkName, keyMaps, isAutoRelation);
|
||||
}
|
||||
|
||||
private ModelRelation(ModelEntity modelEntity, String description, String type, String title, String relEntityName, String fkName, List<ModelKeyMap> keyMaps, boolean isAutoRelation) {
|
||||
super(modelEntity, description);
|
||||
@@ -149,7 +160,7 @@ public final class ModelRelation extends ModelChild {
|
||||
}
|
||||
sb.append("]");
|
||||
this.fullName = sb.toString();
|
||||
this.combinedName = title.concat(relEntityName);
|
||||
this.combinedName = title != null ? title.concat(relEntityName) : relEntityName;
|
||||
}
|
||||
|
||||
/** Returns the combined name (title + related entity name). */
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
###############################################################################
|
||||
##############################################################################
|
||||
# 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
|
||||
@@ -121,8 +121,9 @@ security.login.cert.allow=true
|
||||
# -- pattern for the userlogin id in CN section of certificate
|
||||
security.login.cert.pattern=^(\\w*\\s?\\w*)\\W*.*$
|
||||
|
||||
# -- use Tomcat SingleSignOn valve
|
||||
# -- Tomcat SSO should not be used in a cluster: OFBIZ-10123
|
||||
# -- Use Tomcat SingleSignOn valve to allow single sign on (SSO) and single log out (SLO).
|
||||
# -- Remember to set security.login.externalLoginKey.enabled to false when using Tomcat SSO.
|
||||
# -- Note Tomcat SSO is not implemented for cluster as Tomcat ClusterSingleSignOn is not used: OFBIZ-10123
|
||||
security.login.tomcat.sso=false
|
||||
|
||||
# -- Hours after which EmailAdressVerification should expire
|
||||
@@ -154,9 +155,13 @@ security.token.key=security.token.key
|
||||
|
||||
# -- List of domains or IP addresses to be checked to prevent Host Header Injection,
|
||||
# -- no spaces after commas,no wildcard, can be extended of course...
|
||||
host-headers-allowed=localhost,127.0.0.1,demo-trunk.ofbiz.apache.org,demo-stable.ofbiz.apache.org,demo-old.ofbiz.apache.org
|
||||
host-headers-allowed=localhost,127.0.0.1,demo-trunk.ofbiz.apache.org,demo-stable.ofbiz.apache.org,demo-next.ofbiz.apache.org
|
||||
|
||||
# -- By default the SameSite value in SameSiteFilter is strict. This allows to change it to lax if needed
|
||||
# -- By default the SameSite value in SameSiteFilter is 'strict'.
|
||||
# -- This property allows to change to 'lax' if needed.
|
||||
# -- If you use 'lax' we recommend that you set
|
||||
# -- org.apache.ofbiz.security.CsrfDefenseStrategy
|
||||
# -- for csrf.defense.strategy (see below)
|
||||
SameSiteCookieAttribute=
|
||||
|
||||
# -- Freemarker TemplateClassResolver option, see OFBIZ-11709.
|
||||
@@ -179,12 +184,22 @@ templateClassResolver=
|
||||
#-- For supported formats see https://commons.apache.org/proper/commons-imaging/formatsupport.html
|
||||
#-- Notably https://commons.apache.org/proper/commons-imaging/formatsupport.html#Metadata_Format_Support
|
||||
#-- OOTB OFBiz only supports PNG, GIF, TIFF and JPEG, it's a breeze to extend using more:
|
||||
#-- commonsImagingSupportedFormats=BMP,GIF,JPEG/JFIF,ICNS,ICO/CUR,PCX/DCX,PNM/PGM/PBM/PPM/PAMPortablePixmap,PNG,PSD/Photoshop,RGBE/RadianceHDR,TIFF,WBMP,XBM,XPM
|
||||
#-- commonsImagingSupportedFormats=BMP,GIF,JPEG/JFIF,ICNS,ICO/CUR,PCX/DCX,PNM/PGM/PBM/PPM/PAMPortablePixmap,PNG,PSD/Photoshop,RGBE/RadianceHDR,\
|
||||
TIFF,WBMP,XBM,XPM
|
||||
#-- You should then modify SupportedImageFormats label.
|
||||
#--
|
||||
#-- If you want to get more image formats then use imageJ:
|
||||
#-- For imagejSupportedFormats see https://imagejdocu.tudor.lu/faq/general/which_file_formats_are_supported_by_imagej. NOTE: plugins support is important here
|
||||
#-- imagejSupportedFormats=TIFF(.tiff,.tif),JPEG(.jpeg,.jpg),BMP(.bmp),FITS(.fits),PGM(.pgm),PPM(.ppm),PBM(.pbm),GIF(.gif),AnimatedGIF(.gif),PNG(.png),DICOM(.dic,.dcm,.dicom),PICT(.pict,.pic,.pct),PSD(.psd),TGA(.tga),ICO(.ico),CUR(.cur),Sunraster(.sun),XBM(.xbm),XPM(.xpm),PCX(.pcx),ANALYZE,NIfTi,AHF(.ahf),SPE(.spe),PIC(.pic),LeicaTIFF(.tiff,.lei),Quicktime(.pic,.mov),AVI(.avi),PDS(.pds),LSM(.lsm),RAW,ISAC,FluoViewTIFF(.tiff),FluoviewFV1000OIB(.oib),FluoviewFV1000OIF(.oif,.tif,-ro.pty,.lut,.bmp),IPLAB(.ipl),BrukerNMR(.fid,.ser,.2dseq,.2rr,.2ii,.3rrr,.3iii),FDF(.fdf),VFF(.vff),SIF(.sif),AxioVisionZVI(.zvi),DM3(.dm3),Deltavision(.dv,.r3d),MI,NII,NIII,IMG(.img),UNC,PerkinElmer(.tif,.tim,.zpo,.csv,.htm,.ano,.rec,.cfg,.2,.3,.4,.5,.6,.7,.8,\u2026),EPS(.eps,.epsi),SEQ(.seq),IPW(.ipw),OpenLabLIFF(.liff),OpenLabRAW(.raw),Metamorph(.stk),ICS(.ics,.ids),LeicaLif(.lif),Imaris(.ims),OME-XML(.ome),OME-TIFF(.tiff),ABD-TIFF(.tiff),GEL(.gel),Nikon(.nef,.tiff),Slidebook(.sld),SPCImage(.sdt),AL3D(.al3d),ND2(.nd2),µManager(.tif,.txt),MRC(.mrc),JPEG2000(.jp2),MNG(.mng),Flex(.flex),NRRD(.nrrd,.nhdr),VIFFbitmapimage(.xv),ROI(.roi),ERS(.ers),RS(.rs),HPGL
|
||||
#-- imagejSupportedFormats=TIFF(.tiff,.tif),JPEG(.jpeg,.jpg),BMP(.bmp),FITS(.fits),PGM(.pgm),PPM(.ppm),PBM(.pbm),GIF(.gif),AnimatedGIF(.gif),\
|
||||
PNG(.png),DICOM(.dic,.dcm,.dicom),PICT(.pict,.pic,.pct),PSD(.psd),TGA(.tga),ICO(.ico),CUR(.cur),Sunraster(.sun),\
|
||||
XBM(.xbm),XPM(.xpm),PCX(.pcx),ANALYZE,NIfTi,AHF(.ahf),SPE(.spe),PIC(.pic),LeicaTIFF(.tiff,.lei),Quicktime(.pic,.mov),\
|
||||
AVI(.avi),PDS(.pds),LSM(.lsm),RAW,ISAC,FluoViewTIFF(.tiff),FluoviewFV1000OIB(.oib),\
|
||||
FluoviewFV1000OIF(.oif,.tif,-ro.pty,.lut,.bmp),IPLAB(.ipl),BrukerNMR(.fid,.ser,.2dseq,.2rr,.2ii,.3rrr,.3iii),FDF(.fdf),\
|
||||
VFF(.vff),SIF(.sif),AxioVisionZVI(.zvi),DM3(.dm3),Deltavision(.dv,.r3d),MI,NII,NIII,IMG(.img),UNC,PerkinElmer(.tif,.tim,\
|
||||
.zpo,.csv,.htm,.ano,.rec,.cfg,.2,.3,.4,.5,.6,.7,.8,\u2026),EPS(.eps,.epsi),SEQ(.seq),IPW(.ipw),OpenLabLIFF(.liff),\
|
||||
OpenLabRAW(.raw),Metamorph(.stk),ICS(.ics,.ids),LeicaLif(.lif),Imaris(.ims),OME-XML(.ome),OME-TIFF(.tiff),\
|
||||
ABD-TIFF(.tiff),GEL(.gel),Nikon(.nef,.tiff),Slidebook(.sld),SPCImage(.sdt),AL3D(.al3d),ND2(.nd2),μManager(.tif,.txt),\
|
||||
MRC(.mrc),JPEG2000(.jp2),MNG(.mng),Flex(.flex),NRRD(.nrrd,.nhdr),VIFFbitmapimage(.xv),ROI(.roi),ERS(.ers),RS(.rs),HPGL
|
||||
#--
|
||||
#-- PDFBox and PDFReader are used for PDF files
|
||||
#--
|
||||
@@ -193,21 +208,44 @@ templateClassResolver=
|
||||
#--
|
||||
#-- List of denied files suffixes to be uploaded
|
||||
#-- OFBiz of course also check contents...
|
||||
deniedFileExtensions=html,htm,php,php2,hph3,php4,php5,asp,aspx,ascx,jsp,jspx,cfm,cfc,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis,sh,phtm,shtm,inc,asp,cdx,asa,cer,py,pl,shtml,hta,ps1
|
||||
deniedFileExtensions=html,htm,php,php1,php2,hph3,php4,php5,php6,php7,phps,asp,aspx,asa,asax,ascx,ashx,asmx,jsp,jspa,jspx,jsw,jsv,jspf,jtml,cfm,cfc,bat,exe,com,dll,\
|
||||
vbs,js,reg,cgi,asis,sh,phtm,pht,phtml,shtm,inc,asp,cdx,asa,cer,py,pl,shtml,hta,ps1,tag,pgif,htaccess,phar,inc,cgi,wss,do,action
|
||||
#--
|
||||
#-- The upload vulnerability is only a post-auth (needs a credential with suitable permissions),
|
||||
#-- people may like to allow more than what is allowed OOTB
|
||||
#-- As it name says, allowAllUploads opens all possibilities
|
||||
allowAllUploads=
|
||||
|
||||
#--
|
||||
#-- List of denied tokens often part of webshells
|
||||
#-- CSV format used to upload CSV files, cf. https://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html
|
||||
csvformat=CSVFormat.DEFAULT
|
||||
|
||||
|
||||
#--
|
||||
#-- List of denied tokens often part of webshells. Note that, for now at least, most are supposed to be used on a *nix system
|
||||
#-- TODO.... to be continued with known webshell contents... a complete allow list is impossible anyway...
|
||||
#-- eg: https://www.acunetix.com/blog/articles/detection-prevention-introduction-web-shells-part-5/
|
||||
#--
|
||||
#-- It could notably be improved by checking for all Javascripts payloads.
|
||||
#-- As listed at https://portswigger.net/web-security/cross-site-scripting/cheat-sheet,
|
||||
#-- at 2022-02-25 there are 8929 of them considering all tags, all events and all browsers...!
|
||||
#--
|
||||
#-- "freemarker" should be OK, should not be used in Freemarker templates, not part of the syntax.
|
||||
#-- Else "template.utility.Execute" is a good replacement but not as much catching, who knows...
|
||||
deniedWebShellTokens=freemarker,import=\"java,runtime.getruntime().exec(,<%@ page,<script,<body>,<form,php,\
|
||||
javascript,%eval,@eval,import os,passthru,exec,shell_exec,assert,str_rot13,system,phpinfo,base64_decode,chmod,mkdir,\
|
||||
fopen,fclose,new file,import,upload,getfilename,download,getoutputstring,readfile
|
||||
#--
|
||||
#-- If you are sure you are safe for a token you can remove it, etc.
|
||||
deniedWebShellTokens=java.,beans,freemarker,<script,javascript,<body,body ,<form,<jsp:,<c:out,taglib,<prefix,<%@ page,<?php,exec(,alert(,\
|
||||
%eval,@eval,eval(,runtime,import,passthru,shell_exec,assert,str_rot13,system,decode,include,page ,\
|
||||
chmod,mkdir,fopen,fclose,new file,upload,getfilename,download,getoutputstring,readfile,iframe,object,embed,onload,build,\
|
||||
python,perl ,/perl,ruby ,/ruby,process,function,class,InputStream,to_server,wget ,static,assign,webappPath,\
|
||||
ifconfig,route,crontab,netstat,uname ,hostname,iptables,whoami,"cmd",*cmd|,+cmd|,=cmd|,localhost,thread,require,gzdeflate
|
||||
|
||||
#-- Max line length for uploaded files, by default 10000
|
||||
maxLineLength=
|
||||
|
||||
#-- Popup last-visited time from database after user has logged in.
|
||||
#-- So users can know of any unauthorised access to their accounts.
|
||||
#-- Default is false.
|
||||
afterlogin.lastvisit.show=
|
||||
|
||||
#-- uri used for login (cf jira OFBIZ-12047)
|
||||
#-- it's a list, each uri should be separated by comma, without space
|
||||
@@ -216,3 +254,12 @@ login.uris=login
|
||||
#-- If you need to use localhost or 127.0.0.1 in textareas URLs then you can uncomment the allowedProtocols property, here given as an example
|
||||
#-- You may also put other protocols you want to use, instead or with those
|
||||
allowedProtocols=localhost,127.0.0.1
|
||||
|
||||
#-- By default (OOTB) OFBiz is protected against Large File Denial of Service because build.gradle defines -Xmx1024M
|
||||
#-- So you can at most upload a file around 500MB (see OFBIZ-11534 for more info)
|
||||
#-- If you need to upload larger files then follow https://nightlies.apache.org/ofbiz/trunk/readme/html5/#passing-jvm-runtime-options-to-ofbiz
|
||||
|
||||
#-- Prevent Freemarker exploits
|
||||
#-- eg: allowedURIsForFreemarkerInterpolation=createTextContentCms,updateTextContentCms,...
|
||||
allowedURIsForFreemarkerInterpolation=
|
||||
|
||||
|
||||
@@ -27,6 +27,8 @@ import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.charset.CharacterCodingException;
|
||||
import java.nio.charset.Charset;
|
||||
@@ -49,6 +51,8 @@ import javax.imageio.stream.ImageInputStream;
|
||||
|
||||
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
|
||||
import org.apache.batik.util.XMLResourceDescriptor;
|
||||
import org.apache.commons.csv.CSVFormat;
|
||||
import org.apache.commons.csv.CSVParser;
|
||||
import org.apache.commons.imaging.ImageFormat;
|
||||
import org.apache.commons.imaging.ImageFormats;
|
||||
import org.apache.commons.imaging.ImageInfo;
|
||||
@@ -62,6 +66,7 @@ import org.apache.commons.imaging.formats.png.PngImageParser;
|
||||
import org.apache.commons.imaging.formats.tiff.TiffImageParser;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.FileUtil;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
@@ -89,44 +94,62 @@ import com.lowagie.text.pdf.PdfReader;
|
||||
|
||||
public class SecuredUpload {
|
||||
|
||||
// To check if a webshell is not uploaded
|
||||
|
||||
// This can be helpful:
|
||||
// https://en.wikipedia.org/wiki/File_format
|
||||
// https://en.wikipedia.org/wiki/List_of_file_signatures
|
||||
// See also information in security.properties:
|
||||
// Line #-- UPLOAD: supported file formats are *safe* PNG, GIF, TIFF, JPEG, PDF, Audio and Video and ZIP
|
||||
// Supported file formats are *safe* PNG, GIF, TIFF, JPEG, PDF, Audio, Video, Text, and ZIP
|
||||
|
||||
private static final String MODULE = SecuredUpload.class.getName();
|
||||
private static final List<String> DENIEDFILEEXTENSIONS = deniedFileExtensions();
|
||||
private static final List<String> DENIEDWEBSHELLTOKENS = deniedWebShellTokens();
|
||||
private static final List<String> DENIEDFILEEXTENSIONS = getDeniedFileExtensions();
|
||||
private static final List<String> DENIEDWEBSHELLTOKENS = getDeniedWebShellTokens();
|
||||
private static final Integer MAXLINELENGTH = UtilProperties.getPropertyAsInteger("security", "maxLineLength", 10000);
|
||||
|
||||
/**
|
||||
* @param fileToCheck
|
||||
* @param fileType
|
||||
* @return true if the file is valid
|
||||
* @throws IOException
|
||||
* @throws ImageReadException
|
||||
*/
|
||||
public static boolean isValidFile(String fileToCheck, String fileType, Delegator delegator) throws IOException, ImageReadException {
|
||||
public static boolean isValidText(String content, List<String> allowed) throws IOException {
|
||||
return content != null ? DENIEDWEBSHELLTOKENS.stream().allMatch(token -> isValid(content, token.toLowerCase(), allowed)) : false;
|
||||
}
|
||||
|
||||
if (("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security", "allowAllUploads", delegator)))) {
|
||||
return true;
|
||||
public static boolean isValidFileName(String fileToCheck, Delegator delegator) throws IOException {
|
||||
// Prevents double extensions
|
||||
if (StringUtils.countMatches(fileToCheck, ".") > 1) {
|
||||
Debug.logError("Double extensions are not allowed for security reason", MODULE);
|
||||
return false;
|
||||
}
|
||||
|
||||
String imageServerUrl = EntityUtilProperties.getPropertyValue("catalog", "image.management.url", delegator);
|
||||
Path p = Paths.get(fileToCheck);
|
||||
String fileName = p.getFileName().toString(); // The file name is the farthest element from the root in the directory hierarchy.
|
||||
boolean wrongFile = true;
|
||||
|
||||
if (DENIEDFILEEXTENSIONS.contains(FilenameUtils.getExtension(fileToCheck))) {
|
||||
// Check extensions
|
||||
if (p != null && p.getFileName() != null) {
|
||||
String fileName = p.getFileName().toString(); // The file name is the farthest element from the root in the directory hierarchy.
|
||||
String extension = FilenameUtils.getExtension(fileToCheck).toLowerCase();
|
||||
// Prevents null byte in filename
|
||||
if (extension.contains("%00")
|
||||
|| extension.contains("%0a")
|
||||
|| extension.contains("%20")
|
||||
|| extension.contains("%0d%0a")
|
||||
|| extension.contains("/")
|
||||
|| extension.contains("./")
|
||||
|| extension.contains(".")) {
|
||||
Debug.logError("Special bytes in extension are not allowed for security reason", MODULE);
|
||||
return false;
|
||||
}
|
||||
if (DENIEDFILEEXTENSIONS.contains(extension)) {
|
||||
Debug.logError("This file extension is not allowed for security reason", MODULE);
|
||||
deleteBadFile(fileToCheck);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check the file and path names
|
||||
if (org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS) {
|
||||
if (fileToCheck.length() > 259) { // More about that: https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
|
||||
// More about that: https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
|
||||
if (fileToCheck.length() > 259) {
|
||||
Debug.logError("Uploaded file name too long", MODULE);
|
||||
} else if (p.toString().contains(imageServerUrl.replaceAll("/", "\\\\"))) {
|
||||
// TODO check this is still useful in at least 1 case
|
||||
if (fileName.matches("[a-zA-Z0-9-_ ()]{1,249}.[a-zA-Z0-9-_ ]{1,10}")) { // "(" and ")" for duplicates files
|
||||
wrongFile = false;
|
||||
}
|
||||
@@ -137,6 +160,7 @@ public class SecuredUpload {
|
||||
if (fileToCheck.length() > 4096) {
|
||||
Debug.logError("Uploaded file name too long", MODULE);
|
||||
} else if (p.toString().contains(imageServerUrl)) {
|
||||
// TODO check this is still useful in at least 1 case
|
||||
if (fileName.matches("[a-zA-Z0-9-_ ()]{1,4086}.[a-zA-Z0-9-_ ]{1,10}")) { // "(" and ")" for duplicates files
|
||||
wrongFile = false;
|
||||
}
|
||||
@@ -144,6 +168,7 @@ public class SecuredUpload {
|
||||
wrongFile = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (wrongFile) {
|
||||
Debug.logError("Uploaded file "
|
||||
@@ -154,6 +179,34 @@ public class SecuredUpload {
|
||||
deleteBadFile(fileToCheck);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param fileToCheck
|
||||
* @param fileType
|
||||
* @return true if the file is valid
|
||||
* @throws IOException
|
||||
* @throws ImageReadException
|
||||
*/
|
||||
public static boolean isValidFile(String fileToCheck, String fileType, Delegator delegator) throws IOException, ImageReadException {
|
||||
// Allow all
|
||||
if (("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security", "allowAllUploads", delegator)))) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Check the file name
|
||||
if (!isValidFileName(fileToCheck, delegator)) { // Useless when the file is internally generated, but not sure for all cases
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check the file content
|
||||
|
||||
// Check max line length, default 10000
|
||||
if (!checkMaxLinesLength(fileToCheck)) {
|
||||
Debug.logError("For security reason lines over " + MAXLINELENGTH.toString() + " are not allowed", MODULE);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isExecutable(fileToCheck)) {
|
||||
deleteBadFile(fileToCheck);
|
||||
@@ -186,7 +239,7 @@ public class SecuredUpload {
|
||||
break;
|
||||
|
||||
case "AllButCompressed":
|
||||
if (isValidTextFile(fileToCheck)
|
||||
if (isValidTextFile(fileToCheck, true)
|
||||
|| isValidImageIncludingSvgFile(fileToCheck)
|
||||
|| isValidPdfFile(fileToCheck)) {
|
||||
return true;
|
||||
@@ -197,7 +250,7 @@ public class SecuredUpload {
|
||||
// The philosophy for isValidTextFile() is that
|
||||
// we can't presume of all possible text contents used for attacks with payloads
|
||||
// At least there is an easy way to prevent them in isValidTextFile
|
||||
if (isValidTextFile(fileToCheck)) {
|
||||
if (isValidTextFile(fileToCheck, true)) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
@@ -212,13 +265,19 @@ public class SecuredUpload {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case "CSV":
|
||||
if (isValidCsvFile(fileToCheck)) {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
|
||||
default: // All
|
||||
if (isValidTextFile(fileToCheck)
|
||||
if (isValidTextFile(fileToCheck, true)
|
||||
|| isValidImageIncludingSvgFile(fileToCheck)
|
||||
|| isValidCompressedFile(fileToCheck, delegator)
|
||||
|| isValidAudioFile(fileToCheck)
|
||||
|| isValidVideoFile(fileToCheck)
|
||||
|| isValidCsvFile(fileToCheck)
|
||||
|| isValidPdfFile(fileToCheck)) {
|
||||
return true;
|
||||
}
|
||||
@@ -242,7 +301,8 @@ public class SecuredUpload {
|
||||
|| imageFormat.equals(ImageFormats.GIF)
|
||||
|| imageFormat.equals(ImageFormats.TIFF)
|
||||
|| imageFormat.equals(ImageFormats.JPEG))
|
||||
&& imageMadeSafe(fileName);
|
||||
&& imageMadeSafe(fileName)
|
||||
&& isValidTextFile(fileName, false);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -255,8 +315,9 @@ public class SecuredUpload {
|
||||
File file = new File(fileName);
|
||||
boolean safeState = false;
|
||||
boolean fallbackOnApacheCommonsImaging;
|
||||
try {
|
||||
|
||||
if ((file != null) && file.exists() && file.canRead() && file.canWrite()) {
|
||||
try (OutputStream fos = Files.newOutputStream(file.toPath(), StandardOpenOption.WRITE)) {
|
||||
// Get the image format
|
||||
String formatName;
|
||||
ImageInputStream iis = ImageIO.createImageInputStream(file);
|
||||
@@ -306,7 +367,7 @@ public class SecuredUpload {
|
||||
Graphics bg = sanitizedImage.getGraphics();
|
||||
bg.drawImage(initialSizedImage, 0, 0, null);
|
||||
bg.dispose();
|
||||
OutputStream fos = Files.newOutputStream(file.toPath(), StandardOpenOption.WRITE);
|
||||
|
||||
if (!fallbackOnApacheCommonsImaging) {
|
||||
ImageIO.write(sanitizedImage, formatName, fos);
|
||||
} else {
|
||||
@@ -314,36 +375,29 @@ public class SecuredUpload {
|
||||
// Handle only formats for which Apache Commons Imaging can successfully write (YES in Write column of the reference link)
|
||||
// the image format. See reference link in the class header
|
||||
switch (formatName) {
|
||||
case "TIFF": {
|
||||
case "TIFF":
|
||||
imageParser = new TiffImageParser();
|
||||
break;
|
||||
}
|
||||
case "GIF": {
|
||||
case "GIF":
|
||||
imageParser = new GifImageParser();
|
||||
break;
|
||||
}
|
||||
case "PNG": {
|
||||
case "PNG":
|
||||
imageParser = new PngImageParser();
|
||||
break;
|
||||
}
|
||||
case "JPEG": {
|
||||
case "JPEG":
|
||||
imageParser = new JpegImageParser();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
default:
|
||||
throw new IOException("Format of the original image " + fileName + " is not supported for write operation !");
|
||||
}
|
||||
}
|
||||
imageParser.writeImage(sanitizedImage, fos, new HashMap<>());
|
||||
}
|
||||
// Set state flag
|
||||
fos.close(); // This was not correctly handled in the document-upload-protection example, and I did not spot it :/
|
||||
safeState = true;
|
||||
}
|
||||
} catch (IOException | ImageReadException | ImageWriteException e) {
|
||||
safeState = false;
|
||||
Debug.logWarning(e, "Error during Image file " + fileName + " processing !", MODULE);
|
||||
}
|
||||
}
|
||||
return safeState;
|
||||
}
|
||||
|
||||
@@ -374,7 +428,7 @@ public class SecuredUpload {
|
||||
} catch (IOException e) {
|
||||
return false;
|
||||
}
|
||||
return isValidTextFile(fileName); // Validate content to prevent webshell
|
||||
return isValidTextFile(fileName, true); // Validate content to prevent webshell
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -406,24 +460,62 @@ public class SecuredUpload {
|
||||
}
|
||||
} catch (Exception e) {
|
||||
safeState = false;
|
||||
Debug.logError(e, "for security reason the PDF file " + file.getAbsolutePath() + "can't be uploaded !", MODULE);
|
||||
Debug.logInfo(e, "The file " + file.getAbsolutePath() + " is not a valid PDF file. For security reason it's not accepted as a such file",
|
||||
MODULE);
|
||||
}
|
||||
return safeState;
|
||||
}
|
||||
|
||||
/**
|
||||
* Is it a CVS file?
|
||||
* @param fileName
|
||||
* @return true if it's a valid CVS file
|
||||
* @throws IOException
|
||||
*/
|
||||
private static boolean isValidCsvFile(String fileName) throws IOException {
|
||||
Path filePath = Paths.get(fileName);
|
||||
String content = new String(Files.readAllBytes(filePath));
|
||||
Reader in = new StringReader(content);
|
||||
String cvsFormatString = UtilProperties.getPropertyValue("security", "csvformat");
|
||||
CSVFormat cvsFormat = CSVFormat.DEFAULT;
|
||||
switch (cvsFormatString) {
|
||||
case "EXCEL":
|
||||
cvsFormat = CSVFormat.EXCEL;
|
||||
break;
|
||||
case "MYSQL":
|
||||
cvsFormat = CSVFormat.MYSQL;
|
||||
break;
|
||||
case "ORACLE":
|
||||
cvsFormat = CSVFormat.ORACLE;
|
||||
break;
|
||||
case "POSTGRESQL_CSV":
|
||||
cvsFormat = CSVFormat.POSTGRESQL_CSV;
|
||||
break;
|
||||
default:
|
||||
cvsFormat = CSVFormat.DEFAULT;
|
||||
}
|
||||
|
||||
// cf. https://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html
|
||||
try (CSVParser parser = new CSVParser(in, cvsFormat)) {
|
||||
parser.getRecords();
|
||||
}
|
||||
return isValidTextFile(fileName, false); // Validate content to prevent webshell
|
||||
}
|
||||
|
||||
private static boolean isExecutable(String fileName) throws IOException {
|
||||
String mimeType = getMimeTypeFromFileName(fileName);
|
||||
// Check for Windows executable. Neglect .bat and .ps1: https://s.apache.org/c8sim
|
||||
if ("application/x-msdownload".equals(mimeType) || "application/x-ms-installer".equals(mimeType)) {
|
||||
Debug.logError("The file" + fileName + " is a Windows executable, for security reason it's not accepted :", MODULE);
|
||||
Debug.logError("The file " + fileName + " is a Windows executable, for security reason it's not accepted", MODULE);
|
||||
return true;
|
||||
}
|
||||
// Check for ELF (Linux) and scripts
|
||||
if ("application/x-elf".equals(mimeType)
|
||||
|| "application/x-sh".equals(mimeType)
|
||||
|| "application/text/x-perl".equals(mimeType)
|
||||
|| "application/text/x-ruby".equals(mimeType)
|
||||
|| "application/text/x-python".equals(mimeType)) {
|
||||
Debug.logError("The file" + fileName + " is a Linux executable, for security reason it's not accepted :", MODULE);
|
||||
Debug.logError("The file " + fileName + " is a Linux executable, for security reason it's not accepted", MODULE);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -487,9 +579,12 @@ public class SecuredUpload {
|
||||
*/
|
||||
private static String getMimeTypeFromFileName(String fileName) throws IOException {
|
||||
File file = new File(fileName);
|
||||
if (file.exists()) {
|
||||
Tika tika = new Tika();
|
||||
return tika.detect(file);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isValidDirectoryInCompressedFile(String folderName, Delegator delegator) throws IOException, ImageReadException {
|
||||
File folder = new File(folderName);
|
||||
@@ -572,7 +667,7 @@ public class SecuredUpload {
|
||||
|| "audio/x-flac".equals(mimeType)) {
|
||||
return true;
|
||||
}
|
||||
Debug.logError("The file" + fileName + " is not a valid audio file, for security reason it's not accepted :", MODULE);
|
||||
Debug.logInfo("The file " + fileName + " is not a valid audio file. For security reason it's not accepted as a such file", MODULE);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -597,52 +692,75 @@ public class SecuredUpload {
|
||||
|| "video/x-ms-wmx".equals(mimeType)) {
|
||||
return true;
|
||||
}
|
||||
Debug.logError("The file" + fileName + " is not a valid video file, for security reason it's not accepted :", MODULE);
|
||||
Debug.logInfo("The file " + fileName + " is not a valid video file. For security reason it's not accepted as a such file", MODULE);
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Does this text file contains a Freemarker Server-Side Template Injection (SSTI) using freemarker.template.utility.Execute? Etc.
|
||||
* @param fileName must be an UTF-8 encoded text file
|
||||
* @param encodedContent TODO
|
||||
* @return true if the text file does not contains a Freemarker SSTI
|
||||
* @throws IOException
|
||||
*/
|
||||
private static boolean isValidTextFile(String fileName) throws IOException {
|
||||
private static boolean isValidTextFile(String fileName, Boolean encodedContent) throws IOException {
|
||||
Path filePath = Paths.get(fileName);
|
||||
byte[] bytesFromFile = Files.readAllBytes(filePath);
|
||||
if (encodedContent) {
|
||||
try {
|
||||
Charset.availableCharsets().get("UTF-8").newDecoder().decode(ByteBuffer.wrap(bytesFromFile));
|
||||
} catch (CharacterCodingException e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
String content = new String(bytesFromFile);
|
||||
if (content.toLowerCase().contains("xlink:href=\"http")
|
||||
|| content.toLowerCase().contains("<!ENTITY ")) { // Billions laugh attack
|
||||
Debug.logInfo("Linked images inside or Entity in SVG are not allowed for security reason", MODULE);
|
||||
return false;
|
||||
}
|
||||
ArrayList<String> allowed = new ArrayList<>();
|
||||
return isValidText(content, allowed);
|
||||
}
|
||||
|
||||
public static boolean isValidText(String content, List<String> allowed) throws IOException {
|
||||
return DENIEDWEBSHELLTOKENS.stream().allMatch(token -> isValid(content, token, allowed));
|
||||
}
|
||||
|
||||
private static boolean isValid(String content, String string, List<String> allowed) {
|
||||
return !content.toLowerCase().contains(string) || allowed.contains(string);
|
||||
boolean isOK = !content.toLowerCase().contains(string) || allowed.contains(string);
|
||||
if (!isOK) {
|
||||
Debug.logInfo("The uploaded file contains the string '" + string + "'. It can't be uploaded for security reason", MODULE);
|
||||
}
|
||||
return isOK;
|
||||
}
|
||||
|
||||
private static void deleteBadFile(String fileToCheck) {
|
||||
Debug.logError("File :" + fileToCheck + ", can't be uploaded for security reason", MODULE);
|
||||
Debug.logError("File : " + fileToCheck + ", can't be uploaded for security reason", MODULE);
|
||||
File badFile = new File(fileToCheck);
|
||||
if (!badFile.delete()) {
|
||||
Debug.logError("File :" + fileToCheck + ", couldn't be deleted", MODULE);
|
||||
if (badFile.exists() && !badFile.delete()) {
|
||||
Debug.logError("File : " + fileToCheck + ", couldn't be deleted", MODULE);
|
||||
}
|
||||
}
|
||||
|
||||
private static List<String> deniedFileExtensions() {
|
||||
private static List<String> getDeniedFileExtensions() {
|
||||
String deniedExtensions = UtilProperties.getPropertyValue("security", "deniedFileExtensions");
|
||||
return UtilValidate.isNotEmpty(deniedExtensions) ? StringUtil.split(deniedExtensions, ",") : new ArrayList<>();
|
||||
}
|
||||
|
||||
private static List<String> deniedWebShellTokens() {
|
||||
private static List<String> getDeniedWebShellTokens() {
|
||||
String deniedTokens = UtilProperties.getPropertyValue("security", "deniedWebShellTokens");
|
||||
return UtilValidate.isNotEmpty(deniedTokens) ? StringUtil.split(deniedTokens, ",") : new ArrayList<>();
|
||||
}
|
||||
|
||||
private static boolean checkMaxLinesLength(String fileToCheck) {
|
||||
try {
|
||||
File file = new File(fileToCheck);
|
||||
List<String> lines = FileUtils.readLines(file, Charset.defaultCharset());
|
||||
for (String line : lines) {
|
||||
if (line.length() > MAXLINELENGTH) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,13 +19,23 @@
|
||||
package org.apache.ofbiz.security;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.http.client.utils.URLEncodedUtils;
|
||||
import org.apache.http.message.BasicNameValuePair;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
import org.apache.ofbiz.base.util.UtilHttp;
|
||||
import org.apache.ofbiz.base.util.UtilMisc;
|
||||
import org.apache.ofbiz.base.util.UtilProperties;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.entity.Delegator;
|
||||
import org.apache.ofbiz.entity.GenericEntityException;
|
||||
@@ -56,7 +66,7 @@ public final class SecurityUtil {
|
||||
*
|
||||
* @param delegator
|
||||
* @param userLoginId
|
||||
* @return
|
||||
* @return boolean
|
||||
*/
|
||||
public static boolean hasUserLoginAdminPermission(Delegator delegator, String userLoginId) {
|
||||
if (UtilValidate.isEmpty(userLoginId)) return false;
|
||||
@@ -80,7 +90,7 @@ public final class SecurityUtil {
|
||||
* @param delegator
|
||||
* @param userLoginId
|
||||
* @param toUserLoginId
|
||||
* @return
|
||||
* @return List
|
||||
*/
|
||||
public static List<String> hasUserLoginMorePermissionThan(Delegator delegator, String userLoginId, String toUserLoginId) {
|
||||
ArrayList<String> returnList = new ArrayList<>();
|
||||
@@ -165,4 +175,68 @@ public final class SecurityUtil {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Prevents Freemarker exploits
|
||||
* @param req
|
||||
* @param resp
|
||||
* @param uri
|
||||
* @throws IOException
|
||||
*/
|
||||
public static boolean containsFreemarkerInterpolation(HttpServletRequest req, HttpServletResponse resp, String uri)
|
||||
throws IOException {
|
||||
String urisOkForFreemarker = UtilProperties.getPropertyValue("security", "allowedURIsForFreemarkerInterpolation");
|
||||
List<String> urisOK = UtilValidate.isNotEmpty(urisOkForFreemarker) ? StringUtil.split(urisOkForFreemarker, ",")
|
||||
: new ArrayList<>();
|
||||
String uriEnd = uri.substring(uri.lastIndexOf("/") + 1, uri.length());
|
||||
|
||||
if (!urisOK.contains(uriEnd)) {
|
||||
Map<String, String[]> parameterMap = req.getParameterMap();
|
||||
if (uri.contains("ecomseo")) { // SeoContextFilter call
|
||||
if (containsFreemarkerInterpolation(resp, uri)) {
|
||||
return true;
|
||||
}
|
||||
} else if (!parameterMap.isEmpty()) { // ControlFilter call
|
||||
List<BasicNameValuePair> params = new ArrayList<>();
|
||||
parameterMap.forEach((name, values) -> {
|
||||
for (String value : values) {
|
||||
params.add(new BasicNameValuePair(name, value));
|
||||
}
|
||||
});
|
||||
String queryString = URLEncodedUtils.format(params, Charset.forName("UTF-8"));
|
||||
uri = uri + "?" + queryString;
|
||||
if (SecurityUtil.containsFreemarkerInterpolation(resp, uri)) {
|
||||
return true;
|
||||
}
|
||||
} else if (!UtilHttp.getAttributeMap(req).isEmpty()) { // Call with Content-Type modified by a MITM attack (rare case)
|
||||
String attributeMap = UtilHttp.getAttributeMap(req).toString();
|
||||
if (containsFreemarkerInterpolation(resp, attributeMap)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param resp
|
||||
* @param stringToCheck
|
||||
* @throws IOException
|
||||
*/
|
||||
public static boolean containsFreemarkerInterpolation(HttpServletResponse resp, String stringToCheck) throws IOException {
|
||||
if (stringToCheck.contains("%24%7B") || stringToCheck.contains("${")
|
||||
|| stringToCheck.contains("%3C%23") || stringToCheck.contains("<#")
|
||||
|| stringToCheck.contains("%23%7B") || stringToCheck.contains("#{")
|
||||
|| stringToCheck.contains("%5B%3D") || stringToCheck.contains("[=")
|
||||
|| stringToCheck.contains("%5B%23") || stringToCheck.contains("[#")) { // not used OOTB in OFBiz, but possible
|
||||
|
||||
Debug.logError("===== Not saved for security reason, strings '${', '<#', '#{', '[=' or '[#' not accepted in fields! =====",
|
||||
module);
|
||||
resp.sendError(HttpServletResponse.SC_FORBIDDEN,
|
||||
"Not saved for security reason, strings '${', '<#', '#{', '[=' or '[#' not accepted in fields!");
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ under the License.
|
||||
<xs:element minOccurs="0" ref="description"/>
|
||||
<xs:element minOccurs="0" ref="namespace"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="deprecated"/>
|
||||
<xs:element minOccurs="0" ref="notification"/>
|
||||
<xs:element minOccurs="0" maxOccurs="1" ref="permission-service"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="required-permissions"/>
|
||||
<xs:element minOccurs="0" maxOccurs="unbounded" ref="implements"/>
|
||||
|
||||
+74
-15
@@ -21,20 +21,24 @@ package org.apache.ofbiz.service.engine
|
||||
import java.util.Map
|
||||
|
||||
import org.apache.ofbiz.base.util.Debug
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
import org.apache.ofbiz.entity.util.EntityQuery
|
||||
import org.apache.ofbiz.service.DispatchContext
|
||||
import org.apache.ofbiz.service.ExecutionServiceException
|
||||
import org.apache.ofbiz.service.LocalDispatcher
|
||||
import org.apache.ofbiz.service.ModelService
|
||||
import org.apache.ofbiz.service.ServiceUtil
|
||||
import org.apache.ofbiz.service.ExecutionServiceException
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
|
||||
abstract class GroovyBaseScript extends Script {
|
||||
public static final String module = GroovyBaseScript.class.getName()
|
||||
|
||||
String getModule() {
|
||||
return this.class.getName()
|
||||
}
|
||||
|
||||
Map runService(String serviceName, Map inputMap) throws ExecutionServiceException {
|
||||
LocalDispatcher dispatcher = binding.getVariable('dispatcher');
|
||||
DispatchContext dctx = dispatcher.getDispatchContext();
|
||||
LocalDispatcher dispatcher = binding.getVariable('dispatcher')
|
||||
DispatchContext dctx = dispatcher.getDispatchContext()
|
||||
if (!inputMap.userLogin) {
|
||||
inputMap.userLogin = this.binding.hasVariable('userLogin')
|
||||
? this.binding.getVariable('userLogin')
|
||||
@@ -50,6 +54,27 @@ abstract class GroovyBaseScript extends Script {
|
||||
? this.binding.getVariable('locale')
|
||||
: this.binding.getVariable('parameters').locale
|
||||
}
|
||||
if (serviceName.equals("createAnonFile")) {
|
||||
String fileName = inputMap.get("dataResourceName")
|
||||
String fileNameAndPath = inputMap.get("objectInfo")
|
||||
File file = new File(fileNameAndPath)
|
||||
if (!fileName.isEmpty()) {
|
||||
// Check the file name
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFileName(fileName, delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", inputMap.locale)
|
||||
throw new ExecutionServiceException(errorMessage)
|
||||
}
|
||||
// TODO we could verify the file type (here "All") with dataResourceTypeId. Anyway it's done with isValidFile()
|
||||
// We would just have a better error message
|
||||
if (file.exists()) {
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileNameAndPath, "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", inputMap.locale)
|
||||
throw new ExecutionServiceException(errorMessage)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Map serviceContext = dctx.makeValidContext(serviceName, ModelService.IN_PARAM, inputMap)
|
||||
Map result = dispatcher.runSync(serviceName, serviceContext)
|
||||
if (ServiceUtil.isError(result)) {
|
||||
@@ -63,11 +88,11 @@ abstract class GroovyBaseScript extends Script {
|
||||
}
|
||||
|
||||
Map makeValue(String entityName) throws ExecutionServiceException {
|
||||
return result = binding.getVariable('delegator').makeValue(entityName)
|
||||
return binding.getVariable('delegator').makeValue(entityName)
|
||||
}
|
||||
|
||||
Map makeValue(String entityName, Map inputMap) throws ExecutionServiceException {
|
||||
return result = binding.getVariable('delegator').makeValidValue(entityName, inputMap)
|
||||
return binding.getVariable('delegator').makeValidValue(entityName, inputMap)
|
||||
}
|
||||
|
||||
EntityQuery from(def entity) {
|
||||
@@ -87,21 +112,35 @@ abstract class GroovyBaseScript extends Script {
|
||||
return from(entityName).where(fields).cache(useCache).queryOne()
|
||||
}
|
||||
|
||||
def success() {
|
||||
return success(null, null)
|
||||
}
|
||||
def success(String message) {
|
||||
return success(message, null)
|
||||
}
|
||||
def success(Map returnValues) {
|
||||
return success(null, returnValues)
|
||||
}
|
||||
def success(String message, Map returnValues) {
|
||||
// TODO: implement some clever i18n mechanism based on the userLogin and locale in the binding
|
||||
if (this.binding.hasVariable('request')) {
|
||||
// the script is invoked as an "event"
|
||||
if (message) {
|
||||
this.binding.getVariable('request').setAttribute("_EVENT_MESSAGE_", message)
|
||||
}
|
||||
if (returnValues) {
|
||||
returnValues.each {
|
||||
this.binding.getVariable('request').setAttribute(it.getKey(), it.getValue())
|
||||
}
|
||||
}
|
||||
return 'success'
|
||||
} else {
|
||||
// the script is invoked as a "service"
|
||||
if (message) {
|
||||
return ServiceUtil.returnSuccess(message)
|
||||
} else {
|
||||
return ServiceUtil.returnSuccess()
|
||||
Map result = message ? ServiceUtil.returnSuccess(message) : ServiceUtil.returnSuccess()
|
||||
if (returnValues) {
|
||||
result.putAll(returnValues)
|
||||
}
|
||||
return result
|
||||
}
|
||||
}
|
||||
Map failure(String message) {
|
||||
@@ -128,17 +167,37 @@ abstract class GroovyBaseScript extends Script {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def logInfo(String message) {
|
||||
Debug.logInfo(message, module)
|
||||
Debug.logInfo(message, getModule())
|
||||
}
|
||||
def logWarning(String message) {
|
||||
Debug.logWarning(message, module)
|
||||
Debug.logWarning(message, getModule())
|
||||
}
|
||||
def logError(String message) {
|
||||
Debug.logError(message, module)
|
||||
Debug.logError(message, getModule())
|
||||
}
|
||||
def logError(Throwable t, String message) {
|
||||
Debug.logError(t, message, getModule())
|
||||
}
|
||||
def logError(Throwable t) {
|
||||
Debug.logError(t, null, getModule())
|
||||
}
|
||||
def logVerbose(String message) {
|
||||
Debug.logVerbose(message, getModule())
|
||||
}
|
||||
|
||||
def logVerbose(String message) {
|
||||
Debug.logVerbose(message, module)
|
||||
def label(String ressource, String message) {
|
||||
return label(ressource, message, null)
|
||||
}
|
||||
def label(String ressource, String message, Map context) {
|
||||
Locale locale = this.binding.getVariable('locale')
|
||||
if (!locale) {
|
||||
locale = Locale.getDefault()
|
||||
}
|
||||
if (context) {
|
||||
return UtilProperties.getMessage(ressource, message, context, locale)
|
||||
}
|
||||
return UtilProperties.getMessage(ressource, message, locale)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
package org.apache.ofbiz.service.engine;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
@@ -36,6 +38,7 @@ import org.apache.ofbiz.entity.finder.PrimaryKeyFinder;
|
||||
import org.apache.ofbiz.entity.model.ModelEntity;
|
||||
import org.apache.ofbiz.entity.model.ModelField;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.ModelParam;
|
||||
@@ -70,6 +73,9 @@ public final class EntityAutoEngine extends GenericAsyncEngine {
|
||||
@Override
|
||||
public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> parameters) throws GenericServiceException {
|
||||
// static java service methods should be: public Map<String, Object> methodName(DispatchContext dctx, Map<String, Object> context)
|
||||
if (!isValidText(parameters)) {
|
||||
return ServiceUtil.returnError("Not saved for security reason!");
|
||||
}
|
||||
DispatchContext dctx = dispatcher.getLocalContext(localName);
|
||||
Locale locale = (Locale) parameters.get("locale");
|
||||
Map<String, Object> result = ServiceUtil.returnSuccess();
|
||||
@@ -578,4 +584,21 @@ public final class EntityAutoEngine extends GenericAsyncEngine {
|
||||
Map<String, Object> result = ServiceUtil.returnSuccess(UtilProperties.getMessage("ServiceUiLabels", "EntityExpiredSuccessfully", UtilMisc.toMap("label", modelEntity.getTitle()), locale));
|
||||
return result;
|
||||
}
|
||||
|
||||
private static boolean isValidText(Map<String, Object> parameters) {
|
||||
// TODO maybe more parameters will be needed in future...
|
||||
String parameter = (String) parameters.get("webappPath");
|
||||
if (parameter != null) {
|
||||
try {
|
||||
if (!SecuredUpload.isValidText(parameter, Collections.emptyList())) {
|
||||
Debug.logError("================== Not saved for security reason ==================", module);
|
||||
return false;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Debug.logError("================== Not saved for security reason ==================", module);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -32,6 +32,8 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.security.SecurityUtil;
|
||||
|
||||
/*
|
||||
* A Filter used to specify a whitelist of allowed paths to the OFBiz application.
|
||||
@@ -132,6 +134,16 @@ public class ControlFilter implements Filter {
|
||||
if (offset == -1) {
|
||||
offset = requestUri.length();
|
||||
}
|
||||
|
||||
GenericValue userLogin = (GenericValue) httpRequest.getSession().getAttribute("userLogin");
|
||||
if (!LoginWorker.hasBasePermission(userLogin, httpRequest)) { // Allows UEL and FlexibleString (OFBIZ-12602)
|
||||
if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests")
|
||||
&& null == System.getProperty("SolrDispatchFilter") // Allows Solr tests
|
||||
&& SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
while (!allowedPaths.contains(requestUri.substring(0, offset))) {
|
||||
offset = requestUri.indexOf("/", offset + 1);
|
||||
if (offset == -1) {
|
||||
|
||||
@@ -501,7 +501,7 @@ public class RequestHandler {
|
||||
requestMap = ccfg.getRequestMapMap().getFirst("ajaxCheckLogin");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
} else if (requestUri != null) {
|
||||
String[] loginUris = EntityUtilProperties.getPropertyValue("security", "login.uris", delegator).split(",");
|
||||
boolean removePreviousRequest = true;
|
||||
for (int i = 0; i < loginUris.length; i++) {
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -1600,6 +1600,18 @@
|
||||
<value xml:lang="zh">定义位置</value>
|
||||
<value xml:lang="zh-TW">定義位置</value>
|
||||
</property>
|
||||
<property key="WebtoolsDelegatorName">
|
||||
<value xml:lang="de">Name Delegator:</value>
|
||||
<value xml:lang="en">Delegator Name:</value>
|
||||
<value xml:lang="fr">Nom du délégateur :</value>
|
||||
<value xml:lang="it">Nome Delegator:</value>
|
||||
<value xml:lang="ja">対象デリゲータ名称:</value>
|
||||
<value xml:lang="pt">Name do Delegator:</value>
|
||||
<value xml:lang="ro">Nume Delegator:</value>
|
||||
<value xml:lang="vi">Tên Ủy quyền (delegator) Đích:</value>
|
||||
<value xml:lang="zh">目标代表名称: </value>
|
||||
<value xml:lang="zh-TW">目標代表名稱: </value>
|
||||
</property>
|
||||
<property key="WebtoolsDeleteFiles">
|
||||
<value xml:lang="de">Dateien nachher löschen?</value>
|
||||
<value xml:lang="en">Delete Files Afterwards?</value>
|
||||
@@ -2113,6 +2125,10 @@
|
||||
<value xml:lang="zh">错误:读取文件名 ${filename}:${errorString}</value>
|
||||
<value xml:lang="zh-TW">錯誤:讀取檔案名 ${filename}:${errorString}</value>
|
||||
</property>
|
||||
<property key="WebtoolsErrorDatafileLoadUrlNotEnabled">
|
||||
<value xml:lang="en">ERROR: For security reason HTTP URLs are not accepted, see OFBIZ-12304. Rather load your data from a file or set SystemProperty security.datafile.loadurls.enable = true</value>
|
||||
<value xml:lang="de">FEHLER: Aus Sicherheitsgründen wird das Laden von HTTP Urls nicht erlaubt. Laden Sie die Daten über eine Datei oder setzen Sie die SystemProperty security.datafile.loadurls.enable = true.</value>
|
||||
</property>
|
||||
<property key="WebtoolsErrorReadingTemplateFile">
|
||||
<value xml:lang="en">ERROR: reading template file ${filename}: ${errorString}</value>
|
||||
<value xml:lang="fr">ERREUR : lors de la lecture du fichier modèle ${filename}, une exception c'est levée (${errorString})</value>
|
||||
@@ -5965,6 +5981,14 @@
|
||||
<value xml:lang="zh">本页面用于导入导出的实体引擎XML文档。这些文档都有一个根标签 "<entity-engine-xml>".</value>
|
||||
<value xml:lang="zh-TW">本頁面用於匯入匯出的資料實體引擎XML檔.這些檔都有一個根標簽 "<entity-engine-xml>".</entity-engine-xml></value>
|
||||
</property>
|
||||
<property key="WebtoolsXMLImportInfoBewareTenant1">
|
||||
<value xml:lang="en">Beware, you are using tenant, import acts as the "loadAll" Gradle task that says: "Load default data; meant for OFBiz development, testing, and demo purposes".</value>
|
||||
<value xml:lang="fr">Attention, vous utilisez la fonctionnalité "tenant", l'import agit comme la tâche Gradle "loadAll" : "Charger les données par défaut ; destiné au développement, aux tests et à la démonstration OFBiz".</value>
|
||||
</property>
|
||||
<property key="WebtoolsXMLImportInfoBewareTenant2">
|
||||
<value xml:lang="en">You should use the "loadTenant" Gradle task to load tenant specific data.</value>
|
||||
<value xml:lang="fr">Vous devez utiliser la tâche Gradle "loadTenant" pour charger des données spécifiques à un tenant.</value>
|
||||
</property>
|
||||
<property key="WebtoolsYouMayCreateAnEntity">
|
||||
<value xml:lang="de">You may create an Entity ${entityName} by entering the values you want, and clicking Create.</value>
|
||||
<value xml:lang="en">You may create an Entity ${entityName} by entering the values you want, and clicking Create.</value>
|
||||
@@ -6029,4 +6053,12 @@
|
||||
<value xml:lang="de">Ermittlung der Datenstruktur fehlgeschlagen. Bitte gültige Datenquelle angeben.</value>
|
||||
<value xml:lang="en">Could not determine Structure for this datasource. Please choose a valid datasource.</value>
|
||||
</property>
|
||||
<property key="typeAndTitleDisclaimer">
|
||||
<value xml:lang="de">Bitte beachten Sie, dass die Attribute Type und Title der Referenzen nicht aus der Datenbank heraus rekonstruiert werden können.</value>
|
||||
<value xml:lang="en">Please note that the attributes Type and Title for references cannot be derived from the database.</value>
|
||||
</property>
|
||||
<property key="pleaseAddManually">
|
||||
<value xml:lang="de">Diese müssen händisch nachgepflegt werden.</value>
|
||||
<value xml:lang="en">These must be added manually.</value>
|
||||
</property>
|
||||
</resource>
|
||||
|
||||
@@ -20,6 +20,7 @@ import org.apache.ofbiz.entity.Delegator
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
import org.apache.ofbiz.entity.model.ModelEntity
|
||||
import org.apache.ofbiz.base.util.*
|
||||
import org.apache.ofbiz.security.SecuredUpload
|
||||
|
||||
import org.w3c.dom.Document
|
||||
|
||||
@@ -73,7 +74,9 @@ def shell = new GroovyShell(loader, binding, configuration)
|
||||
|
||||
if (UtilValidate.isNotEmpty(groovyProgram)) {
|
||||
try {
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidText(groovyProgram,["import"])) {
|
||||
// Check if a webshell is not uploaded but allow "import"
|
||||
if (!SecuredUpload.isValidText(groovyProgram, ["import"])) {
|
||||
logError("================== Not executed for security reason ==================")
|
||||
request.setAttribute("_ERROR_MESSAGE_", "Not executed for security reason")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -17,18 +17,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
import java.util.ArrayList
|
||||
import java.util.HashMap
|
||||
import java.util.Iterator
|
||||
import java.util.Map
|
||||
import java.sql.Timestamp
|
||||
|
||||
import org.apache.ofbiz.base.util.UtilMisc
|
||||
import org.apache.ofbiz.service.ServiceDispatcher
|
||||
import org.apache.ofbiz.service.RunningService
|
||||
import org.apache.ofbiz.service.engine.GenericEngine
|
||||
import org.apache.ofbiz.base.util.UtilHttp
|
||||
import org.apache.ofbiz.base.util.UtilProperties
|
||||
import org.apache.ofbiz.service.ServiceDispatcher
|
||||
import org.apache.ofbiz.service.engine.GenericEngine
|
||||
|
||||
uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale)
|
||||
uiLabelMap.addBottomResourceBundle("CommonUiLabels")
|
||||
@@ -46,7 +38,7 @@ log.each { rs, value ->
|
||||
serviceList.add(service)
|
||||
}
|
||||
sortField = parameters.sortField
|
||||
if (sortField) {
|
||||
if (sortField) {
|
||||
context.services = UtilMisc.sortMaps(serviceList, UtilMisc.toList(sortField))
|
||||
} else {
|
||||
context.services = serviceList
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -84,6 +84,7 @@ import org.apache.ofbiz.entity.util.EntityDataLoader;
|
||||
import org.apache.ofbiz.entity.util.EntityListIterator;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.entity.util.EntitySaxReader;
|
||||
import org.apache.ofbiz.entity.util.EntityUtilProperties;
|
||||
import org.apache.ofbiz.entityext.EntityGroupUtil;
|
||||
import org.apache.ofbiz.security.Security;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
@@ -108,6 +109,7 @@ public class WebToolsServices {
|
||||
public static Map<String, Object> entityImport(DispatchContext dctx, Map<String, ? extends Object> context) {
|
||||
GenericValue userLogin = (GenericValue) context.get("userLogin");
|
||||
LocalDispatcher dispatcher = dctx.getDispatcher();
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
List<String> messages = new LinkedList<String>();
|
||||
|
||||
@@ -143,10 +145,11 @@ public class WebToolsServices {
|
||||
// #############################
|
||||
// FM Template
|
||||
// #############################
|
||||
if (UtilValidate.urlInString(fulltext)) {
|
||||
if (UtilValidate.urlInString(fulltext)
|
||||
&& !"true".equals(EntityUtilProperties.getPropertyValue("security", "security.datafile.loadurls.enable", "false", delegator))) {
|
||||
Debug.logError("For security reason HTTP URLs are not accepted, see OFBIZ-12304", module);
|
||||
Debug.logInfo("Rather load your data from a file", module);
|
||||
return null;
|
||||
Debug.logInfo("Rather load your data from a file or set SystemProperty security.datafile.loadurls.enable = true", module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "WebtoolsErrorDatafileLoadUrlNotEnabled", locale));
|
||||
}
|
||||
if (UtilValidate.isNotEmpty(fmfilename) && (UtilValidate.isNotEmpty(fulltext) || url != null)) {
|
||||
File fmFile = new File(fmfilename);
|
||||
|
||||
@@ -19,6 +19,11 @@ under the License.
|
||||
|
||||
<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
|
||||
<#assign tenantUsed = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "multitenant", "N", delegator)>
|
||||
<#if tenantUsed=="Y">
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant1}</p>
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant2}</p>
|
||||
</#if>
|
||||
<hr />
|
||||
|
||||
<form class="basic-form" method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
|
||||
|
||||
@@ -19,6 +19,11 @@ under the License.
|
||||
|
||||
<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
|
||||
<#assign tenantUsed = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "multitenant", "N", delegator)>
|
||||
<#if tenantUsed=="Y">
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant1}</p>
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant2}</p>
|
||||
</#if>
|
||||
<hr />
|
||||
|
||||
<form class="basic-form" method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
|
||||
|
||||
@@ -19,6 +19,11 @@ under the License.
|
||||
|
||||
<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
|
||||
<#assign tenantUsed = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "multitenant", "N", delegator)>
|
||||
<#if tenantUsed=="Y">
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant1}</p>
|
||||
<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant2}</p>
|
||||
</#if>
|
||||
<hr />
|
||||
<form class="basic-form" method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
|
||||
<table class="basic-table" cellspacing="0">
|
||||
|
||||
@@ -54,6 +54,9 @@ under the License.
|
||||
</table>
|
||||
</form>
|
||||
</hr>
|
||||
<div>${uiLabelMap.typeAndTitleDisclaimer}</div>
|
||||
<div>${uiLabelMap.pleaseAddManually}</div>
|
||||
</hr>
|
||||
<div>
|
||||
<textarea cols="60" rows="50" name="${uiLabelMap.ModelInduceInducedText}">${inducedText!}</textarea>
|
||||
</div>
|
||||
|
||||
@@ -944,11 +944,6 @@ under the License.
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="placeholder" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>Specifies a short hint that describes the expected value of an input field.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="display" substitutionGroup="AllFields">
|
||||
|
||||
+3
@@ -673,6 +673,9 @@ public class ModelFormFieldBuilder {
|
||||
} else if ("display".equals(defaultFieldType)) {
|
||||
ModelFormField.DisplayField displayField = new ModelFormField.DisplayField(FieldInfo.SOURCE_AUTO_SERVICE, null);
|
||||
this.setFieldInfo(displayField);
|
||||
} else if ("hidden".equals(defaultFieldType)) {
|
||||
ModelFormField.HiddenField hiddenField = new ModelFormField.HiddenField(FieldInfo.SOURCE_AUTO_SERVICE, null);
|
||||
this.setFieldInfo(hiddenField);
|
||||
} else {
|
||||
// default to "edit"
|
||||
if (modelParam.type.indexOf("Double") != -1 || modelParam.type.indexOf("Float") != -1
|
||||
|
||||
+13
-6
@@ -460,7 +460,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
}
|
||||
}
|
||||
//check for required field style on single forms
|
||||
if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) {
|
||||
if (shouldApplyRequiredField(modelFormField)) {
|
||||
String requiredStyle = modelFormField.getRequiredFieldStyle();
|
||||
if (UtilValidate.isEmpty(requiredStyle)) {
|
||||
requiredStyle = "required";
|
||||
@@ -529,6 +529,13 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
this.appendTooltip(writer, context, modelFormField);
|
||||
}
|
||||
|
||||
private boolean shouldApplyRequiredField(ModelFormField modelFormField) {
|
||||
return ("single".equals(modelFormField.getModelForm().getType()) ||
|
||||
"upload".equals(modelFormField.getModelForm().getType()))
|
||||
&& modelFormField.getRequiredField();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderDateTimeField(Appendable writer, Map<String, Object> context, DateTimeField dateTimeField) throws IOException {
|
||||
ModelFormField modelFormField = dateTimeField.getModelFormField();
|
||||
String paramName = modelFormField.getParameterName(context);
|
||||
@@ -681,7 +688,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
}
|
||||
}
|
||||
//check for required field style on single forms
|
||||
if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) {
|
||||
if (shouldApplyRequiredField(modelFormField)) {
|
||||
String requiredStyle = modelFormField.getRequiredFieldStyle();
|
||||
if (UtilValidate.isEmpty(requiredStyle)) {
|
||||
requiredStyle = "required";
|
||||
@@ -817,7 +824,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
}
|
||||
}
|
||||
//check for required field style on single forms
|
||||
if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) {
|
||||
if (shouldApplyRequiredField(modelFormField)) {
|
||||
String requiredStyle = modelFormField.getRequiredFieldStyle();
|
||||
if (UtilValidate.isEmpty(requiredStyle)) {
|
||||
requiredStyle = "required";
|
||||
@@ -1339,7 +1346,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
}
|
||||
if (!sb.toString().isEmpty()) {
|
||||
//check for required field style on single forms
|
||||
if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) {
|
||||
if (shouldApplyRequiredField(modelFormField)) {
|
||||
String requiredStyle = modelFormField.getRequiredFieldStyle();
|
||||
if (UtilValidate.isNotEmpty(requiredStyle)) {
|
||||
style = requiredStyle;
|
||||
@@ -2145,7 +2152,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
}
|
||||
}
|
||||
//check for required field style on single forms
|
||||
if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) {
|
||||
if (shouldApplyRequiredField(modelFormField)) {
|
||||
String requiredStyle = modelFormField.getRequiredFieldStyle();
|
||||
if (UtilValidate.isEmpty(requiredStyle)) {
|
||||
requiredStyle = "required";
|
||||
@@ -2634,7 +2641,7 @@ public final class MacroFormRenderer implements FormStringRenderer {
|
||||
}
|
||||
|
||||
//check for required field style on single forms
|
||||
if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) {
|
||||
if (shouldApplyRequiredField(modelFormField)) {
|
||||
String requiredStyle = modelFormField.getRequiredFieldStyle();
|
||||
if (UtilValidate.isEmpty(requiredStyle)) {
|
||||
requiredStyle = "required";
|
||||
|
||||
+4
-1
@@ -17,4 +17,7 @@
|
||||
# under the License.
|
||||
###############################################################################
|
||||
|
||||
org.gradle.console=plain
|
||||
org.gradle.console=plain
|
||||
# If you experience heap memory problems during the Gradle build, for example
|
||||
# building with integrated plugins, the following setting might help
|
||||
#org.gradle.jvmargs=-Xms128m -Xmx1024m -XX:+CMSClassUnloadingEnabled
|
||||
|
||||
@@ -23,4 +23,4 @@ if exist "%~dp0gradle\wrapper\gradle-wrapper.jar" (
|
||||
exit /b
|
||||
)
|
||||
|
||||
pwsh -command " Start-Process pwsh -Verb RunAs \""-Command `\""cd '%cd%'; & 'gradle\init-gradle-wrapper.ps1';`\""\"" "
|
||||
pwsh -command " Start-Process pwsh -Verb RunAs \""-Command `\""cd '%cd%'; & 'gradle\init-gradle-wrapper.ps1';`\""\"" "
|
||||
|
||||
+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/)
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
To put your patches, related with the build-dev ant target
|
||||
@@ -31,7 +31,6 @@ under the License.
|
||||
<!-- web applications -->
|
||||
<webapp name="common-theme"
|
||||
title="common theme"
|
||||
menu-name="secondary"
|
||||
server="default-server"
|
||||
location="webapp/common"
|
||||
mount-point="/common"
|
||||
|
||||
@@ -28,7 +28,7 @@ under the License.
|
||||
<img src="${imageLocation}" alt=""><#lt/>
|
||||
<#else>
|
||||
<#if inPlaceEditorUrl?has_content || class?has_content || alert=="true" || title?has_content>
|
||||
<span data-inplace-editor-url="${inPlaceEditorUrl}" data-inplace-editor-params="${inPlaceEditorParams}" <#if idName?has_content>id="cc_${idName}"</#if> <#if title?has_content>title="${title}"</#if> <@renderClass class alert />><#t/>
|
||||
<span <#if inPlaceEditorUrl?has_content>data-inplace-editor-url="${inPlaceEditorUrl}" data-inplace-editor-params="${inPlaceEditorParams}"</#if> <#if idName?has_content>id="cc_${idName}"</#if> <#if title?has_content>title="${title}"</#if> <@renderClass class alert />><#t/>
|
||||
</#if>
|
||||
|
||||
<#if description?has_content>
|
||||
@@ -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>
|
||||
|
||||
@@ -32,9 +32,9 @@ under the License.
|
||||
<#macro renderSectionEnd boundaryComment>
|
||||
</#macro>
|
||||
|
||||
<#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval>
|
||||
<#macro renderContainerBegin id style type autoUpdateLink autoUpdateInterval>
|
||||
</#macro>
|
||||
<#macro renderContainerEnd></#macro>
|
||||
<#macro renderContainerEnd type></#macro>
|
||||
<#macro renderContentBegin editRequest enableEditValue editContainerStyle></#macro>
|
||||
<#macro renderContentBody></#macro>
|
||||
<#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
|
||||
@@ -57,4 +57,9 @@ under the License.
|
||||
<#macro renderScreenletSubWidget></#macro>
|
||||
<#macro renderScreenletEnd></#macro>
|
||||
<#macro renderScreenletPaginateMenu lowIndex actualPageSize ofLabel listSize paginateLastStyle lastLinkUrl paginateLastLabel paginateNextStyle nextLinkUrl paginateNextLabel paginatePreviousStyle paginatePreviousLabel previousLinkUrl paginateFirstStyle paginateFirstLabel firstLinkUrl>
|
||||
</#macro>
|
||||
</#macro>
|
||||
|
||||
<#macro renderColumnContainerBegin id style></#macro>
|
||||
<#macro renderColumnContainerEnd></#macro>
|
||||
<#macro renderColumnBegin id style></#macro>
|
||||
<#macro renderColumnEnd></#macro>
|
||||
@@ -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