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
NIFI-8251 Added EncryptContentPGP and DecryptContentPGP Processors #4842
Conversation
f3021ba
to
ae65672
Compare
- Added PGPPrivateKeyService and PGPPublicKeyService interfaces with standard implementations - NIFI-7396 EncryptContentPGP writes encryption metadata attributes - NIFI-6708 Controller Services support ElGamal Public and Private Keys - NIFI-5346 Controller Services support Keyring Files and ASCII Key properties - NIFI-5335 Controller Services support multiple public or private keys from keyrings - NIFI-2983 DecryptContentPGP finds and decrypts Encrypted Data Packets regardless of signing - NIFI-1694 Controller Services support individual key files or keyrings
8040dee
to
745bfeb
Compare
Minor note -- it looks like you'll need to add the new pgp nars to the nifi-assembly/pom.xml. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work, David. Aside from needing to add the pgp nars to the nifi-assembly pom.xml, I believe all of my suggested changes are captured in the review comments. I'm looking forward to using these processors!
...service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPrivateKeyService.java
Outdated
Show resolved
Hide resolved
...-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPublicKeyService.java
Outdated
Show resolved
Hide resolved
...ndle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/EncryptContentPGP.java
Show resolved
Hide resolved
...ndle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/EncryptContentPGP.java
Show resolved
Hide resolved
...ndle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/DecryptContentPGP.java
Show resolved
Hide resolved
.../nifi-pgp-processors/src/test/java/org/apache/nifi/processors/pgp/DecryptContentPGPTest.java
Show resolved
Hide resolved
.../nifi-pgp-processors/src/test/java/org/apache/nifi/processors/pgp/EncryptContentPGPTest.java
Show resolved
Hide resolved
…cryptContentPGP - Added unit tests for encryption and decryption with both password-based and public key - Added PGP NAR dependencies to nifi-assembly
Thanks for the detailed and helpful feedback @gresockj! I pushed an update to address your comments, which includes improving |
I just tested it out, and all of the above issues were resolved. |
I'll check this one out and see if we can get it merged in. |
Tested and looks good to me, +1 will merge. Thanks exceptionfactory, awesome work. |
- Added PGPPrivateKeyService and PGPPublicKeyService interfaces with standard implementations - NIFI-7396 EncryptContentPGP writes encryption metadata attributes - NIFI-6708 Controller Services support ElGamal Public and Private Keys - NIFI-5346 Controller Services support Keyring Files and ASCII Key properties - NIFI-5335 Controller Services support multiple public or private keys from keyrings - NIFI-2983 DecryptContentPGP finds and decrypts Encrypted Data Packets regardless of signing - NIFI-1694 Controller Services support individual key files or keyrings NIFI-8251 Refactored Public Key ID Property to Public Key Search NIFI-8251 Corrected handling of multiple Encrypted Data packets in DecryptContentPGP - Added unit tests for encryption and decryption with both password-based and public key - Added PGP NAR dependencies to nifi-assembly Signed-off-by: Nathan Gough <thenatog@gmail.com> This closes apache#4842.
Description of PR
NIFI-8251 Adds the following Processors and Controller Services in a new
nifi-pgp-bundle
and related modules:The new components address a number of latent issues related to PGP handling in the
EncryptContent
Processor:The EncryptContentPGP Processor supports several configuration properties that were previously hard-coded in
EncryptContent
:The EncryptContentPGP supports AES or Camellia Symmetric-Key Algorithms with key sizes of 128, 192, or 256. Support for other algorithms is not included in this initial version in order to discourage the use of less secure algorithms. When configured with a PGPPublicKeyService, the EncryptContentPGP Processor requires the presence of a Public Key ID formatted using the long format as a 16 character hexadecimal string. This approach provides direct control over which key to use for encryption and also supports both RSA and ElGamal Public Keys.
The DecryptContentPGP Processor is capable of reading messages encrypted using any of the Symmetric-Key Algorithms supported in the BouncyCastle library. The DecryptContentPGP Processor supports reading either binary or ASCII Armor encoded messages through content detection and also handles standard compression algorithms. In addition, the DecryptContentPGP Processor is capable of handling signed messages and decrypting the contents. Additional efforts to support signature verification can be implemented as separate processors under NIFI-7322. The DecryptContentPGP Processor can be configured to read messages encrypted with either Password-Based Encryption or Public Key Encryption when configured with the necessary properties. The Processor leverages the PGPPrivateKeyService to find associated Private Keys when processing messages encrypted using Public Key Encryption.
The PGP Controller Services abstract access to Public and Private Key files. Both services support binary or ASCII Armor keyrings, as well as the option to provide an ASCII Armored keyring as a property. Public Keys are not considered sensitive, whereas Private Keys are considered sensitive and encrypted using standard NiFi Sensitive Properties encryption.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
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.
Has your PR been rebased against the latest commit within the target branch (typically
main
)?Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not
squash
or use--force
when pushing to allow for clean monitoring of changes.For code changes:
mvn -Pcontrib-check clean install
at the rootnifi
folder?LICENSE
file, including the mainLICENSE
file undernifi-assembly
?NOTICE
file, including the mainNOTICE
file found undernifi-assembly
?.displayName
in addition to .name (programmatic access) for each of the new properties?For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.