Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,223 Commits 143 Branches 197 Tags 391 MiB
Commit Graph

2223 Commits

Author SHA1 Message Date
Matt Gilman 4c7894bccc NIFI-1260: 
- Not pre-compiling message-page as it seems to be causign some runtime errors in some environments.
 2015-12-07 12:20:18 -05:00
Mark Payne bfe6fad502 NIFI-1261: Use consistent file separators for ListFile / TestListFile based on what the Operating System uses 2015-12-07 10:19:49 -05:00
Mark Payne bd3fd870ac NIFI-1263: Windows considers last mod time on both rolled over files to be the same, due to the way that windows computes the lastMod time. On linux and os x it is done differently. This is easily solved by adding a small sleep to the unit test before 'rolling over' the file so that the last mod date is different on all OS's, which yields the same behavior on all OS's 2015-12-07 09:53:33 -05:00
Andy LoPresto f83e6d33c5 NIFI-1242: 
Added logic and test resources to debug JCE unlimited strength cryptography policy issues and incorporated into processor property validation.
Excluded test resources from RAT check
Added KeyDerivationFunction enum.
Added kdf property in EncryptContent processor and provided to PasswordBasedEncryptor.
Added logic in PasswordBasedEncryptor to handle variable KDF.
Added unit tests for EncryptContent processor.
Added test resources and excluded from RAT check.

plain.txt: This is a plaintext message.

0s @ 12:20:32 $ openssl enc -aes-256-cbc -e -in plain.txt -out salted_raw.enc -k thisIsABadPassword -p
salt=31DC301A6C7B8A0B
key=CB878A6E167A5B530B8F2BD175E6359E3092AFF7C83274A22A5B421D79E599AC
iv =0C614A72FC06B454B84E035B3FA8F877
0s @ 12:20:44 $ xxd salted_raw.enc
0000000: 5361 6c74 6564 5f5f 31dc 301a 6c7b 8a0b  Salted__1.0.l{..
0000010: 616b c65d f767 504d c085 ba7a c517 d0cb  ak.].gPM...z....
0000020: 7832 211e f573 b6f1 ded2 8f59 88e8 088f  x2!..s.....Y....

0s @ 20:14:00 $ openssl enc -aes-256-cbc -e -in plain.txt -out unsalted_raw.enc -k thisIsABadPassword -p -nosalt
key=711E85689CE7AFF6F410AEA43ABC5446842F685B84879B2E00F977C22B9E9A7D
iv =0C90ABF8ECE84B92BAA2CD448EC760F0
0s @ 20:14:17 $ xxd unsalted_raw.enc
0000000: 70cd 2984 fdbb 0e7c c01b 7206 88b1 6b50  p.)....|..r...kP
0000010: 5eeb e4f3 4036 773b 00ce dd8e 85d8 f90a  ^...@6w;........

This closes #140

Signed-off-by: Aldrin Piri <aldrin@apache.org>
 2015-12-04 19:45:10 -05:00
Mark Payne ee14d8f9dd Merge branch 'NIFI-1249' 2015-12-04 16:38:49 -05:00
Mark Payne 903f4981a2 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2015-12-04 15:14:10 -05:00
Mike Moser 14b3349e8d NIFI-1254 remove Destination Type property from GetJMSQueue and GetJMSTopic 
Signed-off-by: Mark Payne <markap14@hotmail.com>
 2015-12-04 15:11:47 -05:00
Mark Payne f378ee9021 NIFI-1249: Allow Processors to add their own variables to those referencable by Expression Language. Make ReplaceText allow users to reference back-references of regex matches 2015-12-04 13:17:37 -05:00
joewitt 0f3a620154 NIFI-1250 removed erroneous ContentType reference and added docs for attributes to index 
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
 2015-12-04 12:58:02 -05:00
Matt Gilman dae73c52a7 NIFI-1248: 
- Initializing the actions file which ensures the progress bar is initialized.
 2015-12-03 13:49:56 -08:00
Mark Payne dce039b54f Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2015-12-03 16:35:33 -05:00
Mark Payne 76914ead03 Merge branch 'NIFI-1246' 2015-12-03 16:35:19 -05:00
Mark Payne 3b7512ebac NIFI-1246: When calculating relative paths, ensure that we have an absolute path 2015-12-03 16:06:03 -05:00
joewitt 3656c883c7 NIFI-1240 removing explicit reference to SUN provider. Not necessary for our use and ties us to Sun or JREs with Sun JCE available. Favoring no-args constructor instantiation of SecureRandom for greater flexibility in choosing from available CSPs. Deprecating the associated public constant for the PRNG. 
Signed-off-by: Aldrin Piri <aldrin@apache.org>
 2015-12-03 14:46:02 -05:00
Daniel Cave 6bdcd3913f nifi-1247 Correction for check of UnmatchedFieldBehaviour in generateUpdate to match generateInsert correct functionality 
Signed-off-by: Mark Payne <markap14@hotmail.com>
 2015-12-03 14:12:23 -05:00
Mark Payne dae25accb7 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2015-12-03 12:13:33 -05:00
Mark Payne ca79c146fd NIFI-1241: Fixed checkstyle violation that slipped through 2015-12-03 12:13:23 -05:00
Bryan Bende 4653908b22 NIFI-1227 Adding SSL/TLS support to Syslog processors 
-Removing connection creation from PutSyslog onScheduled, and reusing constructor in SSLSocketChannel
-Reducing visiblity of inner classes
 2015-12-03 11:42:33 -05:00
Mark Payne eceb1d20c7 NIFI-1241: Incorporate Boolean, Numeric, and Decimal data types for PutSQL 2015-12-03 10:02:36 -05:00
Mark Payne 6b75eda9ab NIFI-1244: Incorporate Schema Name property 2015-12-03 09:48:27 -05:00
Aldrin Piri ecc240b918 NIFI-1234 Augmenting container handling functionality for single Avro records and adjusting formatting in ConvertAvroToJSON. 
Reviewed by Tony Kurc (tkurc@apache.org). This closes #136.
 2015-12-02 20:16:08 -05:00
Andy LoPresto bde270a911 NIFI-1240: 
Added explicit reference to Sun Java Cryptographic Service Provider in PasswordBasedEncryptor.
Removed manual seeding of SecureRandom in PasswordBasedEncryptor.

This closes #138.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
 2015-12-02 19:37:09 -05:00
Mark Payne 69598a0b40 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi 2015-12-02 17:41:18 -05:00
Mark Payne 02dc7e82b2 NIFI-1239: Fixed bug that caused the cache to hold 0 elements instead of 100 2015-12-02 16:39:40 -05:00
Oleg Zhurakousky 663b7f2561 NIFI-1243 This closes #137. added null check for 'currentReadClaimStream' . . .before it is being closed 
Signed-off-by: joewitt <joewitt@apache.org>
 2015-12-02 16:23:48 -05:00
Bryan Bende 6a8c2dba12 NIFI-1237 Reducing number of messages sent in testBatching() to be less than size of ListenSyslog's internal queue 
Signed-off-by: joewitt <joewitt@apache.org>
 2015-12-01 22:53:42 -05:00
Mark Payne ff5330d7f2 NIFI-1238: Ensure that if we timeout when communicating with NiFi and do a kill -9 that we also delete the status file; otherwise, the already-running bootstrap will restart nifi 
Signed-off-by: joewitt <joewitt@apache.org>
 2015-12-01 22:53:09 -05:00
Tony Kurc 3a7ddc6a35 NIFI-1054: Fixed DOS line endings in xml, java and js source files 
Signed-off-by: joewitt <joewitt@apache.org>
 2015-12-01 22:49:51 -05:00
joewitt 0f15f261f8 NIFI-1236 adding prefer IPv4 java arg property for tests to have same env we do in prod 
Signed-off-by: joewitt <joewitt@apache.org>
 2015-12-01 20:43:31 -05:00
Tony Kurc 8f92ac9931 NIFI-1225: When ENDPOINT_OVERRIDE is set, use PathStyleAccess 
Reviewed by Mark Payne <markap14@hotmail.com>
 2015-12-01 20:33:21 -05:00
Tony Kurc fcc032c7fd NIFI-1225: adding standard services nar 
Reviewed by Mark Payne <markap14@hotmail.com>
 2015-12-01 20:33:07 -05:00
Joe Skora 55352ae5b1 NIFI-1225: Changes for ENDPOINT_OVERRIDE and SSL Context Service from pr for NIFI-1107 
Reviewed by Mark Payne <markap14@hotmail.com> and Tony Kurc (tkurc@apache.org)
 2015-12-01 20:32:00 -05:00
Matt Gilman fbaf1c36de NIFI-1138: - Fixing typo in expression language documentation. 
Signed-off-by: joewitt <joewitt@apache.org>
 2015-12-01 16:06:48 -05:00
Mark Payne 9dafe2db6a NIFI-1103: Fixed checkstyle violation 2015-12-01 15:56:59 -05:00
Mark Payne 307189d15b Merge branch 'NIFI-1103' of https://github.com/adamonduty/nifi 2015-12-01 15:45:51 -05:00
Matt Gilman 7726d069cd Merge branch 'NIFI-655' 2015-12-01 11:20:56 -05:00
Matt Gilman e22b51f3a7 NIFI-655: 
- Renaming spring tokens to avoid confusion over authentication and authorization.
 2015-12-01 10:08:36 -05:00
Matt Gilman 85eb8defdd NIFI-655: 
- Changing default expiration time to 12 hours.
 2015-12-01 09:36:33 -05:00
Matt Gilman c100052dac NIFI-655: 
- Adding additional logging when proceeding as an anonymous user.
 2015-12-01 08:51:45 -05:00
Mark Payne e5281f1fc1 NIFI-1221: Support batching of Syslog messages 
Signed-off-by: Bryan Bende <bbende@apache.org>
 2015-11-30 17:32:49 -05:00
Matt Gilman 2b0819a5f2 NIFI-655: 
- Removing unused imports.
 2015-11-30 16:33:11 -05:00
Matt Gilman 014b2ac4e8 NIFI-655: 
- Removing proxied user chain as user details are already serialized.
 2015-11-30 16:30:12 -05:00
Mark Payne c59087bc3a Merge branch 'NIFI-1049' 2015-11-30 16:02:36 -05:00
Mark Payne 07c619cf40 NIFI-1049: Added unit test to verify that reported bug was fixed; corrected a typo in log message 2015-11-30 15:37:58 -05:00
Matt Gilman 774d626f88 NIFI-655: 
- Adding documentation around the behavior of the authentication filters.
- Only passing along necessary parameters.
 2015-11-30 15:07:40 -05:00
Matt Gilman c722b56335 NIFI-655: 
- Ensuring the access token is not replicated when the user is already authenticated/authorized.
 2015-11-30 14:57:38 -05:00
Matt Gilman a84e505bcd NIFI-655: 
- Ensuring the access token is not replicated when the user is already authenticated/authorized.
 2015-11-30 14:47:30 -05:00
Matt Gilman 99016a835e NIFI-655: 
- Ensuring the protocol is specified.
 2015-11-30 12:38:17 -05:00
Jeremy Dyer c9d59fa819 Changed JUnit version from 4.11 to 4.12 as suggested 2015-11-30 10:13:52 -05:00
Jeremy Dyer 3e26ed8105 Merge remote-tracking branch 'apache/master' into NIFI-1156 2015-11-30 10:12:39 -05:00