Author SHA1 Message Date
Deepak Dixit 8a4a68e9f9 Fixed: Used the jdk 8 compatible version for gradle-svntools-plugin
(OFBIZ-11601)
build.grale using latest.release of gradle-svntools-plugin, and gradle-svntools-plugin release its latest release on 19th with jdk11 compatible. So this is causing build failure
2020-04-20 11:37:27 +05:30
Jacques Le Roux 4b43b0c639 Fixed: Error removing an uploaded party content
(OFBIZ-11597)

When you try to remove an uploaded party content you get this error:

ControlServlet                |E| Error in request handler:
org.apache.ofbiz.webapp.control.RequestHandlerException:
Unknown request [removePartyContent/viewprofile];
this request does not exist or cannot be called directly.

While at it I also fixed the similar case for payment methods
2020-04-17 17:33:24 +02:00
Jacques Le Roux 9f5ebc48fd Fixed: Error in uploading very large files, ie >2MB
(OFBIZ-11534)

This was not supposed to be committed, actually (wrong) part of OFBIZ-11597

Fixed: Error in uploading very large files, ie >2MB

(OFBIZ-11534)

There is an issue in uploading large files, I am able to upload files up to 2 GB
successfully but getting an error when trying to upload a file larger than 2GB.

Example -
1. Go to party profile -
https://demo-trunk.ofbiz.apache.org/partymgr/control/viewprofile?partyId=admin
2. Try to create a party content with a file larger than 2 GB
3. Error on console

jleroux:
For a 2GB+ file you need to set Xmx to more than the double of the file size,
eg: gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx5048M"

You then get another small issue (only in log) when redirecting to send the
partyId parameter.

This is because, DiskFileItem is a temporary Object with a null value contained
in "fileItems" attribute. It can't be detected by UtilMisc::makeMapSerializable
and that makes "fileItems" not serializable. So it must be removed from
reqAttrMap.

Thanks: Chandan Khandelwal for report, Michael for suggesting a very large file
to upload
2020-04-16 16:16:14 +02:00
Jacques Le Roux 9530d4b441 Documented: Adds the CSRF defense documentation (missed the add last time) 2020-04-15 19:44:03 +02:00
Jacques Le Roux 242e62d6f3 Documented: Adds the CSRF defense documentation 2020-04-15 19:44:01 +02:00
Jacques Le Roux 1e8ffb4906 Improved: Adds the download-the-gradle-wrapper section 2020-04-07 15:29:55 +02:00
Jacques Le Roux b14516202d Improved: Removes deprecated README.md file 2020-04-07 12:24:40 +02:00
Ulrich Heidfeld 5b5029312a Improved: Decodes AjaxAutocompleteOptions return value
(OFBIZ-11475)
2020-04-05 14:01:16 +02:00
Jacques Le Roux 42ad34f0b6 Fixed: removes a wrong import due to CSRF token backport trying 2020-04-05 12:02:06 +02:00
Jacques Le Roux 793628bb15 Fixed: Prevent Host Header Injection (CVE-2019-12425)
(OFBIZ-11583)

Conflicts handled by hand
  framework/security/config/security.properties
  framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
2020-04-05 11:40:48 +02:00
Jacques Le Roux 84e102a6a1 Revert "Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk"
This reverts commit 27e57522b1.
2020-04-05 10:05:16 +02:00
Jacques Le Roux 27e57522b1 Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk
Because of GitHub message on PR56:
This branch cannot be rebased due to conflicts

Much Conflicts, but that should be OK
2020-04-04 18:41:14 +02:00
Jacques Le Roux cf936d6c5e Fixed: The createTaskContent request does not work
(OFBIZ-11246)

It seems that same request can not be parsed multiple times if it has multi part
object in it as the parse method remove it after that.

Found one stackoverflow link around the same:

https://stackoverflow.com/questions/13881272/
servletfileuploadparserequestrequest-returns-an-empty-list

I believe that all places/uploads using this workflow should resulting the same
issue.

One possible solution I could think of without going with new approach is to set
list of file Items into the request attribute and use it if parse method remove
it and unable to retrieve on 2nd call.

Thanks: Ankush Upadhyay for the analysis and initial patch. I only slightly
modified it.
2020-03-27 11:09:36 +01:00
Jacques Le Roux 7e03082d92 Improved: Improve Web Content Caching
(OFBIZ-11477)

According to OWASP OFBiz Web Content Caching is weak:

Independently of the cache policy defined by the web application, if caching web
application contents is allowed, the session IDs must never be cached, so it is
highly recommended to use the Cache-Control: no-cache="Set-Cookie, Set-Cookie2"
directive, to allow web clients to cache everything except the session ID

I though noticed that Set-Cookie2 is deprecated for a long time now. And we new
browsers policies it to often updated. So no need to use Set-Cookie2.
2020-03-27 10:11:53 +01:00
Jacques Le Roux 1617226897 Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

It's better to allow users to change from strict to lax, at least for all
cookies. Some could want to change it by cookie type. I let the exercise for
them :)
See:https://blog.mozilla.org/security/2018/04/24/same-site-cookies-in-firefox-60

Conflicts handled by hand
	framework/security/config/security.properties
2020-03-21 11:59:46 +01:00
Jacques Le Roux bb26cc1c62 Improved: no functional change
Adds "Content-Security-Policy" frame-ancestors="self" in ErrorPage.ftl
Because this page is used as a HTTP 500 error it's more susceptible to
clickjacking

Quoting OWASP ZAP:
This problem still applies to error-type pages (401, 403, 500, etc.), as these
pages are still often affected by injection problems, in which case it is still
possible that browsers may interpret pages differently from their actual content
type.

I tried to work on other file types that were also reported but it's complicated
adn I believe it's not worth it
2020-03-20 20:21:27 +01:00
Jacques Le Roux 09270a1c34 Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

Forgot to add UtilHttp::SameSiteFilter
2020-03-20 18:05:39 +01:00
Jacques Le Roux 82ef7a5871 Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

As reported by OWASP ZAP:
A cookie has been set without the SameSite attribute, which means that the
cookie can be sent as a result of a 'cross-site' request. The SameSite attribute
is an effective counter measure to cross-site request forgery, cross-site script
inclusion, and timing attacks.

The solution was not obvious in OFBiz for 2 reasons:

1. There is no HttpServletResponse::setHeader. So we need to use a filter
  (SameSiteFilter) and even that is not enough because of 2:
2. To prevent session fixation we force Tomcat to generates a new jsessionId,
ultimately put in cookie, in LoginWorker::login. So we need to add a call to
SameSiteFilter::addSameSiteCookieAttribute in
UtilHttp::setResponseBrowserDefaultSecurityHeaders.
2020-03-20 17:52:21 +01:00
Jacques Le Roux a16271e5c3 Improved: no functional change
Follows the "How to apply the Apache License to your work" section at
https://www.apache.org/licenses/LICENSE-2.0

Removes the references to products only used in plugins
2020-03-14 12:36:49 +01:00
Dennis Balkir 0c7be39acb Fixed: Potential Nullpointer in ErrorPage.ftl
(OFBIZ-11448)

Inserted nullcheck for request-attribute
2020-03-10 16:04:52 +01:00
Daniel Watford 0355006c62 Improved: Add 2020 version of Incoterms
(OFBIZ-11437)

Alter the parent type and descriptions of existing Incoterm TermTypes to
indicate the version of Incoterms they relate to.

Added new Incoterm TermTypes and descriptions correspoding to the
Incoterms 2020 set.

Conflicts handled by hand:
	applications/datamodel/data/seed/PartySeedData.xml
	applications/party/config/PartyEntityLabels.xml
2020-03-06 08:48:13 +01:00
Jacques Le Roux b571234062 Fixed: createMissingCategoryAndProductAltUrls service misses a transaction
(OFBIZ-11441)

Not sure why it had use-transaction="false", makes no sens to me, too old to
check, not a big deal I guess
2020-03-05 10:17:10 +01:00
Jacques Le Roux 3d9b551d65 Merge pull request #42 from danwatford/ofbiz-11437-2020-incoterms-improvement
OFBIZ-11437: Improved: Added 2020 version of Incoterms
(cherry picked from commit 7a34e9cda8)
2020-03-04 15:10:23 +01:00
37 changed files with 524 additions and 1003 deletions
+11 -53
View File
@@ -186,24 +186,19 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2001-2008 The Apache Software Foundation
Copyright [yyyy] [name of copyright owner]
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
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
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.
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.
=========================================================================
@@ -219,42 +214,5 @@ For details, see themes/common/webapp/common/js/plugins/date/timezones.
=========================================================================
This product bundles "Date Format 1.2.3", which is available
under the "MIT" license.
under the "MIT" license.
For details, see themes/common/webapp/common/js/plugins/date/date.format-1.2.3*
=========================================================================
This product bundles "jQuery" and "jQuery" plugins and extensions, which are available
under the "MIT" license. For details, see:
themes/common/webapp/common/js/jquery
plugins/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
plugins/webpos/webapp/webpos/images/js/WebPosHotkeys.js
=========================================================================
This product bundles files from the "Birt" technology platform (www.eclipse.org/birt/)
which are available under the "Eclipse Public License - v 1.0".
For details, see plugins/birt/webapp/birt/webcontent/birt/
=========================================================================
This product bundles "Webhelp for DocBook", which is available
under the "MIT" License. For details, see plugins/cmssite/template/docbook/webhelp/
=========================================================================
This product bundles "DocBook XSL Stylesheets 1.77.1", which is available
under the "MIT" license.
For details, see plugins/cmssite/template/docbook/
=========================================================================
This product bundles "Openlayers", which is available
under the "FreeBSD" license.
For details, see themes/common/webapp/images/OpenLayers-2.13.1-modified-for-CSP-.js
=========================================================================
This product bundles "Bootstrap", which is available
under the "MIT" license.
For details, see:
plugins/ecommerce/webapp/ecommerce/js
plugins/ecommerce/webapp/ecommerce/css
+7
View File
@@ -69,6 +69,13 @@ https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know
To quickly install and fire-up OFBiz, please follow the below instructions from
the command line at the OFBiz top level directory (folder).
[[download-the-gradle-wrapper]]
=== Download the Gradle wrapper:
MS Windows: `init-gradle-wrapper`
Unix-like OS: `./gradle/init-gradle-wrapper`
[[prepare-ofbiz]]
=== Prepare OFBiz:
-760
View File
@@ -1,760 +0,0 @@
<!--
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.
-->
Apache OFBiz®
=============
Welcome to __Apache OFBiz__! A powerful top level Apache software project.
OFBiz is an Enterprise Resource Planning (ERP) System written in Java and
houses a large set of libraries, entities, services and features to run
all aspects of your business.
For more details about OFBiz please visit the OFBiz Documentation page:
[OFBiz documentation](http://ofbiz.apache.org/documentation.html)
[OFBiz License](http://www.apache.org/licenses/LICENSE-2.0)
>_Note_: If you want to use Eclipse, read the "Setup eclipse project for OFBiz"
section to set it up.
>_Note_: If you want to use an external database like MySQL or PostgreSQL, read
the "Setup an external database" section to set it up.
>_Note_: If you want to run OFBiz without an internet connection, read the
"Running gradle tasks without an internet connection" section.
>_Note_: The directory structure and repositories have changed. For more
information read the "Repository and directory structure" section.
System requirements
-------------------
The only requirement 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) which
you can download from the below link. Make sure of setting the $JAVA_HOME
environment variable.
[JDK download](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
Quick start
-----------
To quickly install and fire-up OFBiz, please follow the below instructions
from the command line at the OFBiz top level directory (folder)
In case of problems visit our [Further reading section](#further-reading)
### Prepare OFBiz:
>_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 to download all dependencies. So please be patient!
MS Windows:
`gradlew cleanAll loadAll`
Unix-like OS:
`./gradlew cleanAll loadAll`
### Start OFBiz:
MS Windows:
`gradlew ofbiz`
Unix-like OS:
`./gradlew ofbiz`
>_Note_: Ignore the % progress indicator because this task does not end as
long as OFBiz is running.
### Visit OFBiz through your browser:
[Order Back Office](https://localhost:8443/ordermgr)
[Accounting Back Office](https://localhost:8443/accounting)
[Administrator interface](https://localhost:8443/webtools)
You can log in with the user __admin__ and password __ofbiz__.
Security
--------
If you find a security issue, please report it to: security @ ofbiz.apache.org.
Once proper mitigations to the security issues are complete the OFBiz team will
disclose this information to the public mailing list.
You can find more information about security in OFBiz at
[Keeping OFBiz secure](https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure)
* * * * * * * * * * * *
Build system syntax
-------------------
All build tasks are executed using the __Gradle__ build system which
is embedded in OFBiz. To execute build tasks go to OFBiz top-level
directory (folder) and execute tasks from there.
### Operating System Syntax
The syntax for tasks differ slightly between windows and Unix-like systems
- __Windows__: `gradlew <tasks-in-here>`
- __Unix-like__: `./gradlew <tasks-in-here>`
For the rest of this document, we will use the windows syntax, if you are on
a Unix-like system, you need to add the `./` to gradlew
### Types of tasks in Gradle
There are two types of tasks designed for OFBiz in Gradle:
- __Standard tasks__: To execute general standard Gradle tasks
- __OFBiz server tasks__: To execute OFBiz startup commands. These
tasks start with one of the following words:
- __ofbiz__ : standard server commands
- __ofbizDebug__ : server commands running in remote debug mode
- __ofbizBackground__ ; server commands running in a background forked process
Tips:
- OFBiz __server commands__ require __"quoting"__ the
commands. For example: `gradlew "ofbiz --help"`
- Shortcuts to task names can be used by writing the
first letter of every word in a task name. However, you
cannot use the shortcut form for OFBiz server tasks.
Example: `gradlew loadAdminUserLogin -PuserLoginId=myadmin` = `gradlew lAUL -PuserLoginId=myadmin`
- Dependent tasks can be skipped with the -x switch.
Example: `gradlew build -x test` does not run the tests within the build.
#### Example standard tasks
`gradlew build`
`gradlew cleanAll loadAll testIntegration`
#### Example OFBiz server tasks
`gradlew "ofbiz --help"`
`gradlew "ofbizDebug --test"`
`gradlew "ofbizBackground --start --portoffset 10000"`
`gradlew "ofbiz --shutdown --portoffset 10000"`
`gradlew ofbiz` (default is --start)
#### Example mixed tasks (standard and OFBiz server)
`gradlew cleanAll loadAll "ofbiz --start --portoffset 10000"`
* * * * * * * * * * * *
Quick reference
---------------
You can use the below common list of tasks as a quick reference
for controlling the system. This document uses the windows task
syntax, if you are on a Unix-like system, you need to add the
`./` to gradlew i.e. `./gradlew`
* * * * * * * * * * * *
### Help tasks
#### List OFBiz server commands
List all available commands to control the OFBiz server
`gradlew "ofbiz --help"`
#### List build tasks
List all available tasks from the build system
`gradlew tasks`
#### List build projects
List all available projects in the build system
`gradlew projects`
#### Gradle build system help
Show usage and options for the Gradle build system
`gradlew --help`
* * * * * * * * * * * *
### Server command tasks
#### Start OFBiz
`gradlew "ofbiz --start"`
start is the default server task so this also works:
`gradlew ofbiz`
#### Shutdown OFBiz
`gradlew "ofbiz --shutdown"`
#### Get OFBiz status
`gradlew "ofbiz --status"`
#### Force OFBiz shutdown
Terminate all running OFBiz server instances by calling
the appropriate operating system kill command. Use this
command to force OFBiz termination if the --shutdown
command does not work. Usually this is needed when in the
middle of data loading or testing in OFBiz.
Warning: Be careful in using this command as force termination
might lead to inconsistent state / data
`gradlew terminateOfbiz`
#### Start OFBiz in remote debug mode
Starts OFBiz in remote debug mode and waits for debugger
or IDEs to connect on port __5005__
`gradlew "ofbizDebug --start"`
OR
`gradlew ofbizDebug`
#### Start OFBiz on a different port
Start OFBiz of the network port offsetted by the range
provided in the argument to --portoffset
`gradlew "ofbiz --start --portoffset 10000"`
#### Start OFBiz in the background
Start OFBiz in the background by forking it to a new
process and redirecting the output to __runtime/logs/console.log__
`gradlew "ofbizBackground --start"`
OR
`gradlew ofbizBackground`
You can also offset the port, for example:
`gradlew "ofbizBackground --start --portoffset 10000"`
#### Passing JVM runtime options to OFBiz
You can pass JVM runtime options by specifying the project property `-PjvmArgs`.
`gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx2048M" -Dsome.parameter=hello`
If you do not specify `jvmArgs`, a default of `-Xms128M -Xmx1024M` is set.
* * * * * * * * * * * *
### Data loading tasks
OFBiz contains the following data reader types:
- __seed__: OFBiz and External Seed Data - to be maintained along with source and
updated whenever a system deployment is updated
- __seed-initial__: OFBiz and External Seed Data - to be maintained along with
source like other seed data, but only loaded initially and not updated
when a system is updated except manually reviewing each line
- __demo__: OFBiz Only Demo Data
- __ext__: External General Data (custom)
- __ext-test__: External Test Data (custom)
- __ext-demo__: External Demo Data (custom)
- __tenant__: Data to load into the master tenants database "ofbiztenant". This
data is required to identify where a tenant's database is located. For more
information you can review the relevant
[tenant documentation](https://cwiki.apache.org/confluence/display/OFBIZ/Multitenancy+support)
Available options for the --load-data server command are the following:
- **readers=[name]**: only load data from certain readers separated by comma.
e.g. seed,seed-initial,ext
- **file=[path]**: load a single file from location or several files separated
by commas. e.g. /my/file/1,/my/file/2
- **dir=[path]**: load all data files found in directory
- **component=[name]**: only load data from a specific component. e.g. base
- **delegator=[name]**: use the defined delegator. Default is "default". If the
value passed is **"all-tenants"** then OFBiz will load the data for all defined
tenants in the system.
- **group=[name]**: override the entity group (org.apache.ofbiz).
e.g. com.example.something
- **timeout=[millis]**: timeout in milliseconds
- **create-pks**: create primary keys
- **drop-pks**: drop primary keys
- **create-constraints**: create indexes and foreign keys after loading
- **drop-constraints**: drop indexes and foreign keys before loading
- **create-fks**: create dummy (placeholder) foreign keys
- **maintain-txs**: maintain timestamps in data file
- **try-inserts**: use mostly inserts
- **repair-columns**: repair column sizes
(default is true w/ drop-constraints)
- **continue-on-failure**: By default OFBiz will fail and stop if it is unable
to load any of the files it is attempting to load. By passing this property
OFBiz will ignore failures and continue loading all files
#### Load specific OFBiz data
you can choose which data readers to pass in the following syntax:
`gradlew "ofbiz --load-data readers=<readers-here-comma-separated>"`
Example:
`gradlew "ofbiz --load-data readers=seed,seed-initial,ext,ext-demo"`
<span style="color:red">
Beware that copying this command in Microsoft Word will automatically transform the double dash in en dashes (Unicode 0x2013: –)
Other cases not related to Word were also reported.So when this command does not work check that you are using dash!
text</span>
#### Load all OFBiz data
Loads all data sets; meant for initial loading of generic OFBiz data.
Can be applied for development, testing, demonstration, etc. purposes.
Be aware that executing this task can result in your data being overwritten
in your database of choice. Use with caution in production environments.
`gradlew loadAll`
OR
`gradlew "ofbiz --load-data"`
#### Load seed data
Load ONLY the seed data (not seed-initial, demo, ext* or anything else);
meant for use after an update of the code to reload the seed data
as it is generally maintained along with the code and needs to be
in sync for operation
`gradlew "ofbiz --load-data readers=seed"`
#### load ext data
Load seed, seed-initial and ext data; meant for manual/generic
testing, development, or going into production with a derived
system based on stock OFBiz where the ext data basically
replaces the demo data
`gradlew "ofbiz --load-data readers=seed,seed-initial,ext"`
#### load ext test data
Load seed, seed-initial, ext and ext-test data; meant for
automated testing with a derived system based on stock OFBiz
`gradlew "ofbiz --load-data readers=seed,seed-initial,ext,ext-test"`
#### load data from an entity file
Load data from an XML file holding entity data.
`gradlew "ofbiz --load-data file=foo/bar/FileNameHere.xml"`
#### create a new tenant
Create a new tenant in your environment, create the delegator, load
initial data with admin-user and password (needs multitenant=Y in
general.properties). The following project parameters are passed:
- tenantId: mandatory
- tenantName: optional, default is value of tenantId
- domainName: optional, default is org.apache.ofbiz
- tenantReaders: optional, default value is seed,seed-initial,demo
- dbPlatform: optional, D(Derby), M(MySQL), O(Oracle), P(PostgreSQL) (default D)
- dbIp: optional, ip address of the database
- dbUser: optional, username of the database
- dbPassword: optional, password of the database
`gradlew createTenant -PtenantId=mytenant`
`gradlew createTenant -PtenantId=mytenant -PtenantName="My Name" -PdomainName=com.example -PtenantReaders=seed,seed-initial,ext -PdbPlatform=M -PdbIp=127.0.0.1 -PdbUser=mydbuser -PdbPassword=mydbpass`
If run successfully, the system creates a new tenant having:
- delegator: default#${tenandId} (e.g. default#mytenant)
- admin user: ${tenantId}-admin (e.g. mytenant-admin)
- admin user password: ofbiz
#### load data for a specific tenant
Load data for one specific tenant in a multitenant environment. Note
that you must set multitenant=Y in general.properties and the
following project parameters are passed:
- tenantId (mandatory)
- tenantReaders (optional)
- tenantComponent (optional)
`gradlew loadTenant -PtenantId=mytenant`
`gradlew loadTenant -PtenantId=mytenant -PtenantReaders=seed,seed-initial,demo -PtenantComponent=base`
* * * * * * * * * * * *
### Testing tasks
#### Execute all unit tests
`gradlew test`
#### Execute all integration tests
`gradlew testIntegration`
OR
`gradlew 'ofbiz --test'`
#### Execute integration tests with a different log level
It is possible to start integration tests with a log level different from the
default one. The log levels allowed are listed below from most verbose to
least verbose:
- always
- verbose
- timing
- info
- important
- warning
- error
- fatal
`gradlew "ofbiz --test loglevel=fatal"`
#### Execute an integration test case
run a test case, in this example the component is "entity" and the case
name is "entity-tests"
`gradlew "ofbiz --test component=entity --test suitename=entitytests --test case=entity-query-tests"`
#### Execute an integration test case in debug mode with verbose log
listens on port __5005__
`gradlew "ofbizDebug --test component=entity --test loglevel=verbose"`
#### Execute an integration test suite
`gradlew "ofbiz --test component=entity --test suitename=entitytests"`
#### Execute an integration test suite in debug mode
listens on port __5005__
`gradlew "ofbizDebug --test component=entity --test suitename=entitytests"`
* * * * * * * * * * * *
### Miscellaneous tasks
#### Run all tests on a clean system
`gradlew cleanAll loadAll testIntegration`
#### Clean all generated artifacts
`gradlew cleanAll`
#### Refresh the generated artifacts
`gradlew clean build`
#### Create an admin user account
Create an admin user with login name MyUserName and default password
with value "ofbiz". Upon first login OFBiz will request changing the
default password
`gradlew loadAdminUserLogin -PuserLoginId=MyUserName`
#### Compile Java using Xlint output
Xlint prints output of all warnings detected by the compiler
`gradlew -PXlint build`
#### Run OWASP tool to identify dependency vulnerabilities (CVEs)
The below command activates a gradle plugin (OWASP) and Identifies
and reports known vulnerabilities (CVEs) in OFBiz library dependencies.
The task takes time to complete, and once done, a report will be generated in
$OFBIZ_HOME/build/reports/dependency-check-report.html
`gradlew -PenableOwasp dependencyCheckAnalyze`
#### Setup eclipse project for OFBiz
Setting up OFBiz on eclipse is done by simply running the below command
and then importing the project to eclipse. This command will generate
the necessary __.classpath__ and __.project__ files for eclipse and it
will also make the source code for external libraries available in
eclipse (i.e. you can view source through Ctrl + Click)
The first time you run this command it will take a long time to execute
because it will download source packages available for project
dependencies.
`gradlew eclipse`
* * * * * * * * * * *
OFBiz plugin system
-------------------
OFBiz provides an extension mechanism through plugins. Plugins are standard
OFBiz components that reside in the plugins directory. Plugins can be
added manually or fetched from a maven repository. The standard tasks for
managing plugins are listed below.
>_Note_: OFBiz plugin versions follow [Semantic Versioning 2.0.0](http://semver.org/)
### Pull (download and install) a plugin automatically
Download a plugin with all its dependencies (plugins) and install them one-by-one
starting with the dependencies and ending with the plugin itself.
`gradlew pullPlugin -PdependencyId="org.apache.ofbiz.plugin:myplugin:0.1.0"`
If the plugin resides in a custom maven repository (not jcenter or localhost) then
you can use specify the repository using below command:
`gradlew pullPlugin -PrepoUrl="http://www.example.com/custom-maven" -PdependencyId="org.apache.ofbiz.plugin:myplugin:0.1.0"`
If you need username and password to access the custom repository:
`gradlew pullPlugin -PrepoUrl="http://www.example.com/custom-maven" -PrepoUser=myuser -PrepoPassword=mypassword -PdependencyId="org.apache.ofbiz.plugin:myplugin:0.1.0"`
### 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.
This task is mostly useful when working on the trunk branch
as it pulls in the 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
Download all officially supported plugins from source control (currently subversion)
and place them inclusive of their ".svn" directory in /plugins. WARNING! This task
deletes the /plugins directory and replaces it with the official plugins.
`gradlew pullAllPluginsSource`
This task makes it easy to download and develop officially supported plugins. It is
mostly used by developers or individuals working on the trunk branch. We do 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
If you have a plugin called mycustomplugin and want to install it in OFBiz follow the
below instructions:
- Extract the plugin if it is compressed
- Place the extracted directory into /plugins
- Run the below command
`gradlew installPlugin -PpluginId=myplugin`
The above commands executes the task "install" in the plugin's build.gradle
file if it exists
### Uninstall a plugin
If you have an existing plugin called mycustomplugin and you wish to uninstall
run the below command
`gradlew uninstallPlugin -PpluginId=myplugin`
The above command executes the task "uninstall" in the plugin's build.gradle
file if it exists
### Remove a plugin
Calls __uninstallPlugin__ on an existing plugin and then delete it from the file-system
`gradlew removePlugin -PpluginId=myplugin`
### Create a new plugin
Create a new plugin. The following project parameters are passed:
- pluginId: mandatory
- pluginResourceName: optional, default is the Capitalized value of pluginId
- webappName: optional, default is the value of pluginId
- basePermission: optional, default is the UPPERCASE value of pluginId
`gradlew createPlugin -PpluginId=myplugin`
`gradlew createPlugin -PpluginId=myplugin -PpluginResourceName=MyPlugin -PwebappName=mypluginweb -PbasePermission=MYSECURITY`
The above command creates a new plugin in /plugins/myplugin
### Push a plugin to a repository
This task publishes an OFBiz plugin into a maven package and then uploads it to
a maven repository. Currently, pushing is limited to localhost maven repository
(work in progress). To push a plugin the following parameters are passed:
- pluginId: mandatory
- groupId: optional, defaults to org.apache.ofbiz.plugin
- pluginVersion: optional, defaults to 0.1.0-SNAPSHOT
- pluginDescription: optional, defaults to "Publication of OFBiz plugin ${pluginId}"
`gradlew pushPlugin -PpluginId=myplugin`
`gradlew pushPlugin -PpluginId=mycompany -PpluginGroup=com.mycompany.ofbiz.plugin -PpluginVersion=1.2.3 -PpluginDescription="Introduce special functionality X"`
* * * * * * * * * * * *
Miscellaneous Documentation
---------------------------
### Further reading
* [Known issues](https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-Knownissues "Known issues")
### Repository and directory structure
OFBiz is split into two repositories:
- **ofbiz-framework**: Contains the core framework and main applications in
the system like accounting, party, order, etc
- **ofbiz-plugins**: Renamed from "special-purpose" and contains optional
components that are officially supported by the community
Furthermore, the hot-deploy directory is removed as the plugins directory works
as a replacement for both "special-purpose" and "hot-deploy".
If you need to load the components in the plugins directory in a specific order
place a component-load.xml file in the plugins directory listing the order.
To check out a plugin from source control use the **pullPluginSource** Gradle task.
To check out all plugins from source control use the **pullAllPluginsSource**.
**Beware** this deletes a previously existing plugins directory.
### Running gradle tasks without an internet connection
OFBiz must run with an internet connection the **first time** it is prepared on
the system because it needs to download all the required dependencies.
After preparing OFBiz the first time correctly, it is possible to run OFBiz
without an internet connection by using the `--offline` command line switch
which tells Gradle to fetch its dependencies from the cache.
If any dependencies are missing from the cache and you pass `--offline` switch
then the build execution will fail.
### Setup an external database like MySQL, PostgreSQL, etc
To setup an external database instead of the default embedded Apache Derby, you
will need to follow the following instructions:
1. Find the JDBC driver suitable for your database using one of the following
options:
* Search for the JDBC driver in [jcenter](https://bintray.com/bintray/jcenter)
and place it in build.gradle dependencies e.g.
`runtime 'mysql:mysql-connector-java:5.1.36'`
OR
* Download the JDBC driver jar and place it in $OFBIZ_HOME/lib or the lib
sub-directory of any component
2. Modify the entityengine.xml file located in $OFBIZ_HOME/framework/entity/config
to switch the default database to the one you selected. For more details you
can read the relevant section in the
[technical setup guide](https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Technical+Production+Setup+Guide)
### Setup gradle tab-completion on Unix-like systems:
To get tab completion (auto complete gradle commands by pressing tab)
you can download the script from the below link and place it in the
appropriate location for your system.
[Gradle tab completion](https://edub.me/gradle-completion-bash)
For example, on debian based systems, you can use the following command:
`sudo curl -L -s https://edub.me/gradle-completion-bash -o /etc/bash_completion.d/gradle-tab-completion.bash`
* * * * * * * * * * * *
Crypto notice
-------------
This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See <http://www.wassenaar.org/> for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and
Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this Apache Software Foundation
distribution makes it eligible for export under the License Exception
ENC Technology Software Unrestricted (TSU) exception (see the BIS
Export Administration Regulations, Section 740.13) for both object
code and source code.
The following provides more details on the included cryptographic
software:
- Various classes in OFBiz, including DesCrypt, HashCrypt, and
BlowFishCrypt use libraries from the Sun Java JDK API including
java.security.* and javax.crypto.* (the JCE, Java Cryptography
Extensions API)
- Other classes such as HttpClient and various related ones use
the JSSE (Java Secure Sockets Extension) API
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -58,6 +58,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -66,6 +71,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -57,6 +57,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -771,83 +771,6 @@
<field-to-result field="contentId"/>
</simple-method>
<simple-method method-name="getSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record">
<set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean"/>
<set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean"/>
<entity-condition entity-name="ContentAssocViewTo" list="viewList" filter-by-date="${filterByDate}" use-cache="${useCache}">
<condition-list combine="and">
<condition-expr field-name="contentIdStart" from-field="parameters.contentId"/>
<condition-expr field-name="caContentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
<condition-expr field-name="caMapKey" from-field="parameters.mapKey" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
<iterate list="viewList" entry="view">
<set field="hasPermission" value="true" type="Boolean"/>
<if>
<condition>
<and>
<not>
<if-empty field="parameters.mainAction"/>
</not>
<not>
<if-empty field="parameters.userLogin"/>
</not>
</and>
</condition>
<then>
<set field="inMap.contentId" from-field="parameters.contentId"/>
<set field="inMap.mainAction" from-field="parameters.mainAction"/>
<set field="inMap.userLogin" from-field="parameters.userLogin"/>
<set field="inMap.contentOperationId" from-field="parameters.contentOperationId" default-value="CONTENT_CREATE"/>
<call-service service-name="genericContentPermission" in-map-name="inMap" include-user-login="true">
<result-to-field result-name="hasPermission"/>
</call-service>
</then>
</if>
<if-compare field="hasPermission" operator="equals" value="true" type="Boolean">
<set field="contentViewList[]" from-field="view"/>
</if-compare>
</iterate>
<field-to-result field="contentViewList" result-name="subContentList"/>
</simple-method>
<simple-method method-name="getSubSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record">
<set-service-fields service-name="getSubContentWithPermCheck" map="parameters" to-map="inMap"/>
<call-service service-name="getSubContentWithPermCheck" in-map-name="inMap">
<result-to-field result-name="subContentList"/>
</call-service>
<iterate list="subContentList" entry="view">
<entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}">
<condition-list combine="and">
<condition-expr field-name="contentIdStart" from-field="view.caContentIdTo"/>
<condition-expr field-name="caContentAssocTypeId" from-field="parameters.subContentAssocTypeId" ignore-if-empty="true"/>
<condition-expr field-name="caMapKey" from-field="parameters.subMapKey" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
<clear-field field="view2"/>
<first-from-list list="viewList" entry="view2"/>
<clear-field field="map"/>
<set field="map.contentIdFrom" from-field="view.contentId"/>
<set field="map.dataResourceIdFrom" from-field="view.dataResourceId"/>
<set field="map.contentId" from-field="view2.contentId"/>
<set field="map.contentName" from-field="view2.contentName"/>
<set field="map.description" from-field="view2.description"/>
<entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="view2.dataResourceId"/>
</entity-one>
<set field="map.textData" from-field="electronicText.textData"/>
<set field="contentViewList[]" from-field="map"/>
</iterate>
<field-to-result field="subContentList" result-name="subContentList"/>
<field-to-result field="contentViewList" result-name="subSubContentList"/>
</simple-method>
<simple-method method-name="forceIndexContentKeywords" short-description="induce all the keywords of a content">
<entity-one entity-name="Content" value-field="content"/>
<call-class-method class-name="org.apache.ofbiz.content.content.ContentKeywordIndex" method-name="forceIndexKeywords">
@@ -40,33 +40,6 @@
<attribute mode="OUT" name="resultData" optional="true" type="java.util.Map"/>
</service>
<service name="getSubContentWithPermCheck" engine="simple" auth="true"
location="component://content/minilang/content/ContentServices.xml" invoke="getSubContentWithPermCheck">
<description>Get Content and resource information</description>
<permission-service service-name="genericContentPermission" main-action="VIEW"/>
<attribute mode="IN" name="contentId" optional="false" type="String">
<type-validate>
<fail-property resource="ContentErrorUiLabels" property="ContentRequiredFieldMissingContentId"/>
</type-validate>
</attribute>
<attribute mode="IN" name="contentAssocTypeId" optional="true" type="String"/>
<attribute mode="IN" name="mapKey" optional="true" type="String"/>
<attribute mode="IN" name="mainAction" optional="true" type="String"/>
<attribute mode="IN" name="contentOperationId" optional="true" type="String"/>
<attribute mode="IN" name="useCache" optional="true" type="Boolean"/>
<attribute mode="IN" name="filterByDate" optional="true" type="Boolean"/>
<attribute mode="OUT" name="subContentList" optional="true" type="java.util.List"/>
</service>
<service name="getSubSubContentWithPermCheck" engine="simple" auth="true"
location="component://content/minilang/content/ContentServices.xml" invoke="getSubSubContentWithPermCheck">
<description>Get Content associated with Content</description>
<implements service="getSubContentWithPermCheck"/>
<attribute mode="IN" name="subContentAssocTypeId" optional="true" type="String"/>
<attribute mode="IN" name="subMapKey" optional="true" type="String"/>
<attribute mode="OUT" name="subSubContentList" optional="true" type="java.util.List"/>
</service>
<service name="getContentAndDataResource" engine="simple" default-entity-name="Content" auth="true"
location="component://content/minilang/content/ContentServices.xml" invoke="getContentAndDataResource">
<description>Get Content and resource information</description>
@@ -35,6 +35,7 @@ import org.apache.ofbiz.base.util.UtilGenerics;
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.service.ServiceUtil;
/**
@@ -66,6 +67,9 @@ public final class LayoutWorker {
return ServiceUtil.returnError(e4.getMessage());
}
if(lst.size() == 0 && UtilValidate.isNotEmpty(request.getAttribute("fileItems"))) {
lst = UtilGenerics.cast(request.getAttribute("fileItems"));
}
if (lst.size() == 0) {
String errMsg = UtilProperties.getMessage(err_resource,
"layoutEvents.no_files_uploaded", locale);
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -401,21 +401,38 @@ under the License.
<TermType description="Commission Term Maximum Per Unit" hasTable="N" parentTypeId="COMMISSION_TERM" termTypeId="FIN_COMM_MAX"/>
<TermType description="Incoterm" hasTable="N" parentTypeId="" termTypeId="INCO_TERM"/>
<TermType description="Incoterm Ex Works" parentTypeId="INCO_TERM" termTypeId="EXW"/>
<TermType description="Incoterm Free Carrier" parentTypeId="INCO_TERM" termTypeId="FCA"/>
<TermType description="Incoterm Free Alongside Ship" parentTypeId="INCO_TERM" termTypeId="FAS"/>
<TermType description="Incoterm Free On Board" parentTypeId="INCO_TERM" termTypeId="FOB"/>
<TermType description="Incoterm Cost and Freight" parentTypeId="INCO_TERM" termTypeId="CFR"/>
<TermType description="Incoterm Cost, Insurance and Freight" parentTypeId="INCO_TERM" termTypeId="CIF"/>
<TermType description="Incoterm Carriage Paid To" parentTypeId="INCO_TERM" termTypeId="CPT"/>
<TermType description="Incoterm Carriage and Insurance Paid to" parentTypeId="INCO_TERM" termTypeId="CIP"/>
<TermType description="Incoterm Delivered At Frontier" parentTypeId="INCO_TERM" termTypeId="DAF"/>
<TermType description="Incoterm Delivered Ex Ship" parentTypeId="INCO_TERM" termTypeId="DES"/>
<TermType description="Incoterm Delivered Ex Quay" parentTypeId="INCO_TERM" termTypeId="DEQ"/>
<TermType description="Incoterm Delivered Duty Unpaid" parentTypeId="INCO_TERM" termTypeId="DDU"/>
<TermType description="Incoterm Delivered Duty Paid" parentTypeId="INCO_TERM" termTypeId="DDP"/>
<TermType description="Purchasing" parentTypeId="" hasTable="" termTypeId="PURCHASING"/>
<TermType description="Incoterm 2020" parentTypeId="INCO_TERM" termTypeId="INCO_TERM_2020"/>
<TermType description="Incoterm 2020 Ex Works" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_EXW"/>
<TermType description="Incoterm 2020 Free Carrier" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_FCA"/>
<TermType description="Incoterm 2020 Free Alongside Ship" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_FAS"/>
<TermType description="Incoterm 2020 Free On Board" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_FOB"/>
<TermType description="Incoterm 2020 Carriage Paid To" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_CPT"/>
<TermType description="Incoterm 2020 Cost and Freight" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_CFR"/>
<TermType description="Incoterm 2020 Cost, Insurance and Freight" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_CIF"/>
<TermType description="Incoterm 2020 Carriage and Insurance Paid to" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_CIP"/>
<TermType description="Incoterm 2020 Delivered at Place Unloaded" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_DPU"/>
<TermType description="Incoterm 2020 Delivered at Place" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_DAP"/>
<TermType description="Incoterm 2020 Delivered Duty Paid" parentTypeId="INCO_TERM_2020" termTypeId="INCO_TERM_2020_DDP"/>
<TermType description="Incoterm 2010" parentTypeId="INCO_TERM" termTypeId="INCO_TERM_2010"/>
<TermType description="Incoterm 2010 Ex Works" parentTypeId="INCO_TERM_2010" termTypeId="EXW"/>
<TermType description="Incoterm 2010 Free Carrier" parentTypeId="INCO_TERM_2010" termTypeId="FCA"/>
<TermType description="Incoterm 2010 Free Alongside Ship" parentTypeId="INCO_TERM_2010" termTypeId="FAS"/>
<TermType description="Incoterm 2010 Free On Board" parentTypeId="INCO_TERM_2010" termTypeId="FOB"/>
<TermType description="Incoterm 2010 Cost and Freight" parentTypeId="INCO_TERM_2010" termTypeId="CFR"/>
<TermType description="Incoterm 2010 Cost, Insurance and Freight" parentTypeId="INCO_TERM_2010" termTypeId="CIF"/>
<TermType description="Incoterm 2010 Carriage Paid To" parentTypeId="INCO_TERM_2010" termTypeId="CPT"/>
<TermType description="Incoterm 2010 Carriage and Insurance Paid to" parentTypeId="INCO_TERM_2010" termTypeId="CIP"/>
<TermType description="Incoterm 2010 Delivered Duty Paid" parentTypeId="INCO_TERM_2010" termTypeId="DDP"/>
<TermType description="Incoterm 2000" parentTypeId="INCO_TERM" termTypeId="INCO_TERM_2000"/>
<TermType description="Incoterm 2000 Delivered At Frontier" parentTypeId="INCO_TERM_2000" termTypeId="DAF"/>
<TermType description="Incoterm 2000 Delivered Ex Ship" parentTypeId="INCO_TERM_2000" termTypeId="DES"/>
<TermType description="Incoterm 2000 Delivered Ex Quay" parentTypeId="INCO_TERM_2000" termTypeId="DEQ"/>
<TermType description="Incoterm 2000 Delivered Duty Unpaid" parentTypeId="INCO_TERM_2000" termTypeId="DDU"/>
<TermType description="Purchasing" termTypeId="PURCHASING"/>
<TermType description="Vendor Customer ID" parentTypeId="PURCHASING" termTypeId="PURCH_VENDOR_ID"/>
<TermType description="Preferred Freight" parentTypeId="PURCHASING" termTypeId="PURCH_FREIGHT"/>
@@ -57,6 +57,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -57,6 +57,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -57,6 +57,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
+166 -61
View File
@@ -3970,35 +3970,35 @@
<value xml:lang="zh-TW">合約終止</value>
</property>
<property key="TermType.description.CFR">
<value xml:lang="de">Incoterm Kosten und Fracht</value>
<value xml:lang="en">Incoterm Cost and Freight</value>
<value xml:lang="fr">Incoterm : chargé dans le bateau, livraison au port de départ, sans assurance</value>
<value xml:lang="it">Costi e spese di trasporto incoterm</value>
<value xml:lang="de">Incoterm 2010 Kosten und Fracht</value>
<value xml:lang="en">Incoterm 2010 Cost and Freight</value>
<value xml:lang="fr">Incoterm 2010 : chargé dans le bateau, livraison au port de départ, sans assurance</value>
<value xml:lang="it">Costi e spese di trasporto incoterm 2010</value>
<value xml:lang="ja">CFR運賃込み渡し/インコタームズ</value>
<value xml:lang="nl">INCOTERM: CRF</value>
<value xml:lang="pt-BR">Incoterm CFR</value>
<value xml:lang="nl">INCOTERM 2010: CRF</value>
<value xml:lang="pt-BR">Incoterm 2010 CFR</value>
<value xml:lang="vi">Điều khoản: Giá và Chuyên chở</value>
<value xml:lang="zh">国际贸易成本加运费价格</value>
<value xml:lang="zh-TW">國際貿易成本加運費價格</value>
</property>
<property key="TermType.description.CIF">
<value xml:lang="de">Incoterm Kosten, Versicherung und Fracht</value>
<value xml:lang="en">Incoterm Cost, Insurance and Freight</value>
<value xml:lang="fr">Incoterm : chargé sur le bateau, frais jusqu'au port d'arrivée, avec assurance</value>
<value xml:lang="it">Costi, assicurazione e spese di trasporto incoterm</value>
<value xml:lang="de">Incoterm 2010 Kosten, Versicherung und Fracht</value>
<value xml:lang="en">Incoterm 2010 Cost, Insurance and Freight</value>
<value xml:lang="fr">Incoterm 2010 : chargé sur le bateau, frais jusqu'au port d'arrivée, avec assurance</value>
<value xml:lang="it">Costi, assicurazione e spese di trasporto incoterm 2010</value>
<value xml:lang="ja">CIF運賃保険料込み渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm CIF</value>
<value xml:lang="pt-BR">Incoterm 2010 CIF</value>
<value xml:lang="vi">Điều khoản: Giá , Bảo hiểm và Chuyên chở</value>
<value xml:lang="zh">国际贸易到岸价格(成本、保险费加运费)</value>
<value xml:lang="zh-TW">國際貿易到岸價格(成本、保險費加運費)</value>
</property>
<property key="TermType.description.CIP">
<value xml:lang="de">Incoterm Transport und Versicherung bezahlt an</value>
<value xml:lang="en">Incoterm Carriage and Insurance Paid to</value>
<value xml:lang="fr">Incoterm : livraison au premier transporteur, frais jusqu'au déchargement du mode de transport, avec assurance</value>
<value xml:lang="it">Trasporto e assicurazione pagata incoterm</value>
<value xml:lang="de">Incoterm 2010 Transport und Versicherung bezahlt an</value>
<value xml:lang="en">Incoterm 2010 Carriage and Insurance Paid to</value>
<value xml:lang="fr">Incoterm 2010 : livraison au premier transporteur, frais jusqu'au déchargement du mode de transport, avec assurance</value>
<value xml:lang="it">Trasporto e assicurazione pagata incoterm 2010</value>
<value xml:lang="ja">CIP運送費保険料込み渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm CIP</value>
<value xml:lang="pt-BR">Incoterm 2010 CIP</value>
<value xml:lang="vi">Điều khoản: Giá , Bảo hiểm trả tới</value>
<value xml:lang="zh">国际贸易运费、保险费付至</value>
<value xml:lang="zh-TW">國際貿易運費、保險費付至</value>
@@ -4039,62 +4039,62 @@
<value xml:lang="zh-TW">佣金</value>
</property>
<property key="TermType.description.CPT">
<value xml:lang="de">Incoterm Transport bezahlt an</value>
<value xml:lang="en">Incoterm Carriage Paid To</value>
<value xml:lang="it">Trasporto pagata incoterm</value>
<value xml:lang="de">Incoterm 2010 Transport bezahlt an</value>
<value xml:lang="en">Incoterm 2010 Carriage Paid To</value>
<value xml:lang="it">Trasporto pagata incoterm 2010</value>
<value xml:lang="ja">CPT運送費込み渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm CPT</value>
<value xml:lang="pt-BR">Incoterm 2010 CPT</value>
<value xml:lang="vi">Điều khoản phí chuyển thanh toán tới</value>
<value xml:lang="zh">国际贸易运费付至</value>
<value xml:lang="zh-TW">國際貿易運費付至</value>
</property>
<property key="TermType.description.DAF">
<value xml:lang="de">Incoterm Geliefert an Grenze</value>
<value xml:lang="en">Incoterm Delivered At Frontier</value>
<value xml:lang="it">Consegnato alla frontiera incoterm</value>
<value xml:lang="de">Incoterm 2000 Geliefert an Grenze</value>
<value xml:lang="en">Incoterm 2000 Delivered At Frontier</value>
<value xml:lang="it">Consegnato alla frontiera incoterm 2000</value>
<value xml:lang="ja">DAF国境持込渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm DAF</value>
<value xml:lang="pt-BR">Incoterm 2000 DAF</value>
<value xml:lang="vi">Điều khoản nhận tại biên giới (Delivered At Frontier)</value>
<value xml:lang="zh">国际贸易边境交货</value>
<value xml:lang="zh-TW">國際貿易邊境交貨</value>
</property>
<property key="TermType.description.DDP">
<value xml:lang="de">Incoterm Geliefert Zoll bezahlt</value>
<value xml:lang="en">Incoterm Delivered Duty Paid</value>
<value xml:lang="it">Dazio pagato alla consegna incoterm</value>
<value xml:lang="de">Incoterm 2010 Geliefert Zoll bezahlt</value>
<value xml:lang="en">Incoterm 2010 Delivered Duty Paid</value>
<value xml:lang="it">Dazio pagato alla consegna incoterm 2010</value>
<value xml:lang="ja">DDP仕向地持込渡し(関税込み)/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm DDP</value>
<value xml:lang="pt-BR">Incoterm 2010 DDP</value>
<value xml:lang="vi">Điều khoản nhận thanh toán thuế</value>
<value xml:lang="zh">国际贸易完税后交货价</value>
<value xml:lang="zh-TW">國際貿易完稅後交貨價</value>
</property>
<property key="TermType.description.DDU">
<value xml:lang="de">Incoterm Geliefert Zoll nicht bezahlt</value>
<value xml:lang="en">Incoterm Delivered Duty Unpaid</value>
<value xml:lang="it">Dazio non pagato alla consegna incoterm</value>
<value xml:lang="de">Incoterm 2000 Geliefert Zoll nicht bezahlt</value>
<value xml:lang="en">Incoterm 2000 Delivered Duty Unpaid</value>
<value xml:lang="it">Dazio non pagato alla consegna incoterm 2000</value>
<value xml:lang="ja">DDU仕向地持込渡し(関税抜き)/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm DDU</value>
<value xml:lang="pt-BR">Incoterm 2000 DDU</value>
<value xml:lang="vi">Điều khoản nhận miễn thuế</value>
<value xml:lang="zh">国际贸易未完税交货价</value>
<value xml:lang="zh-TW">國際貿易未完稅交貨價</value>
</property>
<property key="TermType.description.DEQ">
<value xml:lang="de">Incoterm Geliefert ab Kai</value>
<value xml:lang="en">Incoterm Delivered Ex Quay</value>
<value xml:lang="it">Consegnato ex banchina incoterm</value>
<value xml:lang="de">Incoterm 2000 Geliefert ab Kai</value>
<value xml:lang="en">Incoterm 2000 Delivered Ex Quay</value>
<value xml:lang="it">Consegnato ex banchina incoterm 2000</value>
<value xml:lang="ja">DEQ埠頭持込渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm DEQ</value>
<value xml:lang="pt-BR">Incoterm 2000 DEQ</value>
<value xml:lang="vi">Điều khoản nhận tại cảng</value>
<value xml:lang="zh">国际贸易目的港码头交货价</value>
<value xml:lang="zh-TW">國際貿易目的港碼頭交貨價</value>
</property>
<property key="TermType.description.DES">
<value xml:lang="de">Incoterm Geliefert ab Schiff</value>
<value xml:lang="en">Incoterm Delivered Ex Ship</value>
<value xml:lang="de">Incoterm 2000 Geliefert ab Schiff</value>
<value xml:lang="en">Incoterm 2000 Delivered Ex Ship</value>
<value xml:lang="fr">Incoterm : livré sur quai</value>
<value xml:lang="it">Consegnato ex spedizione incoterm</value>
<value xml:lang="it">Consegnato ex spedizione incoterm 2000</value>
<value xml:lang="ja">DES本船持込渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm DES</value>
<value xml:lang="pt-BR">Incoterm 2000 DES</value>
<value xml:lang="vi">Điều khoản nhận tại tàu</value>
<value xml:lang="zh">国际贸易目的港船上交货</value>
<value xml:lang="zh-TW">國際貿易目的港船上交貨</value>
@@ -4118,34 +4118,34 @@
<value xml:lang="zh-TW">排他關連</value>
</property>
<property key="TermType.description.EXW">
<value xml:lang="de">Incoterm ab Werk</value>
<value xml:lang="en">Incoterm Ex Works</value>
<value xml:lang="fr">Incoterm : au départ non chargé, non dédouané</value>
<value xml:lang="it">Ex fabbrica incoterm</value>
<value xml:lang="de">Incoterm 2010 ab Werk</value>
<value xml:lang="en">Incoterm 2010 Ex Works</value>
<value xml:lang="fr">Incoterm 2010 : au départ non chargé, non dédouané</value>
<value xml:lang="it">Ex fabbrica incoterm 2010</value>
<value xml:lang="ja">EXW工場渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm EXW</value>
<value xml:lang="pt-BR">Incoterm 2010 EXW</value>
<value xml:lang="vi">Điều khoản Ex Works</value>
<value xml:lang="zh">国际贸易工厂交货价</value>
<value xml:lang="zh-TW">國際貿易工廠交貨價</value>
</property>
<property key="TermType.description.FAS">
<value xml:lang="de">Incoterm Frei längsseits Schiff</value>
<value xml:lang="en">Incoterm Free Alongside Ship</value>
<value xml:lang="fr">Incoterm : sur le quai du port de départ</value>
<value xml:lang="it">Gratis accanto alla spedizione incoterm</value>
<value xml:lang="de">Incoterm 2010 Frei längsseits Schiff</value>
<value xml:lang="en">Incoterm 2010 Free Alongside Ship</value>
<value xml:lang="fr">Incoterm 2010 : sur le quai du port de départ</value>
<value xml:lang="it">Gratis accanto alla spedizione incoterm 2010</value>
<value xml:lang="ja">FAS船側渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm FAS</value>
<value xml:lang="pt-BR">Incoterm 2010 FAS</value>
<value xml:lang="vi">Điều khoản chuyển miễn phí theo dọc thân tàu</value>
<value xml:lang="zh">国际贸易(启运地)船边交货价格</value>
<value xml:lang="zh-TW">國際貿易(啟運地)船邊交貨價格</value>
</property>
<property key="TermType.description.FCA">
<value xml:lang="de">Incoterm Freier Transport</value>
<value xml:lang="en">Incoterm Free Carrier</value>
<value xml:lang="fr">Incoterm : marchandises dédouanées et chargées dans le pays de départ</value>
<value xml:lang="it">Gratis spedizioniere incoterm</value>
<value xml:lang="de">Incoterm 2010 Freier Transport</value>
<value xml:lang="en">Incoterm 2010 Free Carrier</value>
<value xml:lang="fr">Incoterm 2010 : marchandises dédouanées et chargées dans le pays de départ</value>
<value xml:lang="it">Gratis spedizioniere incoterm 2010</value>
<value xml:lang="ja">FCA運送人渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm FCA</value>
<value xml:lang="pt-BR">Incoterm 2010 FCA</value>
<value xml:lang="vi">Điều khoản miễn phí chuyên chở</value>
<value xml:lang="zh">国际贸易离岸价</value>
<value xml:lang="zh-TW">國際貿易離岸價</value>
@@ -4378,12 +4378,12 @@
<value xml:lang="zh-TW">付款淨天數,第三部分</value>
</property>
<property key="TermType.description.FOB">
<value xml:lang="de">Incoterm Frei Schiff</value>
<value xml:lang="en">Incoterm Free On Board</value>
<value xml:lang="fr">Incoterm chargé sur le bateau</value>
<value xml:lang="it">Gratis a bordo incoterm</value>
<value xml:lang="de">Incoterm 2010 Frei Schiff</value>
<value xml:lang="en">Incoterm 2010 Free On Board</value>
<value xml:lang="fr">Incoterm 2010 chargé sur le bateau</value>
<value xml:lang="it">Gratis a bordo incoterm 2010</value>
<value xml:lang="ja">FOB本船甲板渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm FOB</value>
<value xml:lang="pt-BR">Incoterm 2010 FOB</value>
<value xml:lang="vi">Điều khoản miễn phí trên tàu</value>
<value xml:lang="zh">国际贸易离岸价格</value>
<value xml:lang="zh-TW">國際貿易離岸價格</value>
@@ -4545,4 +4545,109 @@
<value xml:lang="zh">阈值</value>
<value xml:lang="zh-TW">門檻值</value>
</property>
</resource>
<property key="TermType.description.INCO_TERM_2020_EXW">
<value xml:lang="de">Incoterm 2020 ab Werk</value>
<value xml:lang="en">Incoterm 2020 Ex Works</value>
<value xml:lang="fr">Incoterm 2020 : au départ non chargé, non dédouané</value>
<value xml:lang="it">Ex fabbrica incoterm 2020</value>
<value xml:lang="ja">EXW工場渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 EXW</value>
<value xml:lang="vi">Điều khoản Ex Works</value>
<value xml:lang="zh">国际贸易工厂交货价</value>
<value xml:lang="zh-TW">國際貿易工廠交貨價</value>
</property>
<property key="TermType.description.INCO_TERM_2020_FCA">
<value xml:lang="de">Incoterm 2020 Freier Transport</value>
<value xml:lang="en">Incoterm 2020 Free Carrier</value>
<value xml:lang="fr">Incoterm 2020 : marchandises dédouanées et chargées dans le pays de départ</value>
<value xml:lang="it">Gratis spedizioniere incoterm 2020</value>
<value xml:lang="ja">FCA運送人渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 FCA</value>
<value xml:lang="vi">Điều khoản miễn phí chuyên chở</value>
<value xml:lang="zh">国际贸易离岸价</value>
<value xml:lang="zh-TW">國際貿易離岸價</value>
</property>
<property key="TermType.description.INCO_TERM_2020_FAS">
<value xml:lang="de">Incoterm 2020 Frei längsseits Schiff</value>
<value xml:lang="en">Incoterm 2020 Free Alongside Ship</value>
<value xml:lang="fr">Incoterm 2020 : sur le quai du port de départ</value>
<value xml:lang="it">Gratis accanto alla spedizione incoterm 2020</value>
<value xml:lang="ja">FAS船側渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 FAS</value>
<value xml:lang="vi">Điều khoản chuyển miễn phí theo dọc thân tàu</value>
<value xml:lang="zh">国际贸易(启运地)船边交货价格</value>
<value xml:lang="zh-TW">國際貿易(啟運地)船邊交貨價格</value>
</property>
<property key="TermType.description.INCO_TERM_2020_FOB">
<value xml:lang="de">Incoterm 2020 Frei Schiff</value>
<value xml:lang="en">Incoterm 2020 Free On Board</value>
<value xml:lang="fr">Incoterm 2020 chargé sur le bateau</value>
<value xml:lang="it">Gratis a bordo incoterm 2020</value>
<value xml:lang="ja">FOB本船甲板渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 FOB</value>
<value xml:lang="vi">Điều khoản miễn phí trên tàu</value>
<value xml:lang="zh">国际贸易离岸价格</value>
<value xml:lang="zh-TW">國際貿易離岸價格</value>
</property>
<property key="TermType.description.INCO_TERM_2020_CPT">
<value xml:lang="de">Incoterm 2020 Transport bezahlt an</value>
<value xml:lang="en">Incoterm 2020 Carriage Paid To</value>
<value xml:lang="it">Trasporto pagata incoterm 2020</value>
<value xml:lang="ja">CPT運送費込み渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 CPT</value>
<value xml:lang="vi">Điều khoản phí chuyển thanh toán tới</value>
<value xml:lang="zh">国际贸易运费付至</value>
<value xml:lang="zh-TW">國際貿易運費付至</value>
</property>
<property key="TermType.description.INCO_TERM_2020_CFR">
<value xml:lang="de">Incoterm 2020 Kosten und Fracht</value>
<value xml:lang="en">Incoterm 2020 Cost and Freight</value>
<value xml:lang="fr">Incoterm 2020 : chargé dans le bateau, livraison au port de départ, sans assurance</value>
<value xml:lang="it">Costi e spese di trasporto incoterm 2020</value>
<value xml:lang="ja">CFR運賃込み渡し/インコタームズ</value>
<value xml:lang="nl">INCOTERM 2020: CRF</value>
<value xml:lang="pt-BR">Incoterm 2020 CFR</value>
<value xml:lang="vi">Điều khoản: Giá và Chuyên chở</value>
<value xml:lang="zh">国际贸易成本加运费价格</value>
<value xml:lang="zh-TW">國際貿易成本加運費價格</value>
</property>
<property key="TermType.description.INCO_TERM_2020_CIF">
<value xml:lang="de">Incoterm 2020 Kosten, Versicherung und Fracht</value>
<value xml:lang="en">Incoterm 2020 Cost, Insurance and Freight</value>
<value xml:lang="fr">Incoterm 2020 : chargé sur le bateau, frais jusqu'au port d'arrivée, avec assurance</value>
<value xml:lang="it">Costi, assicurazione e spese di trasporto incoterm 2020</value>
<value xml:lang="ja">CIF運賃保険料込み渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 CIF</value>
<value xml:lang="vi">Điều khoản: Giá , Bảo hiểm và Chuyên chở</value>
<value xml:lang="zh">国际贸易到岸价格(成本、保险费加运费)</value>
<value xml:lang="zh-TW">國際貿易到岸價格(成本、保險費加運費)</value>
</property>
<property key="TermType.description.INCO_TERM_2020_CIP">
<value xml:lang="de">Incoterm 2020 Transport und Versicherung bezahlt an</value>
<value xml:lang="en">Incoterm 2020 Carriage and Insurance Paid to</value>
<value xml:lang="fr">Incoterm 2020 : livraison au premier transporteur, frais jusqu'au déchargement du mode de transport, avec assurance</value>
<value xml:lang="it">Trasporto e assicurazione pagata incoterm 2020</value>
<value xml:lang="ja">CIP運送費保険料込み渡し/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 CIP</value>
<value xml:lang="vi">Điều khoản: Giá , Bảo hiểm trả tới</value>
<value xml:lang="zh">国际贸易运费、保险费付至</value>
<value xml:lang="zh-TW">國際貿易運費、保險費付至</value>
</property>
<property key="TermType.description.INCO_TERM_2020_DPU">
<value xml:lang="en">Incoterm 2020 Delivered at Place Unloaded</value>
</property>
<property key="TermType.description.INCO_TERM_2020_DAP">
<value xml:lang="en">Incoterm 2020 Delivered at Place</value>
</property>
<property key="TermType.description.INCO_TERM_2020_DDP">
<value xml:lang="de">Incoterm 2020 Geliefert Zoll bezahlt</value>
<value xml:lang="en">Incoterm 2020 Delivered Duty Paid</value>
<value xml:lang="it">Dazio pagato alla consegna incoterm 2020</value>
<value xml:lang="ja">DDP仕向地持込渡し(関税込み)/インコタームズ</value>
<value xml:lang="pt-BR">Incoterm 2020 DDP</value>
<value xml:lang="vi">Điều khoản nhận thanh toán thuế</value>
<value xml:lang="zh">国际贸易完税后交货价</value>
<value xml:lang="zh-TW">國際貿易完稅後交貨價</value>
</property>
</resource>
@@ -38,7 +38,7 @@ under the License.
<#if (content.contentName?has_content)>
<a href="<@ofbizUrl>stream?contentId=${(content.contentId)!}</@ofbizUrl>" target="_blank">${uiLabelMap.CommonView}</a>
</#if>
<form name="removePartyContent_${pContent_index}" method="post" action="<@ofbizUrl>removePartyContent/viewprofile</@ofbizUrl>">
<form name="removePartyContent_${pContent_index}" method="post" action="<@ofbizUrl>removePartyContent</@ofbizUrl>">
<input type="hidden" name="contentId" value="${pContent.contentId}" />
<input type="hidden" name="partyId" value="${pContent.partyId}" />
<input type="hidden" name="partyContentTypeId" value="${pContent.partyContentTypeId}" />
@@ -52,4 +52,4 @@ under the License.
<#else>
${uiLabelMap.PartyNoContent}
</#if>
</div>
</div>
@@ -192,7 +192,11 @@ under the License.
&nbsp;
</#if>
<#if security.hasEntityPermission("PAY_INFO", "_DELETE", session) || security.hasEntityPermission("ACCOUNTING", "_DELETE", session)>
<a href="<@ofbizUrl>deletePaymentMethod/viewprofile?partyId=${partyId}&amp;paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
<form name="deletePaymentMethod_${paymentMethod.paymentMethodId}" method="post" action="<@ofbizUrl>deletePaymentMethod</@ofbizUrl>">
<input type="hidden" name="partyId" value="${partyId}" />
<input type="hidden" name="paymentMethodId" value="${paymentMethod.paymentMethodId}" />
<input type="submit" value="${uiLabelMap.CommonExpire}"/>
</form>
<#else>
&nbsp;
</#if>
@@ -1017,8 +1017,11 @@ under the License.
<request-map uri="removePartyContent">
<security auth="true" https="true"/>
<event type="service" invoke="removePartyContent"/>
<response name="success" type="request-redirect" value="EditPartyContents">
<redirect-parameter name="partyId"></redirect-parameter>
<response name="success" type="request-redirect" value="viewprofile">
<redirect-parameter name="partyId"/>
</response>
<response name="error" type="request-redirect" value="viewprofile">
<redirect-parameter name="partyId"/>
</response>
</request-map>
+1 -1
View File
@@ -1578,7 +1578,7 @@ under the License.
<!-- Alternative URLs -->
<service name="createMissingCategoryAndProductAltUrls" engine="simple"
location="component://product/minilang/product/catalog/CatalogServices.xml" invoke="createMissingCategoryAndProductAltUrls" auth="true" use-transaction="false">
location="component://product/minilang/product/catalog/CatalogServices.xml" invoke="createMissingCategoryAndProductAltUrls" auth="true" use-transaction="true">
<description>Create missing Category and Product Alternative URLs</description>
<attribute name="prodCatalogId" mode="INOUT" type="String" optional="false"/>
<attribute name="category" mode="IN" type="String" optional="true"/>
@@ -57,6 +57,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -62,6 +62,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -70,6 +75,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -56,6 +56,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -64,6 +69,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class>
@@ -59,6 +59,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -67,6 +72,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class>
+1 -1
View File
@@ -28,7 +28,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'at.bxm.gradleplugins:gradle-svntools-plugin:latest.release'
classpath 'at.bxm.gradleplugins:gradle-svntools-plugin:2.2.1'
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.8.1' // Rather than using 1.5.9.2 see OFBIZ-10693
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
}
@@ -56,6 +56,7 @@ import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.servlet.ServletRequestContext;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -66,6 +67,7 @@ import org.apache.http.ssl.SSLContexts;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.webapp.control.ConfigXMLReader;
import org.apache.ofbiz.webapp.control.SameSiteFilter;
import org.apache.ofbiz.webapp.event.FileUploadProgressListener;
import org.apache.ofbiz.widget.renderer.VisualTheme;
import org.apache.oro.text.regex.MalformedPatternException;
@@ -227,6 +229,7 @@ public final class UtilHttp {
Debug.logError("File upload error" + e, module);
}
if (uploadedItems != null) {
request.setAttribute("fileItems", uploadedItems);
for (FileItem item: uploadedItems) {
String fieldName = item.getFieldName();
//byte[] itemBytes = item.get();
@@ -1152,6 +1155,8 @@ public final class UtilHttp {
resp.setHeader("Content-Security-Policy-Report-Only", "default-src 'self'");
SameSiteFilter.addSameSiteCookieAttribute(resp);
// TODO in custom project. Public-Key-Pins-Report-Only is interesting but can't be used OOTB because of demos (the letsencrypt certificate is renewed every 3 months)
}
@@ -598,6 +598,19 @@ public final class UtilMisc {
return LocaleHolder.availableLocaleList;
}
/** 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...
* @return List of domains or IP addresses to be checked to prevent Host Header Injection,
*/
public static List<String> getHostHeadersAllowed() {
String hostHeadersAllowedString = UtilProperties.getPropertyValue("security", "host-headers-allowed", "localhost");
List<String> hostHeadersAllowed = null;
if (UtilValidate.isNotEmpty(hostHeadersAllowedString)) {
hostHeadersAllowed = StringUtil.split(hostHeadersAllowedString, ",");
}
return Collections.unmodifiableList(hostHeadersAllowed);
}
/** @deprecated use Thread.sleep() */
@Deprecated
public static void staticWait(long timeout) throws InterruptedException {
+6
View File
@@ -61,8 +61,14 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping><filter-name>ControlFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
<filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
<filter-mapping><filter-name>SameSiteFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -134,3 +134,11 @@ security.login.externalLoginKey.enabled=true
# -- Security key used to encrypt and decrypt the autogenerated password in forgot password functionality.
login.secret_key_string=Secret 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
# -- By default the SameSite value in SameSiteFilter is strict. This allows to change it to lax if needed
SameSiteCookieAttribute=
@@ -0,0 +1,47 @@
////
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.
////
= CSRF defense
== How is done the CSRF defense in Apache OFBiz and how to adapt it if needed
The Apache OFBiz Project
Release 17.12
:imagesdir: ../../themes/common-theme/webapp/images/img/
ifdef::backend-pdf[]
:title-logo-image: image::OFBiz-Logo.svg[Apache OFBiz Logo, pdfwidth=4.25in, align=center]
:source-highlighter: rouge
endif::[]
=== The same-Site attribute
[quote,According to OWASP ZAP]
____
The SameSite attribute is an effective counter measure to cross-site request forgery, cross-site script inclusion, and timing attacks.
____
By default OOTB the SameSiteFilter property sets the same-site attribute value to 'strict. SameSiteFilter allows to change to 'lax' if needed
===== Properties
The _security.properties_ file contains related properties:
# -- By default the SameSite value in SameSiteFilter is 'strict'.
# -- This property allows to change to 'lax' if needed.
SameSiteCookieAttribute=
@@ -19,5 +19,6 @@ under the License.
= Security
include::_include/sy-CSRF-defense.adoc[leveloffset=+1]
include::_include/sy-password-and-JWT.adoc[leveloffset=+1]
include::_include/sy-impersonation.adoc[leveloffset=+1]
@@ -18,12 +18,11 @@
*******************************************************************************/
package org.apache.ofbiz.webapp.control;
import java.net.MalformedURLException;
import org.apache.ofbiz.base.location.FlexibleLocation;
import static org.apache.ofbiz.base.util.UtilGenerics.checkMap;
import java.io.IOException;
import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.cert.X509Certificate;
import java.util.Enumeration;
@@ -37,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.ofbiz.base.location.FlexibleLocation;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.SSLUtil;
import org.apache.ofbiz.base.util.StringUtil;
@@ -76,6 +76,7 @@ public class RequestHandler {
private final URL controllerConfigURL;
private final boolean trackServerHit;
private final boolean trackVisit;
private final List hostHeadersAllowed;
public static RequestHandler getRequestHandler(ServletContext servletContext) {
RequestHandler rh = (RequestHandler) servletContext.getAttribute("_REQUEST_HANDLER_");
@@ -100,6 +101,9 @@ public class RequestHandler {
this.trackServerHit = !"false".equalsIgnoreCase(context.getInitParameter("track-serverhit"));
this.trackVisit = !"false".equalsIgnoreCase(context.getInitParameter("track-visit"));
hostHeadersAllowed = UtilMisc.getHostHeadersAllowed();
}
public ConfigXMLReader.ControllerConfig getControllerConfig() {
@@ -122,6 +126,11 @@ public class RequestHandler {
public void doRequest(HttpServletRequest request, HttpServletResponse response, String chain,
GenericValue userLogin, Delegator delegator) throws RequestHandlerException, RequestHandlerExceptionAllowExternalRequests {
if (!hostHeadersAllowed.contains(request.getServerName())) {
Debug.logError("Domain " + request.getServerName() + " not accepted to prevent host header injection ", module);
throw new RequestHandlerException("Domain " + request.getServerName() + " not accepted to prevent host header injection ");
}
final boolean throwRequestHandlerExceptionOnMissingLocalRequest = EntityUtilProperties.propertyValueEqualsIgnoreCase(
"requestHandler", "throwRequestHandlerExceptionOnMissingLocalRequest", "Y", delegator);
long startTime = System.currentTimeMillis();
@@ -826,6 +835,10 @@ public class RequestHandler {
}
}
if (reqAttrMap.size() > 0) {
// fileItems is not serializable.
// It contains a temporary DiskFileItem with a null value than can't be detected by UtilMisc::makeMapSerializable
// So it must be removed from reqAttrMap. See OFBIZ-11534
reqAttrMap.remove("fileItems");
byte[] reqAttrMapBytes = UtilObject.getBytes(reqAttrMap);
if (reqAttrMapBytes != null) {
req.getSession().setAttribute("_REQ_ATTR_MAP_", StringUtil.toHexString(reqAttrMapBytes));
@@ -954,6 +967,8 @@ public class RequestHandler {
if (viewNoCache) {
UtilHttp.setResponseBrowserProxyNoCache(resp);
if (Debug.verboseOn()) Debug.logVerbose("Sending no-cache headers for view [" + nextPage + "]", module);
} else {
resp.setHeader("Cache-Control", "Set-Cookie");
}
//Security Headers
@@ -0,0 +1,65 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
package org.apache.ofbiz.webapp.control;
import java.io.IOException;
import java.util.Collection;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
import org.apache.ofbiz.base.util.UtilProperties;
public class SameSiteFilter implements javax.servlet.Filter {
private static final String SameSiteCookieAttribute = UtilProperties.getPropertyValue("security.properties", "SameSiteCookieAttribute", "strict");
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
chain.doFilter(request, response);
addSameSiteCookieAttribute((HttpServletResponse) response); // add SameSite=strict cookie attribute
}
public static void addSameSiteCookieAttribute(HttpServletResponse response) {
Collection<String> headers = response.getHeaders(HttpHeaders.SET_COOKIE);
boolean firstHeader = true;
for (String header : headers) { // there can be multiple Set-Cookie attributes
if (firstHeader) {
response.setHeader(HttpHeaders.SET_COOKIE, String.format("%s; %s", header, "SameSite=" + SameSiteCookieAttribute));
firstHeader = false;
continue;
}
response.addHeader(HttpHeaders.SET_COOKIE, String.format("%s; %s", header, "SameSite=" + SameSiteCookieAttribute));
}
}
@Override
public void destroy() {
}
}
@@ -63,6 +63,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -71,6 +76,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class>
+2 -1
View File
@@ -19,6 +19,7 @@ under the License.
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html>
<head>
<meta http-equiv="Content-Security-Policy" frame-ancestors="self">
<title>500 Internal error</title>
<style>
body{
@@ -112,7 +113,7 @@ under the License.
<div class="container">
<div class="content">
<p class="error-500"><span>ERROR MESSAGE</span></p>
<p>${request.getAttribute("_ERROR_MESSAGE_")?replace("\n", "<br/>")}</p>
<p>${(request.getAttribute("_ERROR_MESSAGE_")!)?replace("\n", "<br/>")}</p>
<div class="img">
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -54,7 +54,7 @@ under the License.
</#if>
"id": "${returnField}",
"label": "<#if (displayString?trim?has_content )>${displayString?trim}<#else>${returnField}</#if>",
"value": "${returnField}"
"value": "${StringUtil.wrapString(returnField)}"
}<#if autocompleteOption_has_next>,</#if>
</#list>
<#else>