Skip to content

TIKA-4514 #2364

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.

Sign up for GitHub

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

Merged
tballison merged 3 commits into from
Oct 14, 2025
Merged

TIKA-4514 #2364

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f57b43d
TIKA-4514
tballison Oct 10, 2025
a8f29e6
TIKA-4514 -- fix imports
tballison Oct 14, 2025
2e95b6b
Merge branch 'main' into TIKA-4514
tballison Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions tika-core/src/main/java/org/apache/tika/extractor/RUnpackExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;

import org.apache.commons.io.input.CloseShieldInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
Expand Down Expand Up @@ -56,6 +56,7 @@ public class RUnpackExtractor extends ParsingEmbeddedDocumentExtractor {

private EmbeddedBytesSelector embeddedBytesSelector = EmbeddedBytesSelector.ACCEPT_ALL;

private final EmbeddedStreamTranslator embeddedStreamTranslator = new DefaultEmbeddedStreamTranslator();
private long bytesExtracted = 0;
private final long maxEmbeddedBytesForExtraction;

Expand Down Expand Up @@ -113,13 +114,20 @@ private void parseWithBytes(TikaInputStream stream, ContentHandler handler, Meta
throws TikaException, IOException, SAXException {
//TODO -- improve the efficiency of this so that we're not
//literally writing out a file per request
Path p = stream.getPath();
try {
//warp in CloseShieldInputStream to ensure that a misbehaving parser isn't closing
//the stream and thereby deleting the temp file.
parse(CloseShieldInputStream.wrap(stream), handler, metadata);
Path tmp = Files.createTempFile("tika-tmp-", ".bin");
if (embeddedStreamTranslator.shouldTranslate(stream, metadata)) {
Files.copy(embeddedStreamTranslator.translate(stream, metadata), tmp, StandardCopyOption.REPLACE_EXISTING);
} else {
Files.copy(stream, tmp, StandardCopyOption.REPLACE_EXISTING);
}
try (TikaInputStream tmpTis = TikaInputStream.get(tmp)) {
parse(tmpTis, handler, metadata);
} finally {
storeEmbeddedBytes(p, metadata);
try {
storeEmbeddedBytes(tmp, metadata);
} finally {
Files.delete(tmp);
}
}
}

Expand Down