Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZBUG-1932: Upgrading jar with new changes from owasp library v20211018.2 #6

Merged
merged 2 commits into from
Feb 28, 2022

Conversation

rcyarrapothu
Copy link
Contributor

@rcyarrapothu rcyarrapothu commented Feb 8, 2022

Problem:
When OWASP zimbra_use_owasp_html_sanitizer = true, URL in the HTML message is getting modified. Character &num replace by #_
Issues: ZBUG-1932 and ZBUG-1385

Approach and Fix:
ZBUG-1932 and ZBUG-1385

Customer has reported that the url mentioned in the email is getting modified since &num is being changed to #
While debugging the problem, noticed that these issues are fixed on the original owasp library when tried with the latest release v20211018.2 . So getting the latest changes from the newest release v20211018.2 and updating our repo.

Testing Done:
Verified with mime attached in ZBUG-1932 and ZBUG-1385. The urls are working as expected with new changes. Also re-validated the fixes made on this repo earlier and they are working as expected.

For QA:
Please re-validate the previous fixes done on this library along with ZBUG-1932 and ZBUG-1385.
Previous fixed tickets are ZBUG-1948, TSS-18004 and ZBUG-1148

Ref PRs:
zm-mailbox#1227
zm-zcs-lib#89

Notes: There are no code changes done to resolve this issue. All the changes on this PR are from the latest release on owasp library v20211018.2. Added few test-cases in zm-mailbox to test this particular scenario.

Copy link
Contributor

@log2akshat log2akshat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rcyarrapothu can you please separate your single commit into the library specific upgrade commits and Zimbra specific changes, it will be easier for us to track.

@rcyarrapothu
Copy link
Contributor Author

rcyarrapothu commented Feb 9, 2022

There are no code changes done to resolve this issue. All the changes on this PR are from the latest release on owasp library v20211018.2. Added few test-cases in zm-mailbox to test this particular scenario.

@log2akshat As mentioned in the notes, all the changes on this PR are for upgrading the library and no new changes were added specifically for zimbra issues.

@rcyarrapothu can you please separate your single commit into the library specific upgrade commits and Zimbra specific changes, it will be easier for us to track.

@rcyarrapothu rcyarrapothu reopened this Feb 9, 2022
@@ -4,7 +4,7 @@
<!-- PROPERTIES -->
<property file='build-custom.properties' />

<property name='version' value='20190610.3'/>
<property name='version' value='20190610.4'/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change is also a part of upgrading the library and not the Zimbra specific change ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added this change to a separate commit

Copy link

@zimsuchitgupta zimsuchitgupta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rcyarrapothu rcyarrapothu merged commit 8ce0d6d into develop Feb 28, 2022
@rcyarrapothu rcyarrapothu deleted the bugfix/ZBUG-1932 branch February 28, 2022 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants