GitHub user alopresto opened a pull request:
https://github.com/apache/nifi/pull/170
Nifi 1324
Upgraded BC to 1.54.
Resolved contrib check issues.
Cannot rebase as external changes were merged.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/alopresto/nifi NIFI-1324
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/170.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 #170
----
commit 8ecf27ba12e21dc94600158f82689277b5e0914d
Author: Andy LoPresto <[email protected]>
Date: 2015-12-23T03:03:09Z
NIFI-1324:
Changed Maven dependencies for BouncyCastle bcprov and bcpg from jdk16:1.46
to jdk15on:1.53 (kept nifi-web-security on jdk16:1.46 because jdk15on:1.53
splits OCSP logic into new module bcpkix).
Added individual unit tests for PGP public keyring validation.
Passes all legacy unit tests.
Added TODOs for customizable brick encryption and refactoring shared code.
Cleaned up magic numbers to constants.
Added unit tests for OpenPGPPasswordBasedEncryptor (internal consistency
and legacy file decrypt).
Began refactoring shared encrypt code from OpenPGP* implementations.
Extracted encrypt utility method from OpenPGPPasswordBasedEncryptor to
PGPUtil class.
Added test resources (signed and unsigned key-encrypted files).
Added unit tests for OpenPGPKeyBasedEncryptor (internal consistency and
external file decrypt).
Changed BC dependency for nifi-web-security to bcprov-jdk15on:1.53 and
bcpkix-jdk15on:1.53.
Updated OCSPValidator to use new BC logic for OCSP validation. This code
compiles but should be fully audited, as the legacy OCSP validation was not
completely implemented.
Added skeleton of OCSP validator unit tests with successful keypair and
certificate generation and signing code.
Added further unit tests for issued certificates.
Annotated unimplemented unit tests with note about Groovy integration.
Refactored Jersey call in OCSPCertificateValidator to internal method.
Added toString() to NiFi local OcspRequest.
Implemented positive & negative unit tests with cache injection for
valid/revoked OCSP certificate.
Resolved contrib-check issues.
Removed ignored code in unit test.
commit 3661e8d97419fe1892069906a3dd299f9a5bffd9
Author: Andy LoPresto <[email protected]>
Date: 2016-01-12T17:59:57Z
NIFI-1324:
Upgraded to BC 1.54 (published during work).
Resolved contrib check issues in other modules.
commit 0651c65c7c9ac16e2c53f2dbbdf2f21de3a3d8a8
Author: Andy LoPresto <[email protected]>
Date: 2015-12-23T03:03:09Z
NIFI-1324:
Changed Maven dependencies for BouncyCastle bcprov and bcpg from jdk16:1.46
to jdk15on:1.53 (kept nifi-web-security on jdk16:1.46 because jdk15on:1.53
splits OCSP logic into new module bcpkix).
Added individual unit tests for PGP public keyring validation.
Passes all legacy unit tests.
Added TODOs for customizable brick encryption and refactoring shared code.
Cleaned up magic numbers to constants.
Added unit tests for OpenPGPPasswordBasedEncryptor (internal consistency
and legacy file decrypt).
Began refactoring shared encrypt code from OpenPGP* implementations.
Extracted encrypt utility method from OpenPGPPasswordBasedEncryptor to
PGPUtil class.
Added test resources (signed and unsigned key-encrypted files).
Added unit tests for OpenPGPKeyBasedEncryptor (internal consistency and
external file decrypt).
Changed BC dependency for nifi-web-security to bcprov-jdk15on:1.53 and
bcpkix-jdk15on:1.53.
Updated OCSPValidator to use new BC logic for OCSP validation. This code
compiles but should be fully audited, as the legacy OCSP validation was not
completely implemented.
Added skeleton of OCSP validator unit tests with successful keypair and
certificate generation and signing code.
Added further unit tests for issued certificates.
Annotated unimplemented unit tests with note about Groovy integration.
Refactored Jersey call in OCSPCertificateValidator to internal method.
Added toString() to NiFi local OcspRequest.
Implemented positive & negative unit tests with cache injection for
valid/revoked OCSP certificate.
Resolved contrib-check issues.
Removed ignored code in unit test.
Upgraded to BC 1.54 (published during work).
Resolved contrib check issues in other modules.
commit 8b89a7e6acd82231ff0cee42f16f9ff91393a838
Author: Andy LoPresto <[email protected]>
Date: 2016-01-12T18:13:15Z
Merge branch 'master' of https://github.com/apache/nifi into NIFI-1324
commit 9fbead851c41b242ab5787ab317c0c771bf7285b
Author: Andy LoPresto <[email protected]>
Date: 2016-01-12T18:13:55Z
NIFI-1324:
Minor formatting changes.
commit dc988111bc72326f5fad235c65d399849fede83a
Author: Andy LoPresto <[email protected]>
Date: 2016-01-12T18:14:59Z
Merge remote-tracking branch 'origin/NIFI-1324' into NIFI-1324
# Conflicts:
#
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PGPUtil.java
#
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/OpenPGPKeyBasedEncryptorTest.java
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
