Commit Graph
689 Commits
Author SHA1 Message Date
Michael Brohl 69c62f5f00 Merge changes for PR #267 due to conflicting changes in trunk (OFBIZ-12169) 2021-02-15 17:15:18 +01:00
Michael Brohl 662a3f9d1c Improved: Remove Compdoc functionality from content manager
(OFBIZ-10476)
2021-02-13 17:33:05 +01:00
Wiebke Pätzold fab0783722 Improved: Used uppercase 'L' as suggested by checkstyle (OFBIZ-12169) 2021-02-10 12:44:44 +01:00
Wiebke Pätzold 03960053a8 Improved: Replaced '.*' import form (OFBIZ-12169) 2021-02-09 11:30:18 +01:00
Wiebke Pätzold b65be41fc7 Improved: if else construct must use parentheses (OFBIZ-12169) 2021-02-09 09:11:48 +01:00
Wiebke Pätzold 2fe5e15a83 Improved: Adds newline at the end of file (OFBIZ-12169) 2021-02-08 16:31:13 +01:00
Daniel Watford 3795727ea2 Improved: MacroFormRenderer refactoring of label, display and text
fields

(OFBIZ-11900)

New RenderableFtl elements to represent pre-rendered FTL strings and FTL
macro calls. RenderableFtl elements are able to render themselves to
strings which are processed as an FTL template by the FtlWriter class.

For labels, display fields and text fields, MacroFormRenderer no longer
generates FTL to write to a template itself, but instead calls
RenderableFtlFormElementsBuilder to create corresponding RenderableFtl
elements which are then processed by FtlWriter. This is a WIP to reduce
complexity in MacroFormRenderer.
2021-01-12 10:40:58 +00:00
Jacques Le Roux 5fa312cfb9 Fixed: Secure the uploads (OFBIZ-12080)
Improves the labels names and format comment in LayoutEvents.java

I backport to ease later works...
2020-12-06 11:16:44 +01:00
Jacques Le Roux a0e8a23a18 Fixed: Secure the uploads (OFBIZ-12080)
validateUploadedFile() fixes another case reported in August by Harshit
2020-12-06 10:20:57 +01:00
Jacques Le Roux e73616caf1 Fixed: Secure the uploads (OFBIZ-12080)
2020/08/10 the OFBiz security team received a security report by Harshit Shukla
<harshit.shukz@gmail.com>, roughly it was (quoting part of it to simplify):

<<I have identified a Remote Code Execution (RCE) Vulnerability. The reason
behind this RCE is lack of file extension check at
catalog/control/UploadCategoryImage?productCategoryId=CATALOG1_BEST_SELL&pload_file_type=category>>

Using this post-auth RCE in OFBiz demos, Harshit was able to get some AWS
credentials by uploading a webshell (based on [0]).
By security, it was then decided by the Infra and OFBiz security teams to shut
down the demos.

After discussing the elements reported with Mark J Cox (VP of ASF security team)
we in common decided that no CVE was necessary.
2020-12-01 10:16:04 +01:00
holivier 98631771aa Documented: Synchronize wiki page End User Documentation (OFBIZ-12059)
- Add facility.adoc with only overview
- Correction for Content Management title
- in General glossary, add link to main components
- Complete Order management overview
- Add a short overview for Party
- Ordered applications in user-manual in alphabetic order
2020-11-16 17:00:48 +01:00
Jacques Le Roux 2fe76bead8 Improved: Misc trivial changes done while working on others issues 2020-11-11 20:43:59 +01:00
Jacques Le Roux 07cb19c0b1 Improved: Reflected XSS in content component (OFBIZ-11840)
Adds some more case and explains things better, no backport
2020-11-11 20:30:11 +01:00
Suraj Khurana 1ff8957032 Improved: Corrected some spacing issues in code, where there are extra white spaces, this will fix some checkstyle issues in applications component.
(OFBIZ-12022)
2020-09-26 14:18:28 +05:30
Suraj Khurana b3fcbeedba Improved: Make data members of class as private and added accessor methods for the same, also corrected occurences of the same in applications component.
(OFBIZ-11963)
Also made some related checkstyle code enhancements. Thanks Jacques for review.
2020-09-12 12:09:03 +05:30
Suraj Khurana 5f021ce06b Improved: Corrected line is longer than 150 characters checkstyle issues in applications component.
(OFBIZ-11921)
Also fixed some other extra space and naming related checkstyle issues observed.
Thanks Jacques for review.
2020-09-04 12:24:14 +05:30
Suraj Khurana ca9fa4fba4 Improved: Corrected line is longer than 150 characters checkstyle issues in framework and applications component.
(OFBIZ-11921)
Also fixed some extra spaces and naming conventions related checkstyle issues.
Thanks Jacques for review.
2020-08-31 19:54:54 +05:30
Akash Jain 66a76ffd5a Improved: Fix Literals comparisons with variable to avoid NPE (OFBIZ-11929)
Thanks, Devanshu Vyas for your contribution.
2020-08-30 17:20:23 +05:30
Suraj Khurana f98f5ebb86 Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed).
(OFBIZ-11947)
Also fixed some other checkstyle issues that requires re-factoring.
Thanks Jacques for review.
2020-08-28 16:54:15 +05:30
Suraj Khurana 371aab1e5b Improved: Corrected class names, method names, data members of class and variables names in application components.
(OFBIZ-11926)
Also corrected some formatting and line length related checkstyle issues.
2020-08-26 21:37:41 +05:30
Akash Jain b9fede6c26 Improved: Unit test case for service - getContent (OFBIZ-8547) 2020-08-26 15:49:20 +05:30
Pawan Verma 6cb67c1a40 Improved: Replace .size() == 0 with isEmpty() in Java files(OFBIZ-11944)
Thanks, priya for the report and patch and jacques for the review.
2020-08-22 19:17:10 +05:30
Suraj Khurana d74742d730 Improved: Make data members of class as private and added accessor methods for the same, also corrected occurences of the same in applications component.
(OFBIZ-11963)
Also made some related checkstyle code enhancements.
Thanks jacques for finalizing Javadoc pattern during this effort.
2020-08-22 13:00:17 +05:30
Suraj Khurana 413e0ec3ec Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed).
(OFBIZ-11947)
This is done for applications component. Also corrected some variables as per naming convention best practices.
Thanks Jacques for review.
2020-08-17 12:25:56 +05:30
Priya Sharma 3fe72d440f Improved: Remove unused imports from Java files (OFBIZ-11930) (#222)
Improved: Remove unused imports from Java files
(OFBIZ-11930)
Thanks: Priya Sharma
2020-08-06 19:51:09 +05:30
Suraj Khurana dd1af9f358 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk 2020-08-06 18:47:12 +05:30
Suraj Khurana 6ca9bf3102 Improved: Corrected all redundant modifiers occurences from applications component. Also, fixed some other checkstyle line formatting and spacing issues.
(OFBIZ-11925)
2020-08-06 16:52:22 +05:30
Akash Jain dd04252593 Improved: Unit test case for some content services (OFBIZ-8420)
Covered following tickets/services,
OFBIZ-8420 --> createDataCategory
OFBIZ-8421 --> updateDataCategory
OFBIZ-8422 --> removeDataCategory
OFBIZ-8424 --> createDataResourceRole
OFBIZ-8425 --> updateDataResourceRole
OFBIZ-8426 --> removeDataResourceRole

Thanks, Tanmay Muley for reporting the issue.
2020-08-03 16:31:10 +05:30
Suraj Khurana c6399ef668 Improved: Corrected some line is longer than 150 characters checkstyle issues in applications component. Also fixed some extra spaces and naming conventions related checkstyle issues.
(OFBIZ-11921)
2020-08-03 10:14:20 +05:30
Jacques Le Roux 03081897c6 Fixed: Inconsistent String Comparisons (OFBIZ-9254) & Uploading image to data resource (OFBIZ-10834)
Changes made in startsWith and indexOf methods in ContentManagementServices
for OFBIZ-9254  where wrong (reversed). Fortunately only place where this happened.

I added a comment to make clear why we have 2 empty else if

I'll backport later, conflicts to handle by hand...

Thanks: Ankush Upadhyay for spotting the bug
2020-07-27 09:45:26 +02:00
Suraj Khurana 3929ff1bd7 Improved: Corrected all incorrect indentation level issues in application component, also fixed some case indentation checkstyle issues.
(OFBIZ-11922)
2020-07-26 20:25:35 +05:30
Suraj Khurana df21972eed Improved: Updated case indentation to 0 for all switch statements in applications component. Also done formatting changes as per checkstyle best practices.
(OFBIZ-11904)
2020-07-25 13:53:10 +05:30
Suraj Khurana c20b03eca1 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk 2020-07-21 12:22:39 +05:30
Suraj Khurana 038d46e51d Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in applications component.
(OFBIZ-11886)
2020-07-21 12:22:02 +05:30
Jacques Le Roux 6e5a614b69 Improved: Reflected XSS in content component (OFBIZ-11840)
Fixes a Reflected XSS vulnerability in content component

Harshit Shukla reported it to the OFBiz security team:
https://demo-stable.ofbiz.apache.org/content/control/stream?contentId="><svg/onload=alert(0)>

It's a post-auth vulnerability so we did not ask for a CVE.

Thanks: Harshit Shukla harshit.shukz@gmail.com
2020-07-18 12:07:36 +02:00
Suraj Khurana 0524945bda Improved: Corrected all checkstyle formatting issues: 'typecast' is not followed by whitespace in applications component.
(OFBIZ-11887)
2020-07-18 12:15:16 +05:30
Suraj Khurana 2d01d722e6 Improved: Corrected all checkstyle formatting issues: Line has trailing spaces in applications component.
(OFBIZ-11880)
Thanks Jacques for review.
2020-07-13 14:15:34 +05:30
Suraj Khurana bdc8c73fd8 Improved: Corrected checkstyle formatting issues, 'is preceded/not preceded with whitespace' for applications component.
(OFBIZ-11874)
This fixes following checkstyle issues:
'{' is not preceded with whitespace.
'{' is not followed by whitespace.
'}' is not followed by whitespace.
'}' is not preceded with whitespace.
'typecast' is not followed by whitespace.
'try' is not followed by whitespace.
';' is preceded with whitespace.
2020-07-11 14:29:35 +05:30
Suraj Khurana 82ce4304ae Improved: Corrected all checkstyle issues related to succeeding space for comma in applications directory.
(OFBIZ-11805)
Thanks Jacques and Ritesh Kumar for review.
2020-07-09 11:59:51 +05:30
Suraj Khurana 749d4d6d94 Improved: Corrected remaining ', is not followed by whitespace' checkstyle errors in framework component.
(OFBIZ-11805)
2020-07-07 15:25:15 +05:30
Suraj Khurana bfe3adeae9 Improved: Corrected all 'if is not followed by whitespace' checkstyle errors. Also corrected few ', is not followed by whitespace' checkstyle errors in applications component.
(OFBIZ-11805)
Thanks Jacques Le Roux and Ritesh Kumar for review.
2020-07-06 15:34:00 +05:30
Pawan Verma 3da16a182c Improved: Replace Collection.sort() with List.sort().(OFBIZ-11830) 2020-06-28 01:21:23 +05:30
Pawan Verma f0af2894e5 Improved: Merge identical catch blocks in single catch block(OFBIZ-11827)
In Java SE 7 and later, a single catch block can handle more than one type of exception. This feature can reduce code duplication and lessen the temptation to catch an overly broad exception.

Thanks: Jacques for the review.
2020-06-27 11:23:12 +05:30
Pawan Verma 4275825b4a Improved: Replace anonymous types with lambda expressions(OFBIZ-11833) 2020-06-24 14:11:05 +05:30
Pawan Verma 15c005fa42 Improved: Replace for-loop with forEach loop(OFBIZ-11829)
Also modified some checkstyle issues.

Set checkstyleMain.maxErrors to 26684 (-61)

Thanks: Jacques for the review.
2020-06-22 21:17:49 +05:30
Suraj Khurana 5e7193f5a8 Improved: Changed resources with proper naming convention in all application components.
(OFBIZ-11739)
Also, made MODULE as private data member of class instead of public. This will reduce checkstlye issues. Thanks Jacques for review.
2020-05-29 13:19:05 +05:30
Pawan Verma df0c441568 Improved: Use OFBizTestCase's from method utility instead of using EntityQuery in each test case (#119)
(OFBIZ-11666)

Also, removed some unused imports from the test cases files.
2020-05-10 14:23:20 +05:30
Pawan Verma b613256823 Improved: Use userLogin available in context instead of fetching from DB in Groovy test cases
(OFBIZ-11618)

Thanks: Jacques for the review.
2020-04-29 16:26:58 +05:30
Jacques Le Roux d0144d96e1 Improved: Increase the size of http.upload.max.sizethreshold
(OFBIZ-11598)

That's rather refactoring to avoid to have the size hardcoded in several places
Next: ask if it's OK for everyone to increase the size
2020-04-19 15:41:10 +02:00
Jacques Le Roux afb35572d0 Improved: Removes (no longer?) right TODO 2020-04-16 15:18:08 +02:00