(OFBIZ-5028)
To escape exception on native conversion, we add converter for StringBuffer and StringWrapper on MiscConverters
Thanks to Christoph Neuroth for this issue
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857371 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9855)
Uses try with resources for File IO objects like ObjectInputStream and other
objects. File classes have the AutoCloseable interface.
jleroux: this is only a part of the 2nd patch. The 1st patch will be committed
soon too...
All tests pass
Thanks: Pradhan Yash Sharma
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857099 13f79535-47bb-0310-9956-ffa450edef68
‘java.io.ObjectInputStream’ already implements the ‘AutoCloseable’
interface, so there is no need to declare it in
‘SafeObjectInputStream’ which extends this class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857088 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10817)
When freemarker failed to execute a template, you have on end screen rendered all java stack trace generated.
I improve this to display the stack trace only when widget is on verbose, no regression during development and when you switch to production site, in general your widget verbose is off so end user haven't stack trace and replace it by ∎ (that totally unused for them but help to detect a problem).
I also introduce two new properties on widget.properties:
widget.freemarker.template.verbose : if your widget verbose is off and you want display the freemarker stacktrace when your template generate an exception set it to true
widget.freemarker.template.exception.message : when you don't displaying freemarker stacktrace, you can replace it by an other message by default it use ∎ but you can set what you want, like 'ERROR', '##' or ' '
Thanks to Deepak Dixit, Jacques Le Roux, Michael Brohl and Mathieu Lirzin for their suggest
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856524 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Ed Mack
This adds
org.apache.ofbiz.widget.model.ModelTheme
java.util.Collections
java.util.LinkedList
java.util.ArrayList
java.util.TimeZonz
Thanks: Ed Mack at OFBIZ-10876
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856484 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
There was a recurring typo in previous commit.
For arrays of primitives it should be
"\\[Z","\\[B","\\[S","\\[I","\\[J","\\[F","\\[D","\\[C"
and not
"[Z","[B","[S","[I","[J","[F","[D","[C"
It shows how tired I'm :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856460 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
There was a recurring typo in previous commit.
For arrays of primitives it should be
"[Z","[B","[S","[I","[J","[F","[D","[C"
and not
"[Z ","[B ","[S ","[I ","[J ","[F ","[D ","[C "
Just spotted that while reviewing again (did not have the time to test)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856459 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Ed Mack
This adds all arrays of primitives and java.math.BigDecimal
Thanks: Ed Mack at OFBIZ-10876
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856455 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Wolfgang Rauchholz on user
ML
This adds java.math.BigDecimal and "[B" (ie [B == byte[] and I don't understand
why in this case "byte[]" does not work)
It seems the warning in SafeObjectInputStream::resolveClass is not enough.
Anyway I'll not change it.
Thanks: Ingo Wolfmayr at OFBIZ-10870
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856405 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10832)
Since most nodes will contain text then it will be more efficient to do a null check after retrieving nodeValue.
Thanks: Scott for your valuable inputs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855898 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Wolfgang Rauchholz on user
ML
This adds java.util.Date
It seems the warning in SafeObjectInputStream::resolveClass is not enough.
Anyway I'll not change it.
Thanks: Wolfgang Rauchholz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855492 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Wolfgang Rauchholz on user
ML
This adds java.sql.Timestamp
It seems the warning in SafeObjectInputStream::resolveClass is not enough.
Anyway I'll not change it.
Thanks: Wolfgang Rauchholz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855488 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10832)
As per the code, getTextContent() method is used get text content of the node and its descendants but the node.getTextContent() always return Null for the following Node type
DOCUMENT_NODE, DOCUMENT_TYPE_NODE, NOTATION_NODE [1]
Since we can't get the text value of Document, Document Type and Notation Node, thus simply return the same object.
[1] https://docs.oracle.com/javase/7/docs/api/org/w3c/dom/Node.html#getTextContent()
Thanks: Deepak Dixit for reviewing the code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855403 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Deepak at OFBIZ-10837
This adds sun.util.calendar.ZoneInfo
It seems the warning in SafeObjectInputStream::resolveClass is not enough.
Anyway I'll not change it.
Thanks: Deepak Dexit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855371 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list was still not complete as reported by Rohit at OFBIZ-10573
This adds FlexibleStringExpander
It seems the warning in SafeObjectInputStream::resolveClass is not enough.
Anyway I'll not change it.
Thanks: Rohit Koushal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1855287 13f79535-47bb-0310-9956-ffa450edef68
‘ScriptHelper’ is a mechanism used to add some useful bindings to
scripts. This feature has been introduced in revision 1299924 by
Adrian Crum as part of an general effort of supporting the Generic
Scripting Engine specified by JSR-223.
Previously this mechanism was extensible, however it appears to be
undesirable (nor used in practice) to extend the bindings available to
services since the internal service implementations are highly coupled
to those bindings. As a consequence the usage of the Abstract Factory
pattern which was used for that purpose is now removed.
The side effect of this change is that we have now simpler code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854668 13f79535-47bb-0310-9956-ffa450edef68
The ‘parseClass(InputStream in, String location)’ and
‘parseClass(InputStream in, String location, GroovyClassLoader
groovyClassLoader)’ methods from GroovyUtil are now merged in a
private and documented method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854663 13f79535-47bb-0310-9956-ffa450edef68
According to Groovy documentation [1] the following construction:
CompilerConfiguration cfg = new CompilerConfiguration();
cfg.setScriptBaseClass(scriptBaseClass);
groovyClassLoader =
new GroovyClassLoader(GroovyUtil.class.getClassLoader(), cfg);
is equivalent to running the a script containing the ‘@BaseScript’
annotation. Previously in ‘org.apache.ofbiz.base.util.GroovyUtil’
instead of choosing one solution, we were doing both. Now we only
rely on the construction described above.
[1] http://docs.groovy-lang.org/latest/html/documentation/#_script_base_classes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854652 13f79535-47bb-0310-9956-ffa450edef68
Those tests requires additional constructors for ‘ComponentConfig’
and ‘ComponentConfig.WebappInfo’ to be able to instantiate them
without an XML element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854430 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10837)
Fixes CVE-2019-0189
The white list I used was not complete.
This adds "java.util.HashMap", "Boolean", "Number", "Integer" which are the ones
missing I found so far.
Maybe other classes could still miss OOTB. So I added a warning in
SafeObjectInputStream::resolveClass
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1853745 13f79535-47bb-0310-9956-ffa450edef68
This commit refactors the startup bootstrapping logic to remove any references to the
StartupLoader API and any related files. This is due to the fact that any loaders
including the old POS is completely removed from the system. Thus this improvement
simplifies the startup logic and makes it easier to maintain.
Thank you: Mathieu Lirzin for the patch, careful review and patience
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1852847 13f79535-47bb-0310-9956-ffa450edef68
slash inside its name
(OFBIZ-10766)
Deepak Nigam reported on dev ML:
When there is one web app with the empty mount point (i.e. deployed on root),
the auto-login cookie will not work for that particular webapp due to the change
in the path of the cookie from "/" to "/" + applicationName. Because the system
will try to find the cookie at the "/" but it is actually at "/" + applicationName.
Thanks Deepak for report
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851998 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10771)
The ObjectType class contains utilities that extends the Java reflection API by
defining methods which accepts string representation of Java types and classes.
It appears that this class contains unneeded code which is either dead or is
redundant with the services already defined in the reflection API
Removes the useless isOrSubOf, instanceOf and interfaceOf methods.
Additionally it removes the getInstance method which is not used anywhere in
the framework or in the plugins.
Also includes similar changes in
AbstractConverter.java
Converters.java
DateTimeConverters.java
GenericEntity.java
IfInstanceOf.java
Thanks: Mathieu
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851701 13f79535-47bb-0310-9956-ffa450edef68
places
(OFBIZ-10812)
While reviewing OFBIZ-10811 I found that I could improve ObjectType class on 2
points:
doRealCompare returning null instead of a boolean
simpleTypeOrObjectConvert Javadoc (2 other instance not documented)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851363 13f79535-47bb-0310-9956-ffa450edef68
a slash inside its name
(OFBIZ-10766)
In my previous commit I reverted the initial change. As I said in the Jira
I had a second look and it's better to fix the problem at the root as I did
initially.
I wrote in my previous commit: "This method is used in other places where the
name should not be changed." I checked there are no issues changing slashes to
underscores in the cookies names anywhere.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851200 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10689)
After I changed the method name from ObjectType::simpleTypeConvert to
ObjectType::simpleTypeOrObjectConvert, Shikha Jaiswal noticed that I missed
the groovy files.
Checking further I found that I also missed the simple-methods.xsd and
ObjectTypeTests.java (though this last one was no really a problem)
Thanks: Shikha Jaiswal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1851156 13f79535-47bb-0310-9956-ffa450edef68
slash inside its name
(OFBIZ-10766)
My previous commit was wrong this one fixes it.
I made a mistake trying to generalise changing UtilHttp::getApplicationName.
This method is used in other places where the name should not be changed.
Only cookies are concerned.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1850685 13f79535-47bb-0310-9956-ffa450edef68
slash inside its name
(OFBIZ-10766)
When you set a mountpoint which contains a slash inside its name
(ie not only a slash as a trailer, which is possible), as it's needed with
OFBIZ-10765, OFBiz tries to create a cookie with a slash in its name and
that's impossible
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1850530 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10689)
Actually this is a firts step that simply renames
ObjectType::simpleTypeConvert to
ObjectType::simpleTypeOrObjectConvert
and improves the simpleTypeOrObjectConvert Javadoc
Thanks: Pierre Smits for report, Deepak Dixit for discussion
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1850027 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10756)
Fixes CVE-2018-17200
We currently use the UnsupportedClassConverter method in UtilXml class.
When the 1.5 version of XStream will be available another way to handle this
kind of things will be available and used by default. It's already possible to
use the same with the 1.4 version of XStream with its setupDefaultSecurity method.
So this replaces the UnsupportedClassConverter in UtilXml class by
XStream::setupDefaultSecurity method.
It's an improvement but better to backport it as much as possible
The UtilXmlTests class and its use is removed and the UnsupportedClassConverter
method deprecated (no use OOTB)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1850015 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10728)
Improved boolean returns with single statement, replacing if blocks with explicit boolean return.
Improves code in isGiftCard().
Thanks Suraj Khurana for the review.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849673 13f79535-47bb-0310-9956-ffa450edef68