This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new dfc2c5b16 [TIKA-4309] Support MachO in ExecutableParser (#1962)
dfc2c5b16 is described below
commit dfc2c5b16b75771dc72fb843b12b5d631021da69
Author: Alexey Pelykh <[email protected]>
AuthorDate: Sat Sep 21 22:02:12 2024 +0200
[TIKA-4309] Support MachO in ExecutableParser (#1962)
---
.../tika/parser/executable/ExecutableParser.java | 125 ++++++++++++++++++++-
.../parser/executable/ExecutableParserTest.java | 27 +++++
.../test/resources/test-documents/testMacOS-arm64 | Bin 0 -> 33440 bytes
.../test/resources/test-documents/testMacOS-x86_64 | Bin 0 -> 8448 bytes
4 files changed, 151 insertions(+), 1 deletion(-)
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
index 225edd70b..e8ed04aeb 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
@@ -53,10 +53,27 @@ public class ExecutableParser implements Parser,
MachineMetadata {
private static final MediaType ELF_EXECUTABLE =
MediaType.application("x-executable");
private static final MediaType ELF_SHAREDLIB =
MediaType.application("x-sharedlib");
private static final MediaType ELF_COREDUMP =
MediaType.application("x-coredump");
+ private static final MediaType MACH_O = MediaType.application("x-mach-o");
+ private static final MediaType MACH_O_OBJECT =
MediaType.application("x-mach-o-object");
+ private static final MediaType MACH_O_EXECUTABLE =
MediaType.application("x-mach-o-executable");
+ private static final MediaType MACH_O_FVMLIB =
MediaType.application("x-mach-o-fvmlib");
+ private static final MediaType MACH_O_CORE =
MediaType.application("x-mach-o-core");
+ private static final MediaType MACH_O_PRELOAD =
MediaType.application("x-mach-o-preload");
+ private static final MediaType MACH_O_DYLIB =
MediaType.application("x-mach-o-dylib");
+ private static final MediaType MACH_O_DYLINKER =
MediaType.application("x-mach-o-dylinker");
+ private static final MediaType MACH_O_BUNDLE =
MediaType.application("x-mach-o-bundle");
+ private static final MediaType MACH_O_DYLIB_STUB =
MediaType.application("x-mach-o-dylib-stub");
+ private static final MediaType MACH_O_DSYM =
MediaType.application("x-mach-o-dsym");
+ private static final MediaType MACH_O_KEXT_BUNDLE = MediaType.application(
+ "x-mach-o-kext-bundle");
+
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(
new HashSet<>(
Arrays.asList(PE_EXE, ELF_GENERAL, ELF_OBJECT,
ELF_EXECUTABLE, ELF_SHAREDLIB,
- ELF_COREDUMP)));
+ ELF_COREDUMP, MACH_O, MACH_O_OBJECT,
MACH_O_EXECUTABLE,
+ MACH_O_FVMLIB, MACH_O_CORE, MACH_O_PRELOAD,
MACH_O_DYLIB,
+ MACH_O_DYLINKER, MACH_O_BUNDLE, MACH_O_DYLIB_STUB,
MACH_O_DSYM,
+ MACH_O_KEXT_BUNDLE)));
public Set<MediaType> getSupportedTypes(ParseContext context) {
return SUPPORTED_TYPES;
@@ -76,6 +93,13 @@ public class ExecutableParser implements Parser,
MachineMetadata {
} else if (first4[0] == (byte) 0x7f && first4[1] == (byte) 'E' &&
first4[2] == (byte) 'L' &&
first4[3] == (byte) 'F') {
parseELF(xhtml, metadata, stream, first4);
+ } else if ((first4[0] == (byte) 0xCF || first4[0] == (byte) 0xCE) &&
+ first4[1] == (byte) 0xFA && first4[2] == (byte) 0xED &&
first4[3] == (byte) 0xFE) {
+ parseMachO(xhtml, metadata, stream, first4);
+ } else if (first4[0] == (byte) 0xFE && first4[1] == (byte) 0xED &&
+ first4[2] == (byte) 0xFA &&
+ (first4[3] == (byte) 0xCF || first4[3] == (byte) 0xCE)) {
+ parseMachO(xhtml, metadata, stream, first4);
}
@@ -404,4 +428,103 @@ public class ExecutableParser implements Parser,
MachineMetadata {
// Bytes 20-23 are the version
// TODO
}
+
+ /**
+ * Parses a Mach-O file
+ */
+ public void parseMachO(XHTMLContentHandler xhtml, Metadata metadata,
InputStream stream,
+ byte[] first4) throws TikaException, IOException {
+ var isLE = first4[3] == (byte) 0xFE;
+ if (isLE) {
+ metadata.set(ENDIAN, Endian.LITTLE.getName());
+ } else {
+ metadata.set(ENDIAN, Endian.BIG.getName());
+ }
+
+ // Bytes 5-8 are the CPU type and architecture bits
+ var cpuType = isLE
+ ? EndianUtils.readIntLE(stream)
+ : EndianUtils.readIntBE(stream);
+ if ((cpuType >> 24) == 1) {
+ metadata.set(ARCHITECTURE_BITS, "64");
+ }
+ switch (cpuType) {
+ case 1:
+ metadata.set(MACHINE_TYPE, MACHINE_VAX);
+ break;
+ case 6:
+ metadata.set(MACHINE_TYPE, MACHINE_M68K);
+ break;
+ case 7:
+ metadata.set(MACHINE_TYPE, MACHINE_x86_32);
+ break;
+ case (7 | 0x01000000):
+ metadata.set(MACHINE_TYPE, MACHINE_x86_64);
+ break;
+ case 8:
+ metadata.set(MACHINE_TYPE, MACHINE_MIPS);
+ break;
+ case 12:
+ case (12 | 0x01000000):
+ metadata.set(MACHINE_TYPE, MACHINE_ARM);
+ break;
+ case 13:
+ metadata.set(MACHINE_TYPE, MACHINE_M88K);
+ break;
+ case 14:
+ metadata.set(MACHINE_TYPE, MACHINE_SPARC);
+ break;
+ case 18:
+ metadata.set(MACHINE_TYPE, MACHINE_PPC);
+ break;
+ }
+
+ // Bytes 9-12 are the CPU subtype
+ var cpuSubtype = isLE
+ ? EndianUtils.readIntLE(stream)
+ : EndianUtils.readIntBE(stream);
+
+ // Bytes 13-16 are the file type
+ var fileType = isLE
+ ? EndianUtils.readIntLE(stream)
+ : EndianUtils.readIntBE(stream);
+ switch (fileType) {
+ case 0x1:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_OBJECT.toString());
+ break;
+ case 0x2:
+ metadata.set(Metadata.CONTENT_TYPE,
MACH_O_EXECUTABLE.toString());
+ break;
+ case 0x3:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_FVMLIB.toString());
+ break;
+ case 0x4:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_CORE.toString());
+ break;
+ case 0x5:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_PRELOAD.toString());
+ break;
+ case 0x6:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_DYLIB.toString());
+ break;
+ case 0x7:
+ metadata.set(Metadata.CONTENT_TYPE,
MACH_O_DYLINKER.toString());
+ break;
+ case 0x8:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_BUNDLE.toString());
+ break;
+ case 0x9:
+ metadata.set(Metadata.CONTENT_TYPE,
MACH_O_DYLIB_STUB.toString());
+ break;
+ case 0xa:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O_DSYM.toString());
+ break;
+ case 0xb:
+ metadata.set(Metadata.CONTENT_TYPE,
MACH_O_KEXT_BUNDLE.toString());
+ break;
+ default:
+ metadata.set(Metadata.CONTENT_TYPE, MACH_O.toString());
+ break;
+ }
+ }
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
index 7912936a2..357af992a 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
import org.apache.tika.TikaTest;
+import org.apache.tika.metadata.MachineMetadata.Endian;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -59,4 +60,30 @@ public class ExecutableParserTest extends TikaTest {
}
+ @Test
+ public void testMachOParser_x86_64() throws Exception {
+ XMLResult r = getXML("testMacOS-x86_64");
+ Metadata metadata = r.metadata;
+ assertEquals("application/x-mach-o-executable",
metadata.get(Metadata.CONTENT_TYPE));
+
+ assertEquals(Endian.LITTLE.getName(),
metadata.get(ExecutableParser.ENDIAN));
+ assertEquals(ExecutableParser.MACHINE_x86_64,
metadata.get(ExecutableParser.MACHINE_TYPE));
+ assertEquals("64", metadata.get(ExecutableParser.ARCHITECTURE_BITS));
+
+ assertContains("<body />", r.xml);
+ }
+
+ @Test
+ public void testMachOParser_arm64() throws Exception {
+ XMLResult r = getXML("testMacOS-arm64");
+ Metadata metadata = r.metadata;
+ assertEquals("application/x-mach-o-executable",
metadata.get(Metadata.CONTENT_TYPE));
+
+ assertEquals(Endian.LITTLE.getName(),
metadata.get(ExecutableParser.ENDIAN));
+ assertEquals(ExecutableParser.MACHINE_ARM,
metadata.get(ExecutableParser.MACHINE_TYPE));
+ assertEquals("64", metadata.get(ExecutableParser.ARCHITECTURE_BITS));
+
+ assertContains("<body />", r.xml);
+ }
+
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/resources/test-documents/testMacOS-arm64
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/resources/test-documents/testMacOS-arm64
new file mode 100755
index 000000000..228ca4272
Binary files /dev/null and
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/resources/test-documents/testMacOS-arm64
differ
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/resources/test-documents/testMacOS-x86_64
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/resources/test-documents/testMacOS-x86_64
new file mode 100755
index 000000000..f3d53d988
Binary files /dev/null and
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-code-module/src/test/resources/test-documents/testMacOS-x86_64
differ
