Author SHA1 Message Date
Jacques Le Roux fcb8bc56c7 Improved: Data of tenant specific component gets loaded in all instances (OFBIZ-6065)
Improves the information provided about importing and loadAll Gradle task
loadTenant Gradle task should be used when necessary
2022-07-28 09:41:12 +02:00
Jacques Le Roux c0b5072a90 Improved: Data of tenant specific component gets loaded in all instances (OFBIZ-6065)
The tenant relevant Gradle tasks are:

OFBiz Server tasks
------------------
createTenant - Create a new tenant in your environment
loadAdminUserLogin - Create admin user with temporary password equal to ofbiz.
You must provide userLoginId
loadAll - Load default data; meant for OFBiz development, testing, and demo
purposes
loadTenant - Load data using tenantId

loadAll is the new "ant load-data" and should clearly only used for
"OFBiz development, testing, and demo purposes".

Remains the import functionalities. We don't want to get to far with that,
a warning is enough.

Thanks: Pierre Smits for report

Conflicts handled by handin framework/webtools/config/WebtoolsUiLabels.xml
2022-07-27 16:23:41 +02:00
Michael Brohl 598f70f501 Improved: Make loading of data containing urls configurable
(OFBIZ-12670)

Introduces a SystemProperty security/security.datafile.loadurls.enable
which can be set to true to allow loading of urls in the XML import.
2022-07-21 15:15:21 +02:00
Jacques Le Roux b2f5822343 Improved: Unable to upload a file through ecommerce (OFBIZ-12636)
Allows to check for only CSV files. This is not used OOTB in OFBiz.

Thanks: Sachin for report and confirmation it's OK
2022-06-30 11:28:22 +02:00
Jacques Le Roux ff617d4eaa Fixed: [SECURITY] Upgrade Tika to 1.28.4 (OFBIZ-12657)
Fixes a typo: " instead of '
2022-06-22 15:43:05 +02:00
Jacques Le Roux 1bbb80c425 Fixed: [SECURITY] Upgrade Tika to 1.28.4 (OFBIZ-12657)
Mentionned at https://tika.apache.org/
Apache Tika 1.28.4 has been released! This release includes security related
fixes and dependency upgrades
Note: The Apache Tika PMC has set September 30, 2022 as the End Of Life for the
Tika 1.x branch.
2022-06-22 13:56:26 +02:00
Jacques Le Roux 03faa5b187 Improved: Secure the uploads (OFBIZ-12080)
Few more debug log texts changes for clarity

I backport to ease future merging while backporting
2022-06-11 14:45:59 +02:00
Jacques Le Roux 68941bba7e Fixed: Secure the uploads (OFBIZ-12080)
Several changes in SecuredUpload class:
Mostly checks that uploaded CSV files are valid text files
Also few debug log texts changes for clarity
2022-06-11 12:01:55 +02:00
Jacques Le Roux 8164849e4d Fixed: Unable to upload a file through ecommerce (OFBIZ-12636)
We need to upload a CSV format file as part of project requirement
We were able upload CSV format file under eCommerce in Version 16.11.07.
We are trying to implement the same in version 18.12.05 - there the same upload
module does not work.

jleroux: I missed to check and allow CSV files when all files are allowed.
That now uses:
https://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html

The default CSV format used to check upload of CSV files is set in the property
csvformat=CSVFormat.DEFAULT in security.properties

Thanks: Sachin for report
2022-06-11 08:59:30 +02:00
Deepak Dixit 23ce22c51d Fixed: Added missing notification tag entry in services.xsd file (OFBIZ-12635) 2022-06-09 15:33:35 +05:30
Michael Brohl 9c18374ad3 Improved: German Translation - Category (OFBIZ-12632)
Updates a few german translations for consistency.

Thanks Ingo Wolfmayr for reporting and providing the patch.
2022-06-07 21:43:23 +02:00
Jacques Le Roux cac40a6032 Fixed: [SECURITY] Upgrade Tika to 1.28.3 (OFBIZ-12626)
Apache Tika 1.28.3 contains security-related fixes and dependency upgrades.
Details can be found in the changes file:
https://www.apache.org/dist/tika/1.28.3/CHANGES-1.28.3.txt
2022-05-28 10:05:59 +02:00
Jacques Le Roux c4d3353386 Fixed: Webtools Service Logs ‘Service Name’ column always empty (OFBIZ-12625)
rs.getModelService().name should be used
instead of
rs.getModelService().getName()
in 18.12 branch

I guess they were other issues related to import in the version I tested
yesterday on the stable demo. Works on both side now (local and demo).
2022-05-27 10:24:33 +02:00
Jacques Le Roux d8d1b03722 Fixed: Webtools Service Logs ‘Service Name’ column always empty (OFBIZ-12625)
rs.getModelService().getName() should be used
instead of
rs.getModelService().name

The rest of changes is only non functional formatting and such

Thanks: Emad Radwan for reporting
2022-05-26 12:00:41 +02:00
Jacques Le Roux e539734b75 Fixed: Required field not working on upload type form (OFBIZ-12619)
When trying to submit an upload form with empty required fields, the validation
is not blocked and the submit is made.

Thanks: Leila Mekika

Conflicts handled by hand
2022-05-21 10:36:42 +02:00
Jacques Le Roux 3a32a39a6c Fixed: German Translation - Inv. Nr. (OFBIZ-12618)
Correct abbreviation of invoice number - german.

Thanks: Ingo Wolfmayr
2022-05-17 19:16:37 +02:00
Jacques Le Roux 61efccbca0 Improved: Secure the uploads (OFBIZ-12080)
I did not have these ones, found there
https://github.com/swisskyrepo/PayloadsAllTheThings/blob/master/Methodology%20and%20Resources/Reverse%20Shell%20Cheatsheet.md
and there https://github.com/tennc/webshell
2022-04-25 10:58:24 +02:00
Nicolas Malin c88074d784 Fixed: In place editor wrong enable on display field (OFBIZ-12603)
When, on a form, you set a widget-style on a display field, you activate the inline editor without reason.
The issue comes from HtmlFormMacroLibrary.ftl that initialize some value in a span without control if it's necessary.
2022-04-22 15:32:48 +02:00
Jacques Le Roux a238456f36 Improved: no functional change, fixes a Javadoc issue
SecurityUtil.java:91: error: unknown tag: String
     * @return List<String>
2022-04-22 12:34:44 +02:00
Jacques Le Roux 1663da5a4a Tested: GH Actions and Buildbot Builders are not consistent (OFBIZ-23076)
This is just a try Infra asked about. I have also asked montastic if we can
have 3 different badges. For now I simply backport this one in order to test
all the Buildbot flows.
2022-04-22 12:04:33 +02:00
Jacques Le Roux 1ced939556 Improved: Prevent possible DOS attack done using Java deserialisation (OFBIZ-12592)
In previous commit I used Gradle application plugin and removed the
jvmArguments var used below in build.gradle. This restores jvmArguments, fixes
a problem with mainClassName missing in application plugin, simplifies
applicationDefaultJvmArgs and move ext.ofbizMainClass to a more logical place
2022-04-21 12:02:47 +02:00
Jacques Le Roux b7b2d1fd6f Improved: Prevent possible DOS attack done using Java deserialisation (OFBIZ-12592)
The previous commit was twice wrong:
1. System properties in gradle.properties are not defined using -D but using
systemProp.
2. Anyway systemProp. is defining system properties only available in JVM where
Gradle is running, not the application you run. For that you need to use
applicationDefaultJvmArgs in application in the main build.gradle.

Here is the system property for jdk.serialFilter

Conflicts handled by hand in build.gradle
2022-04-21 06:08:12 +02:00
Jacques Le Roux 5cc45e8701 Fixed: XML Import fails due to security check (OFBIZ-12602)
When importing an entity with "${" in for at least an element it's rejected
because of the security check done to protect from Freemarker unauth attacks
(see OFBIZ-12594).

As suggested by Ingo, allowing users with appropriate permissions seems an
usable solution. We still need to define the "appropriate permissions".
We can start with OFBTOOLS and WEBTOOLS, as it's reported by Ingo, and add
others later if they ever come.

Thanks: Ingo Wolfmayr for report and suggestion
2022-04-20 14:10:49 +02:00
Jacques Le Roux 63ecc059ec Improved: GH Actions and Buildbot Builders are not consistent (INFRA-23076)
Reverts previous commit,
see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
2022-04-18 09:32:48 +02:00
Jacques Le Roux ce84fdb3ca Improved: GH Actions and Buildbot Builders are not consistent (INFRA-23076)
It's now 2 weeks that INFRA-23076 is open, so like 3 weeks that BuildBot is not
working for OFBiz at all.

So far I did not run the integration tests on GH because
* we have it on BuildBot
* it's complicated to show the results

Hopefully BuildBot will soon run the OFBiz builds again. But it does not hurt
to run the integration tests on GH, even w/o the results, because at least it's
easier than running them for each commit locally (takes time) and we can run
them locally once we know there is a problem demonstrated with GH actions.
2022-04-18 09:09:30 +02:00
Giulio Speri c0511d01cb Fixed: ecomm. listing ProductFacility out of stock issue (OFBIZ-12359)
In method filterOutOfStockProducts added case for "virtual" products.
In case a product isVirtual (= Y), then the available inventory count
(lastInventoryCount) is summed up on all its product variants, across
all the ProductFacility records, and then used to determine if the
(parent/virtual) product is in stock or out of stock.

This fix does not check if the facilityId of the ProductFacility
records retrieved is associated and enabled to the ProductStore.

Thanks Nicola Mazzoni for helping in anlyzing this issue.
2022-04-17 23:07:50 +02:00
Jacopo Cappellato ff92c4bc9c Improved: In UtilHttp, for regex processing of urls, replace Java regex with Google RE2J. (#513)
The Main advantage of RE2J is that it guarantees linear time execution.
2022-04-14 07:29:06 +02:00
Jacques Le Roux 16ed130367 Fixed: Test run was unsuccessful because of failing solr tests (OFBIZ-12595)
The previous commit for OFBIZ-12594 was only working on Windows. On *nix OSs
there is no way to reliably get "--test" String from java.class.path property.

Also the previous fix was brittle because relying only on 1 space separating
words.

This fix puts in the SolrDispatchFilter system property at the beginning of the
4 Solr tests and removes it at end of them. That presence can reliably be tested
in ControlFilter that is called before SolrDispatchFilter. It allows to bypass
SecurityUtil::containsFreemarkerInterpolation that would else change the
parameters content type that must be application/x-www-form-urlencoded.
content

Thanks: Tom Pietsch for report and Mart Naum for confirmation

Conflicts handled by hand
2022-04-13 15:00:58 +02:00
Giulio Speri 6789011488 Fixed: inv. reservation places order if not enough qty (OFBIZ-12455)
If quantity not reserved is not 0, requireInventory is set to Y, system
let an order to be placed anyway.

The usage of the service around the project let make an important
assertion: we can consider that also reserveInventory flag of the
ProductStore is Y, since right now is always the caller context that
checks for the reserveInventory flag.

This fix simply returns a specific error to the caller, avoiding the
system to place the order.

Thanks Nicola Mazzoni for helping in debug this issue and Jacopo
Cappellato for the patch review.
2022-04-07 23:40:07 +02:00
Jacques Le Roux bb59eb95b1 Tested: INFRA-23076 2022-04-06 15:16:20 +02:00
Jacques Le Roux 871ce2aa2e Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594)
I did not catch an issue put in by this feature because BuildBot is not running
for few days (see INFRA-23076) and i don't always run tests locally (relying on
BuildBot and GH actions don't run tests).

This is the error Solr tests throw else:
<<Unfortunately, the stream was empty / not available. This may be caused by
another servlet filter calling ServletRequest.getParameter*() before
SolrDispatchFilter>>

Conflicts handled by hand
2022-04-06 13:25:56 +02:00
Jacques Le Roux b24dcff344 Fixed: Prevent Freemarker interpolation in fields (OFBIZ-12594)
I did not catch an issue put in by this feature because BuildBot is not running
for few days (see INFRA-23076) and i don't always run tests locally (relying on
BuildBot and GH actions don't run tests).

This is the error Solr tests throw else:
<<Unfortunately, the stream was empty / not available. This may be caused by
another servlet filter calling ServletRequest.getParameter*() before
SolrDispatchFilter>>

Conflicts handled by hand
2022-04-06 11:28:43 +02:00
Giulio Speri 9a6b54af2e Fixed: multiple facility inventory reservation issue (OFBIZ-12264)
The ProductStore is set up to reserve inventory from more than one
facility, so the flag oneInventoryFacility is set to N.
Flags requireInventory and reserveInventory are both to Y.
Flag allocateInventory is N.

A product can be anyway reserved in a ProductStoreFacility with its
thru date set and past, so is disabled, and if is not present enough
inventory quantity on other facilities.

Added filtering by date on multiple facility code in
reserveStoreInventoryMethod() and on isStoreInventoryAvailable().
This is the first part of the problem resolution; the second part is
accomplished by path to OFBIZ-12455 Jira.

Thanks: Jacques Le Roux and Pierre SMith for Jira feedbacks, Nicola
Mazzoni for helping in bug analaysis and Jacopo Cappellato for path
review.
2022-04-05 23:10:46 +02:00
Jacques Le Roux 3797e60375 Improved: Prevent Freemarker interpolation in fields (OFBIZ-12594)
OFBIZ_12587 is a definitive solution to prevent any kind of Freemarker exploits.
But it's hard to realise because OFBiz exposes objects, like attributes from the
Servlet scopes. So in the meantime preventing Freemarker interpolation in fields
is a pragmatic solution.

This is an improvement but needs to be backported because it kinda affects
security

Conflicts handled by hand
  SeoContextFilter.java
  ControlFilter.java

When I worked with Mathieu I did not measure how it will be hard sometimes to
backport later :/

Also due to checkstyle module to MODULE change is always a pain in the ass :/
2022-04-04 09:32:34 +02:00
Jacques Le Roux 843b1c7e71 Improved: Prevent Freemarker interpolation in fields (OFBIZ-12594)
OFBIZ_12587 is a definitive solution to prevent any kind of Freemarker exploits.
But it's hard to realise because OFBiz exposes objects, like attributes from the
Servlet scopes. So in the meantime preventing Freemarker interpolation in fields
is a pragmatic solution.

This is an improvement but needs to be backported because it kinda affects
security

Conflicts handled by hand
  SeoContextFilter.java
  ControlFilter.java

When I worked with Mathieu I did not measure how it will be hard sometimes to
backport later :/
2022-04-04 09:15:47 +02:00
Jacques Le Roux 56478e4420 Implemented: Restart the ofbiz-vm3 demos server (OFBIZ-22722)
For the next demo to work we need to set the host-headers-allowed to
demo-next.ofbiz.apache.org instead of demo-old.ofbiz.apache.org

Thanks to Drew Foulks for handling the Infra part for us
2022-03-28 18:48:19 +02:00
Jacques Le Roux 3df59b5e6d Improved: Prevent possible DOS attack done using Java deserialisation (OFBIZ-12592)
Qing Xu, a security reporter, alerted us that, despite no current vulnerability,
it could be maybe possible to do DOS attacks using Java deserialisation.

That has been fixed with https://openjdk.java.net/jeps/290 and even implemented
in Java 8, but it needs a little effort on our side, here it is.

There is no real bug, to this is an improvement but a security improvement so it
will be backported

Thanks: Qing Xu for report

Conflicts handled by hand gradle.properties
2022-03-28 12:38:57 +02:00
Michael Brohl 630258751d Improved: Update to log4j 2.17.2 (OFBIZ-12590)
Contains bugfixes and improvements, see
https://logging.apache.org/log4j/2.x/changes-report.html#a2.17.2

This introduces the exclusion of some compile
dependencies (bountycastle bc*-jed14) for the
itext library which interfered with newer
versions from another dependency.
2022-03-23 18:34:57 +01:00
Jacques Le Roux 5e76565b04 Documented: Date picker not initialised in ajax-called form (OFBIZ-12097)
Just adds the missing Jira issue number
2022-03-20 12:01:29 +01:00
Jacques Le Roux c4bd082359 Fixed: Secure the uploads (OFBIZ-12080)
Changes name="upload_file_type_bogus" in EditCategory.ftl and
EditProductContent.ftl to name="up_load_file_type_bogus"

The last line of deniedWebShellTokens in SecuredUpload and similarly in
SecurityUtilTest classes should no have a comma and anti-slash as previous lines.

Also logs when an image contains one of the token in deniedWebShellTokens
2022-03-17 18:11:37 +01:00
Michael Brohl 6cf0c732c1 Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
For changes see https://tomcat.apache.org/tomcat-9.0-doc/changelog.html
2022-03-15 12:26:55 +01:00
Jacques Le Roux 7482dc6966 Fixed: Stored XSS in webappPath parameter from content/control/EditWebSite (OFBIZ-12584)
Adds "webappPath" token in deniedWebShellTokens to definitely fix this issue

Also adds "assign" token  for possible future Freemarker exploits
2022-03-13 21:11:30 +01:00
Jacques Le Roux fd71686e6a Fixed: Secure the uploads (OFBIZ-12080)
Removes non satisfying last line (because images may contain those strings) in
security.properties and SecurityUtilTest.java

In SecuredUpload, renames deniedFileExtensions and deniedWebShellTokens to
respectively getDeniedFileExtensions and getDeniedWebShellTokens
2022-03-06 09:42:41 +01:00
Jacques Le Roux 71adde61b5 Fixed: Remove _PREVIOUS_REQUEST_ Session Attribute on non-authentication pages (OFBIZ-12047)
Demo content website cmssite/cms could not be accessed because in this case
requestUri is null. Like login request it does not need auth, I did not dig
further, here is a simple fix.
2022-03-06 09:18:59 +01:00
Jacques Le Roux d89e8e2789 Fixed: Secure the uploads (OFBIZ-12080)
Removes <svg, replaces by onload,build according to
https://portswigger.net/web-security/cross-site-scripting/cheat-sheet
2022-02-27 22:07:42 +01:00
Jacques Le Roux 3eea7d967d Fixed: Stored XSS in webappPath parameter from content/control/EditWebSite (OFBIZ-12584)
Fixes compiles issues put in with last commit
2022-02-27 22:07:18 +01:00
Jacques Le Roux 06006f1666 Fixed: Stored XSS in webappPath parameter from content/control/EditWebSite (OFBIZ-12584)
Adds <<",","+",',','+'>> to deniedWebShellTokens as an obviously non satisfying
(because images may contain those strings, I checked) temporary solution before
looking at Freemarker::WhitelistMemberAccessPolicy as suggested by Matei

Thanks to Matei "Mal" Badanoiu for reporting this post-auth vulnerabily
2022-02-27 18:27:49 +01:00
Jacques Le Roux f289a80749 Fixed: Secure the uploads (OFBIZ-12080)
Just occurred to my mind that I forgot to lower case the tokens in
DENIEDWEBSHELLTOKENS when checking with SecuredUpload::isValidText
2022-02-27 15:43:17 +01:00
Jacques Le Roux 247b8713ba Fixed: Stored XSS in webappPath parameter from content/control/EditWebSite (OFBIZ-12584)
A user with rights to modify and/or create websites may insert malicious HTML
elements in the “webappPath” parameter from content/control/EditWebSite
resulting in XSS.

In order to trigger the XSS a victim needs to navigate to main page of the
modified website (eg webpos or ecommerce) and interact with the malicious
HTML elements (eg trigger the “onmouseover” event by navigating with the mouse
over the “form” and/or “a” tags).

Thanks to Matei "Mal" Badanoiu for reporting this post-auth vulnerabily

Conflicts handled by hand in EntityAutoEngine.java
2022-02-27 13:39:09 +01:00
Jacques Le Roux 34d68d5f6f Improved: Reflected XSS in content component (OFBIZ-11840)
This was already fixed but we can do better by using SecuredUpload::isValidText

Also grabs some tokens to security.properties::deniedWebShellTokens from
DataEvents.java, and adds "alert" even it's harmless as is, as it's often used
by attackers to demonstrate issues, so will earn time.

Though an improvement, I backport as it's related to security

Conflicts handled by hand in data/DataEvents.java
2022-02-27 13:37:58 +01:00
Jacques Le Roux 6da27fd220 Fixed: Secure the uploads (OFBIZ-12080)
Checks that the content of SecuredUpload::isValidText is not null,
else returns false

Suspenders and belt type of fix.
2022-02-25 12:08:41 +01:00
Jacques Le Roux f65410ba1d Fixed: Prevent post-Auth vulnerability: FreeMarker Bypass (OFBIZ-12582)
By inserting malicious content in the “Text” field from
“/content/control/updateLayoutSubContent” -> “Templates”, an attacker may
perform SSTI (Server-Side Template Injection) attacks, which can leverage
FreeMarker exposed objects to bypass restrictions and obtain RCE (Remote Code
Execution).

This fixes it by calling SecuredUpload::isValidText on the “Text” field content.
I'll check that there are no other attack opportunities...

Thanks: Mal Aware <awaremal@gmail.com> for reporting this post-auth vulnerabily

Conflicts handled by hand in ContentManagementServices.java
2022-02-23 12:01:04 +01:00
Jacques Le Roux 0de23fa780 Fixed: Secure the uploads (OFBIZ-12080)
Adds some tokens in security.properties::deniedWebShellTokens
Updates SecurityUtilTest::webShellTokensTesting accordingly

# Conflicts handled by hand
 framework/security/config/security.properties
 framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java
2022-02-23 12:01:04 +01:00
Jacques Le Roux d54abff8c2 Fixed: Trivial change in ProgramExport.groovy, uses the SecuredUpload import
No Functional change

Conflicts handled by hand in ProgramExport.groovy
2022-02-23 12:01:03 +01:00
Benjamin Jugl 1ed929cfc6 Fixed: Induction from DB does not represent relations properly.
(OFBIZ-12178)
2022-02-22 22:53:11 +01:00
Jacques Le Roux c638ec26f8 Fixed: Secure the uploads (OFBIZ-12080)
Trivial change in DataServices.java: uses the SecuredUpload import in 2 places
it was missing.

Adds some tokens in security.properties::deniedWebShellTokens
Removes a duplicated htaccess in security.properties::deniedFileExtensions
2022-02-21 17:15:44 +01:00
Jacques Le Roux 50fc66c8e0 Fixed: Secure the uploads (OFBIZ-12080)
Last commits put in an issue in DataServices.java and GroovyBaseScript.groovy.
I should have used SecuredUpload::isValidFileName with dataResourceName and
SecuredUpload::isValidFile  with objectInfo. This fixes that.

Also fixes formatting checkstyle issues in SecuredUpload class and move allow
all and check line length in right places (it's about content)
2022-02-20 15:43:08 +01:00
Jacques Le Roux 668e801ada Improved: Secure the uploads (OFBIZ-12080)
In security.properties, adds some deniedFileExtensions and improves few comments
(easier to merge later)

In  DataServices::createFileNoPerm filters file upload to verify the filename
before the content is checked if necessary

Manually merges SecuredUpload.java based on trunk
2022-02-19 11:37:43 +01:00
Jacques Le Roux e29e9a288a Fixed: no functional change, increase checkstyle maxErrors from 38525 to 50000
We don't care about maxerrors in 18.12. It's correctly handled in 22.01 and
that's enough. This simplify devs work and it can uselessly disturb users
2022-02-19 10:03:24 +01:00
Jacques Le Roux 4d68d1e92e Fixed: Secure the uploads (OFBIZ-12080)
Prevents billions laugh attacks
2022-02-18 15:45:43 +01:00
Jacques Le Roux 40e525aba4 Fixed: Secure the uploads (OFBIZ-12080)
In previous comment, to prevent linked images inside SVG I used xlink:href
That's no good, it must be followed by <<="http">>, this does it. Else a lot
of SVP images would not be loadable. Because xlink:href can be used in other
cases.
2022-02-18 15:34:03 +01:00
Jacques Le Roux cb5c385286 Improved: Create a deny list to reject webshell tokens (OFBIZ-12324)
Prevents CSV injection (MS Excel or Open Office)
2022-02-18 13:51:51 +01:00
Jacques Le Roux bc0363f12d Fixed: Secure the uploads (OFBIZ-12080)
Prevents
* too long lines (10 000) by default
* linked images inside SVG

Adds a comment about double extensions not allowed
2022-02-17 18:55:56 +01:00
Jacques Le Roux 2405ca77a5 Improved: Error in uploading very large files, ie >2GB (OFBIZ-11534)
I reopened, forgot that you need to set -PjvmArgs, as I commented before:
<<For a 2GB+ file you need to set Xmx to more than the double of the file size,
eg: gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx5048M">>

This also adds information in security.properties:
<<By default (OOTB) OFBiz is protected against Large File Denial of Service>>
2022-02-16 17:28:47 +01:00
Jacques Le Roux afd3c36b5f Improved: Create a deny list to reject webshell tokens (OFBIZ-12324)
After reviewing https://github.com/nsacyber/Mitigating-Web-Shells this mostly
adds as tokens the "Linux applications commonly used by attackers and rarely
launched by benign Apache applications"
2022-02-15 08:03:37 +01:00
Jacques Le Roux 61e8ae2f1e Improved: Create a deny list to reject webshell tokens (OFBIZ-12324)
After reviewing https://docs.oracle.com/cd/B14099_19/web.1012/b14014/jspxml.htm,
since we use "<jsp:" this removes "scriptlet>", "declaration>" and "expression>".
They are redundant with "<jsp:"; "<jsp:" covers those already.

Also adds eval( for js and shrinks base64_decode to decode, and processbuilder
to process because of OFBIZ 12571

I always test the denied tokens against a lib of  images with 33 600 elements (
3.99 GB). If an image contains the token it can't be in the denied list.
2022-02-14 13:18:31 +01:00
Jacques Le Roux d4834a0e3a Fixed: CLONE - [SECURITY] Upgrade Tika to 1.28.1 (OFBIZ-12573)
Simpler for now, later OFBIZ 12573 needs to be done
Also formatting improvement in DataResourceWorker.java: removes a blank lines

Thanks: Tim Allison <tallison@apache.org> for the nice exchanges :)
2022-02-12 11:45:06 +01:00
Jacques Le Roux 9e5fe10736 Fixed: Groovy denied list bypass causes post-auth RCE from webtools/control/ProgramExport (OFBIZ-12571)
The 1st issue was due to use of processbuilder token. It has been added to
deniedWebShellTokens in security.properties by f2cf262 commit for OFBIZ 11948
The tokens function (for js) and class have been added since while browsing
https://github.com/tennc/webshell

As mention the related deniedWebShellTokens TODO comment: "TODO.... to be continued
with known webshell contents... a complete allow list is impossible anyway...

So, later a deeper review of Groovy sandbox possibilities will be done..

Thanks: Y4er for report
2022-02-11 11:02:16 +01:00
Jacques Le Roux 43fe479e58 Fixed: no functional change, increase checkstyle maxErrors from 38515 to 38525
Anyway we don't care about 10/38525
2022-02-10 18:14:36 +01:00
Jacques Le Roux 0a25c932ac Fixed: Remote Code Execution (File Upload) Vulnerability (OFBIZ-11948)
This fixes and improves file upload.

Refactor a bit SecuredUpload class and fixes:
Prevent double extensions
Check extensions
Improves getMimeTypeFromFileName() by checking is file exists
In isValidImageFile() finally use isValidText() bypassing encoding

Completely refactor deniedWebShellTokens in security.properties by re-adding
removed tokens in last commit and adding several new ones. I have still to check
encoded, encrypted and obfuscated webshells)
Modifies SecurityUtilTest::webShellTokensTesting accordingly
While at it better format commonsImagingSupportedFormats, deniedFileExtensions
and imagejSupportedFormats properties for legibility.

Check if createAnonFile service is used in GroovyBaseScript.groovy and if a
complete file name is used (file exist) check, using SecuredUpload, extensions
and prevent double extensions, actually check all the file and stop there.

Adds some "Check if a webshell is not uploaded" comments in
ContentManagementServices.java
DataServices.java
ScaleImage.java
FrameImage.java
ImageManagementServices.java
ProductServices.java
HttpRequestFileUpload.java
ProgramExport.groovy

Trivial comments fixes in catalog.properties

Also fixes OFBIZ 12571 (I use here a space because of pending INFRA 22843)
by simply adding processbuilder to deniedWebShellTokens

Conflicts handled by hand
 framework/security/config/security.properties
 framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
 framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java
 framework/service/src/main/groovy/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy
 framework/webtools/groovyScripts/entity/ProgramExport.groovy (reverted)
2022-02-10 14:16:47 +01:00
Jacques Le Roux dcb348e5b6 Improved: Possible authenticated attack related to Tomcat CVE-2020-1938 (OFBIZ-12558)
As reported by Michael, secretRequired value must be false because secret value
is empty. Else a notifying message appears in log saying that AJP is not available.

This uncomment out secretRequired, so its value is now false, and document more
notably about that. I'll later add more information in the
https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure wiki page

Thanks: Michael for report
2022-02-10 14:02:53 +01:00
Jacques Le Roux 03bc88dd15 Improved: no functional trivial cleaning changes
Removes useless menu-name="secondary" for common-theme webapp
Removes now useless runtime/patches directory. It was only used with Ant
2022-02-10 14:02:53 +01:00
Jacques Le Roux 61ddf046a5 Documented: Possible authenticated attack related to Tomcat CVE-2020-1938 (OFBIZ-12558)
Explains that the current AJP config works only for localhost
2022-02-10 14:02:53 +01:00
Jacques Le Roux 047849f42b Fixed: Remote Code Execution (File Upload) Vulnerability (OFBIZ-11948)
In SecuredUpload::isValidImageFile I initially used isValidText() and thought
that decoding would be better so finally used isValidTextFile() instead. But
then valid images files are not passing. So this replaces isValidTextFile by
isValidText there.

Also while at it removes few other PHP tokens, now useless (hopefully, I have
still to check encoded and encrypted PHP webshells), from
security::deniedWebShellTokens. The less tokens we have the better the whole is
legible.
Improves related comments.

Modifies SecurityUtilTest::webShellTokensTesting accordingly

Conflicts handled by hand
 framework/security/config/security.properties
 framework/security/src/test/java/org/apache/ofbiz/security/SecurityUtilTest.java
2022-02-05 10:19:46 +01:00
Jacques Le Roux 9967d30caa Improved: Remote Code Execution (File Upload) Vulnerability (OFBIZ-11948)
Previous commit added one checkstyle issue to the already 39 still existing in
R18, not a big deal. This just allows checkstyle to pass (maxErrors from 38514
to 38515)
2022-02-04 14:51:19 +01:00
Jacques Le Roux 4ab4b15ade Fixed: Possible authenticated attack related to Tomcat CVE-2020-1938 (OFBIZ-12558)
Despite OFBIZ-11407, the 2 values secretRequired and especially
allowedRequestAttributesPattern are commented out because of OFBIZ-12558

The Tomcat default values will be used as recommended by
https://tomcat.apache.org/tomcat-9.0-doc/config/ajp.html#Introduction
This is in relation with
https://tomcat.apache.org/security-9.html#Fixed_in_Apache_Tomcat_9.0.31
and
https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Connectors

Thanks: Lion Tree for report

Conflicts handled by hand in framework/catalina/ofbiz-component.xml
2022-02-04 12:30:34 +01:00
Jacques Le Roux e7955fc064 Fixed: Remote Code Execution (File Upload) Vulnerability (OFBIZ-11948)
Lion Tree <liontree0110@gmail.com> has reported us that
"CVE-2020-1938 is not fully fixed".

Though it was fixed by OFBIZ-11407, it still possible for an authenticated user
to upload a webshell included in an image using one of the upload possibilities
in OFBiz. That is not new and covered by OFBIZ-12080 "Secure the uploads", but
was still incomplete.

This enforces the secured uploads by
* checking in SecuredUpload::isValidImageFile that a webshell is not embedded in
an image.
* Keeping only "<%" as a denied token for JSP webshells, instead of currently
"<%@ page"
* Adds "application/text/x-ruby" to SecuredUpload::isExecutable

Also
* Adds "<jsp", and "<?" for PHP. Even if OFBiz does not use PHP at all,
it's often installed on servers.
* Removes "import=\"java" and "runtime.getruntime().exec(". They are no
longer useful since "<%" and "<jsp" block them.
* Remove php token since I'll put "<?" in.
* Adds "#!", rather than adding other shebangs like perl,python and ruby

This will make deniedWebShellTokens more understandable.

But I'm conscious that despite SecuredUpload::isExecutableI I still need to
better handle encoded webshells. I'll do that soon in a second approach.

I'll also certainly more prune PHP related tokens.

Thanks: Lion Tree for report
2022-02-04 12:14:04 +01:00
Jacques Le Roux 77a2c747b0 Improved: no functional change, adds a BuildBot badge (INFRA-22807)
It works locally (once you have installed Ruby, asciidoctor and
asciidoctor-diagram), I see status is currently unknown, fine
2022-02-03 11:40:35 +01:00
Nicolas Malin fb95c796bb Fixed: Attribute default-field-type hidden doesn't work for auto-fields-service element (OFBIZ-12555)
When you define a widget form and wish populate hidden fields with the element auto-fields-service, OFBiz rendering each as edit field type.

    <form name="ListPartyQuals" ...>
        <auto-fields-service service-name="updatePartyQual" default-field-type="hidden"/>
    </form>

The problem came from the function ModelFormFieldBuilder.induceFieldInfoFromServiceParam didn't manage the case "hidden"
2022-02-03 11:24:56 +01:00
Jacques Le Roux 6871ef0c9c Fixed: View for ViewBinaryDataResource missing (OFBIZ-12552)
The view definition for ViewBinaryDataResource is missing.
Goto: /content/control/EditDataResource?dataResourceId=GZ-DIG
Click the "Download"-Button.

Thanks: Ingo Wolfmayr for the patch

Conflicts handled by hand
2022-02-01 13:25:11 +01:00
Jacques Le Roux 702fde61bb Fixed: Manufacturing Jobshop find screen by default does not show all production runs (OFBIZ-12550)
The manufacturing jobshop find screen has the seach date initialized to nowdate.
if one wants to see all production runs, one has to clear the date which should
be empty initially

The same problem exists on the MRP log find where the date is filled by default.

Thanks: Hans for report and patches
2022-02-01 08:58:53 +01:00
Jacques Le Roux 27a9f3fe72 Fixed: [SECURITY] CVE-2022-23437: Infinite loop within Apache XercesJ xml parser (OFBIZ-12549)
Severity: high

Description:

There's a vulnerability within the Apache Xerces Java (XercesJ) XML
parser when handling specially crafted XML document payloads. This
causes, the XercesJ XML parser to wait in an infinite loop, which may
sometimes consume system resources for prolonged duration. This
vulnerability is present within XercesJ version 2.12.1 and the
previous versions.

Mitigation:

Apache XercesJ users, should migrate to version 2.12.2

Credit:

This issue was discovered by Sergey Temnikov and Ziyi Luo, from Amazon
Corretto/JDK Team

References:

https://markmail.org/message/vcmhwbuorfgcdr6l

jleroux: I already removed the "apache-" prefix but for a reason did not commit
2022-01-31 18:09:28 +01:00
Jacques Le Roux accec0efdd Fixed: [SECURITY] CVE-2022-23437: Infinite loop within Apache XercesJ xml parser (OFBIZ-12549)
Severity: high

Description:

There's a vulnerability within the Apache Xerces Java (XercesJ) XML
parser when handling specially crafted XML document payloads. This
causes, the XercesJ XML parser to wait in an infinite loop, which may
sometimes consume system resources for prolonged duration. This
vulnerability is present within XercesJ version 2.12.1 and the
previous versions.

Mitigation:

Apache XercesJ users, should migrate to version 2.12.2

Credit:

This issue was discovered by Sergey Temnikov and Ziyi Luo, from Amazon
Corretto/JDK Team

References:

https://markmail.org/message/vcmhwbuorfgcdr6l
2022-01-31 17:11:51 +01:00
Jacques Le Roux c8cee7a86e Fixed: Wrong Field Name Definition in RequirementForms (OFBIZ-12505)
The issue exists also in the older version.

The field "requirementByDate" form "FindApprovedProductRequirements" in
RequirementForms.xml has been set wrongly and it should be "requiredByDate".

This causes the result could not be queried out properly as indicated as below:

The result is governed by the service "getRequirementsForSupplier",
where reads the list from the view "RequirementAndRole".
In the view entity definition, the field is defined as
<alias entity-alias="RQ" name="requiredByDate"/>,
but it is not the case in the form "FindApprovedProductRequirements" above.

After changing it to the correct name, the bug is solved.

jleroux: Same exists in OrderEntryForms::FindRequirements

Thanks: Schumann Ye for report Pierre Smits for creating the initial PR494
2022-01-31 12:25:27 +01:00
Jacques Le Roux c12a801d7b Fixed: Attribute 'placeholder' is not allowed to appear in element 'text'
Completes the previous fix by Wei Zhang. This was committed at a wrong place
for OFBIZ-5341. Only text was concerned, not date-time
2022-01-29 10:57:49 +01:00
Jacques Le Roux 40e89450ae Fixed: Upgrade Tomcat from 9.0.54 to 9.0.58 (OFBIZ-12539)
The fix for bug CVE-2020-9484 introduced a time of check, time of use
vulnerability that allowed a local attacker to perform actions with the
privileges of the user that the Tomcat process is using. This issue is only
exploitable when Tomcat is configured to persist sessions using the FileStore.
2022-01-26 13:09:27 +01:00
Jacques Le Roux 243127fc92 Improved: no functional change, removes tests in GH actions
Adding testIntegration in the GH Gradle process does not work.

For a reason I'll not dig in, it ALWAYS fails at:
Cannot find service [indexProductsFromContent] location class
(org.apache.ofbiz.content.search.SearchServices)
2022-01-15 12:14:35 +01:00
Jacques Le Roux 0962230091 Improved: no functional change, add tests to GH actions
Buildbot is stale at the moment and it's better to not rely only on it.
This adds testIntegration to the GH Gradle process
2022-01-15 10:01:41 +01:00
Jacques Le Roux 5132a0653d Documented: Gradle Wrapper is not downloaded with 18.12.03 (OFBIZ-12471)
This complements previous commit:
<<After another issue reported today by Steven Payne on user ML about the
execution policy of PowerShell7, rather than using the pwsh path I document in
README.adoc solutions for cases we crossed so far.>>
with also trivial formatting.

Thanks: David S Hunter and Steven Payne for reports on user ML
2022-01-04 10:35:42 +01:00
Jacques Le Roux cb7955da16 Fixed: Gradle Wrapper is not downloaded with 18.12.03 (OFBIZ-12471)
After another issue reported today by Steven Payne on user ML about the
execution policy of PowerShell7, rather than using the pwsh path I document in
README.adoc solutions for cases we crossed so far.

Moreover I noticed today that my previous fix was not enough. "pwsh" was used
twice in the cmd line!

Thanks: David S Hunter and Steven Payne for reports on user ML
2022-01-03 18:49:41 +01:00
Nicolas Malin 49483e8a7a Fixed: Screen Xml renderer failed on renderContainer[Begin,End] ftl macro (OFBIZ-12478)
This complete the previous Improvement, Rendering different HTML container types with ScreenRenderer (OFBIZ-10495), where the xml macro are forgotten.

In same time resynchronise also missing macro renderColumn*
2022-01-03 10:23:41 +01:00
Jacques Le Roux bd95879141 Improved: updates NOTICE to 2022 2022-01-02 19:39:39 +01:00
Jacques Le Roux 0ff3ff00f1 Fixed: CheckStyleMain Task is Failing in 18.12.04 (OFBIZ-12473)
Puts back the real maxErrors value: 38514
2022-01-02 15:34:15 +01:00
Jacques Le Roux 817c596e2c Fixed: CheckStyleMain Task is Failing in 18.12.04 (OFBIZ-12473)
Because of Windows EOL difference with *nix, despite the number for maxErrors
being more around 39600+ we temporarily put 50000 here to avoid issue when
releasing. Just increasing the number of lines is the problem.

The problem was already fixed in trunk by allowing all types of EOL, ie using
NewlineAtEndOfFile value="lf_cr_crlf"
2022-01-02 10:20:11 +01:00
Jacques Le Roux b3d8434f36 Fixed: CheckStyleMain Task is Failing in 18.12.04 (OFBIZ-12473)
Because of Windows EOL difference with *nix, despite the number for maxErrors
being more around 39600+ we temporarily put 50000 here to avoid issue when
releasing. Just increasing the number of lines is the problem.
2022-01-02 10:05:49 +01:00
Jacques Le Roux 71c853fe82 Documented: no reason to have a "+" there, on same line is OK
Also to test RAT for stable again (weird it did not work last time)
2022-01-01 18:24:09 +01:00
Jacques Le Roux 7809b73583 Improved: README.PDF is not generated by BuildBot nor locally (OFBIZ-12476)
This only adds pending changes for PDF files and add a link to HTML files
Also allows to test new stable RAT BuildBot build
2022-01-01 13:13:47 +01:00
Jacques Le Roux 61c28602c2 Documented: misc. trivial updates in README.adoc
Notably removes reference to SVN
Updates link to README no longer on site but on https://nightlies.apache.org/ofbiz/
2021-12-31 08:17:50 +01:00
Jacques Le Roux 90d93d5e99 Documented: just adds a sub-title about clean and add data (as in trunk)
==== Clean system and load the complete OFBiz data
2021-12-30 20:59:34 +01:00
Jacques Le Roux 87eb402bcd Improved: add information about paths in Windows (no spaces in path for JDK) 2021-12-30 14:27:44 +01:00
Jacques Le Roux 015f60f982 Improved: Removes montastic badge, it does not reflect the reality 2021-12-30 10:44:53 +01:00
Jacques Le Roux 9020f03390 Improved: Migrate Ofbiz bb 0.8 config to 3.2 (OFBIZ-12456)
No functional change (removes a space in VERSION file) to check last changes in new
Buildbot config.

I think I found the syntax issue, let's see
2021-12-29 19:13:22 +01:00
Jacques Le Roux dc9d71fe3b Improved: Migrate Ofbiz bb 0.8 config to 3.2 (OFBIZ-12456)
No functional change (adds a space in VERSION file) to check last changes in new
Buildbot config.

It seems there is a syntax issue somewhere...
2021-12-29 19:04:30 +01:00
Jacques Le Roux d38ff24cf3 Improved: suppresses 2 warnings related to deprecated CSVFormat.DEFAULT.withHeader()
InvoiceServices merge "did not went well"
2021-12-29 18:36:30 +01:00
Jacques Le Roux c4088961d3 Improved: suppresses 2 warnings related to deprecated CSVFormat.DEFAULT.withHeader()
This was not done correctly last time (previous commit e4d4329)
2021-12-29 08:58:49 +01:00
Jacques Le Roux 9853d10bd9 Improved: suppresses 2 warnings related to deprecated CSVFormat.DEFAULT.withHeader()
Also adds a try-with-ressource in InvoiceServices::importInvoice to properly
close csvReader on returns. Hence removes an useless csvReader.close().

Several comments about Eclipse giving wrong advice
<<Resource leak: '<unassigned Closeable value>' is not closed at this location>>
It's OK, we are inside try-with-ressources.

Finally removes a redundant final in PartyServices::importParty

Conflicts in InvoiceServices.java handled by hand
2021-12-29 08:58:39 +01:00
Jacques Le Roux 5b6e427f24 Fixed: [SECURITY] CVE-2021-44832: Apache Log4j2 (OFBIZ-12475)
See complete explanation at https://issues.apache.org/jira/browse/OFBIZ-12475
2021-12-29 08:53:50 +01:00
Jacques Le Roux 0d8de91657 Fixed: Gradle Wrapper is not downloaded with 18.12.03 (OFBIZ-12471)
I guess for a reason David misses the path to WindowsPowerShell as an
environment variable.

Follows advice here:
https://stackoverflow.com/questions/29778121/powershell-is-not-recognized-as-an-internal-or-external-command-operable-progr

Thanks: David S Hunter for report
2021-12-26 14:55:57 +01:00
Jacques Le Roux e5b5075126 Fixed: [SECURITY] Update TIka because of Apache Log4j2 vulnerability (OFBIZ-12474)
Apache Tika 1.28 contains a migration to log4j2 (2.17.0) from log4j
as well as several other dependency upgrades. Details can be found in
the changes file:
https://www.apache.org/dist/tika/1.28/CHANGES-1.28.txt
2021-12-24 08:15:19 +01:00
Jacques Le Roux 99441469dc Fixed: CheckStyleMain Task is Failing in 18.12.04 (OFBIZ-12473)
On Windows checkstyle reports that it misses a NewLine at EOF for all files, not
on *nix

Currently:
1. We don't care about checkstyle in branches (we will in 22.01 where it'll 0 errors)
2. Proof is we check for 38802 but the errors are actually 38508 in *nix

Solution: change from 38802 to 39638 to pass also on Windows

Thanks: David S Hunter for report
2021-12-22 17:29:57 +01:00
Jacques Le Roux ddc238a49d Fixed: Bug in HtmlFormMacroLibrary.ftl::makeHyperlinkString macro (OFBIZ-12468)
Fixes a typo I already fixed in trunk but forgot in demo
2021-12-19 10:29:21 +01:00
Jacques Le Roux 4cff613b18 Fixed: [SECURITY] CVE-2021-45105: Apache Log4j2 (OFBIZ-12470)
The configuration seems to have changed.

log4j-slf4j18-impl available in Maven as 2.16.0 is not in 2.17.0.
Also log4j-web is now needed. In R18 as compile when in trunk as readonly...

I was guided by this block in console.log of trunk demo:
Caused by: java.lang.NoClassDefFoundError: org/apache/logging/log4j/core/util/SetUtils
	at org.apache.logging.log4j.web.Log4jWebInitializerImpl.getConfigURI(Log4jWebInitializerImpl.java:196)
	at org.apache.logging.log4j.web.Log4jWebInitializerImpl.initializeNonJndi(Log4jWebInitializerImpl.java:175)
	at org.apache.logging.log4j.web.Log4jWebInitializerImpl.start(Log4jWebInitializerImpl.java:112)
	at org.apache.logging.log4j.web.Log4jServletContainerInitializer.onStartup(Log4jServletContainerInitializer.java:57)
	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5219)
	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:183)

I'll dbl-check why, notably about log4j-slf4j18-impl.
At least it works well like that.
2021-12-19 08:59:42 +01:00
Jacques Le Roux 4442c2adca Fixed: [SECURITY] CVE-2021-45105: Apache Log4j2 (OFBIZ-12470)
CVE-2021-45105: Apache Log4j2 versions 2.0-alpha1 through 2.16.0 does not protect
from uncontrolled recursion from self-referential lookups. This allows an
attacker with control over Thread Context Map data to cause a denial of service
when a crafted string is interpreted.
This issue is fixed in Log4j 2.17.0.:
https://logging.apache.org/log4j/2.x/security.html
2021-12-19 03:30:49 +01:00
Jacques Le Roux 80262418fd Fixed: Bug in HtmlFormMacroLibrary.ftl::makeHyperlinkString macro (OFBIZ-12468)
I was unable to reproduce the error, but according to
https://stackoverflow.com/questions/51524640/why-does-freemarkers-built-in-is-string-return-true-for-an-object
The solution is to check for targetParameters not being an hash

Actually this was not the reason of the 1.7GB console log, another Jira to come
2021-12-18 11:48:21 +01:00
Jacques Le Roux a48938982d Improved: Migrate Ofbiz bb 0.8 config to 3.2 (OFBIZ-12456)
Comment out the XMLRPC tests. This alone should allow Buildbot 3.2 to run the
integration tests.

Conflict handled by hand
2021-12-16 07:11:01 +01:00
Jacques Le Roux 901ca14f44 Improved: no functional change, update /lib/README to use Maven search 2021-12-16 06:52:26 +01:00
Jacques Le Roux a42ea2bdb4 Improved: no functional change, link to Gradle and CodeQl workflows were wrong in badge
This allows now users to get directly to these workflows by clicking on the icon
2021-12-16 06:47:29 +01:00
Jacques Le Roux e2026b6a50 Improved: no functional change, link to repo was wrong in badge
This allows now users to get directly to the repo by clicking on the icon
2021-12-15 17:11:41 +01:00
Jacques Le Roux e83559d151 Improved: Apache Log4j2 (OFBIZ-12449)
Updates log4j2 from 2.15.0 to 2.16.0 because of
https://lists.apache.org/thread/d6v4r6nosxysyq9rvnr779336yf0woz4

It's not a security issue, I lazily use OFBIZ-12449 because it can improve
security even if it's not necessary (dixit the announce)
2021-12-14 12:29:32 +01:00
Mathieu Lirzin 4d43e6ed87 Fixed: All local XML schema files are now present in classpath, Backport form trunk
(OFBIZ-11132) (OFBIZ-12437)

Previously there was some warnings about missing “.xsd” files that
‘UtilXml#resolveEntity’ failed to find in classpath.  This has been
fixed by declaring all “dtd” directories inside components as resources.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862346 13f79535-47bb-0310-9956-ffa450edef68
2021-12-12 12:07:40 +01:00
Jacques Le Roux bccf14066c Fixed: [SECURITY] CVE-2021-44228: Apache Log4j2 (OFBIZ-12449)
CVE-2021-44228: Apache Log4j2 JNDI features do not protect against attacker
controlled LDAP and other JNDI related endpoints:
https://logging.apache.org/log4j/2.x/security.html

I'm not sure we are concerned, have no time to check, better safe than sorry...
2021-12-11 17:37:33 +01:00
Jacques Le Roux 14f7feda74 Improved: The SARIF file generated by CodeQL for Java classes is too large (OFBIZ-12361)
It still does not work
2021-11-23 13:25:29 +01:00
Jacques Le Roux d5883a855d Improved: Try to reduce the SARIF file used by CodeQL for Java classes (OFBIZ-12361)
According to
https://github.com/github/vscode-codeql/pull/1004
https://github.com/github/vscode-codeql/issues/735
this should now work. Let's try...
2021-11-23 11:32:08 +01:00
rohitkouandRohit Koushal 2222bd21b7 Fixed: CVE-2021-37608 vulnerability bypass (OFBIZ-12307) (#352)
Fixed the Additional image uploading issue which got somehow missed in service addAdditionalViewForProduct.

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