GitHub user alopresto opened a pull request:
https://github.com/apache/nifi/pull/2797
NIFI-5193 Fixed issue in ConfigEncryptionTool when XML contained
regex-breaking LDAP filters
Thank you for submitting a contribution to Apache NiFi.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [x] Does your PR title start with NIFI-XXXX where XXXX is the JIRA number
you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [x] Has your PR been rebased against the latest commit within the target
branch (typically master)?
- [ ] Is your initial contribution a single, squashed commit?
### For code changes:
- [x] Have you ensured that the full suite of tests is executed via mvn
-Pcontrib-check clean install at the root nifi folder?
- [x] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies
licensed in a way that is compatible for inclusion under [ASF
2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file, including the main
LICENSE file under nifi-assembly?
- [ ] If applicable, have you updated the NOTICE file, including the main
NOTICE file found under nifi-assembly?
- [ ] If adding new Properties, have you added .displayName in addition to
.name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in
which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check travis-ci for build
issues and submit an update to your PR as soon as possible.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/alopresto/nifi NIFI-5193
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/2797.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2797
----
commit 16b2deaa27244c595f6544874b17dd893fe42e16
Author: Andy LoPresto <alopresto@...>
Date: 2018-06-15T03:38:11Z
NIFI-5193 Added logic to handle complex user filter expressions.
Added unit tests.
Added unit test resources.
commit a6f21818e83a51d3ff84fb8cfbd6d5f03bff259d
Author: Andy LoPresto <alopresto@...>
Date: 2018-06-15T03:50:38Z
NIFI-5193 Fixed comments.
Refactored XmlSlurper instantiation to keep ignorable whitespace.
commit fea1716e057c222ccc4dd659676a70f05af6c90b
Author: Andy LoPresto <alopresto@...>
Date: 2018-06-15T03:57:25Z
NIFI-5193 Added logic to handle LIP complex user search filter.
Added unit tests.
Added unit test resources.
commit 7a0471e1201602fea00feae76159d9fb1f84dce3
Author: Andy LoPresto <alopresto@...>
Date: 2018-06-15T04:07:56Z
NIFI-5193 Removed unnecessary substitution/repopulation logic from
encrypt|decryptAuthorizers.
All unit tests pass.
commit a96b63ae6a6269f3277e781b6e6a76b0166b6abc
Author: Andy LoPresto <alopresto@...>
Date: 2018-06-15T04:33:35Z
NIFI-5193 Removed unnecessary substitution/repopulation logic from CET.
Removed unnecessary unit tests.
commit cca5ce4c718927cb42c1c44762a642119e58062d
Author: Andy LoPresto <alopresto@...>
Date: 2018-06-15T04:36:54Z
NIFI-5193 Removed unnecessary commons-text dependency from pom.xml.
----
---
