mattyb149 commented on a change in pull request #5201:
URL: https://github.com/apache/nifi/pull/5201#discussion_r666551990
##########
File path:
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
##########
@@ -406,50 +399,118 @@ public ZipUnpacker(final Pattern fileFilter, final
char[] password) {
@Override
public void unpack(final ProcessSession session, final FlowFile
source, final List<FlowFile> unpacked) {
final String fragmentId = UUID.randomUUID().toString();
- session.read(source, new InputStreamCallback() {
- @Override
- public void process(final InputStream in) throws IOException {
- int fragmentCount = 0;
- try (final ZipInputStream zipIn = new ZipInputStream(new
BufferedInputStream(in), password)) {
- LocalFileHeader zipEntry;
- while ((zipEntry = zipIn.getNextEntry()) != null) {
- final String zipEntryName = zipEntry.getFileName();
- if (zipEntry.isDirectory() ||
!fileMatches(zipEntryName)) {
- continue;
- }
- final File file = new File(zipEntryName);
- final String parentDirectory = (file.getParent()
== null) ? "/" : file.getParent();
- final Path absPath =
file.toPath().toAbsolutePath();
- final String absPathString =
absPath.getParent().toString() + "/";
-
- FlowFile unpackedFile = session.create(source);
- try {
- final Map<String, String> attributes = new
HashMap<>();
- attributes.put(CoreAttributes.FILENAME.key(),
file.getName());
- attributes.put(CoreAttributes.PATH.key(),
parentDirectory);
-
attributes.put(CoreAttributes.ABSOLUTE_PATH.key(), absPathString);
- attributes.put(CoreAttributes.MIME_TYPE.key(),
OCTET_STREAM);
+ if (password == null) {
Review comment:
By "disabled", does that mean the user can set an invalid combination
that would only be determined at runtime? If so maybe we could add a
customValidate() or something that checks the algorithm and the password to see
if they are a valid combination
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
