OLE-объекты: переключатель errorOnOle + тихое удаление из docx
docx4j падает на внедрённых OLE-объектах двумя путями: JAXB-парсинг бинарника под ложным XML-типом в [Content_Types] («Content is not allowed in prolog» → NPE) и NPE chunkType is null в VML-сериализации w:object. Новый OleObjectNormalizer (шестой в цепочке, после GlyphCoverageNormalizer) удаляет OLE-bin-части, rels-ссылки, элементы w:object и Override удалённых частей; при errorOnOle=true вместо удаления — DrawingFoundException(OLE) → 422 «Конвертация отменена: в документе найдены OLE-объекты». - ядро: Kind.OLE, ConvertOptions.errorOnOle, WordPdfSettings.ERROR_ON_OLE, фикстура samples/ole-embedded.docx (ручная, оба механизма) - app: параметр errorOnOle, 422-контракт, тесты errorFlagOle_rejected / oleObjects_removedByDefault - SPA: третий переключатель «OLE-объекты» - прод-автотесты: +2 проверки (21) - регрессии: OleObjectNormalizerTest ↔ oleObjects_removedAndConverted / drawingErrors_errorFlagRejectsOle; E2E: notConverted.docx 500 → 200
This commit is contained in:
@@ -155,7 +155,7 @@ class WordPdfConverterTest {
|
||||
void drawingErrors_errorFlagRejectsCharts() throws Exception {
|
||||
ConversionException ex = assertThrows(ConversionException.class, () ->
|
||||
convertPdf(sampleBytes("charts-smartart.docx"), "charts-smartart",
|
||||
new ConvertOptions(true, false,
|
||||
new ConvertOptions(true, false, false,
|
||||
WordPdfSettings.MAX_INPUT_MB, WordPdfSettings.MAX_PAGES)));
|
||||
|
||||
assertTrue(ex instanceof DrawingFoundException dfe
|
||||
@@ -173,7 +173,7 @@ class WordPdfConverterTest {
|
||||
void drawingErrors_errorFlagRejectsSmartArt() throws Exception {
|
||||
ConversionException ex = assertThrows(ConversionException.class, () ->
|
||||
convertPdf(sampleBytes("charts-smartart.docx"), "charts-smartart",
|
||||
new ConvertOptions(false, true,
|
||||
new ConvertOptions(false, true, false,
|
||||
WordPdfSettings.MAX_INPUT_MB, WordPdfSettings.MAX_PAGES)));
|
||||
|
||||
assertTrue(ex instanceof DrawingFoundException dfe
|
||||
@@ -183,6 +183,41 @@ class WordPdfConverterTest {
|
||||
"сообщение должно упоминать SmartArt: " + ex.getMessage());
|
||||
}
|
||||
|
||||
/**
|
||||
* Регрессия: OLE-объекты (осиротевший bin с ложным XML-типом и настоящий
|
||||
* w:object) роняли экспорт docx4j; при выключенном errorOnOle
|
||||
* OleObjectNormalizer тихо удаляет их и документ конвертируется.
|
||||
* Фикстура samples/ole-embedded.docx.
|
||||
*/
|
||||
@Test
|
||||
void oleObjects_removedAndConverted() throws Exception {
|
||||
Path pdf = convertPdf(sampleBytes("ole-embedded.docx"), "ole-embedded");
|
||||
|
||||
String text = norm(pdfText(pdf));
|
||||
assertTrue(text.contains("OLE object test before"),
|
||||
"пропал текст до OLE-объекта: " + text);
|
||||
assertTrue(text.contains("OLE object test after"),
|
||||
"пропал текст после OLE-объекта: " + text);
|
||||
}
|
||||
|
||||
/**
|
||||
* errorOnOle=true — {@link DrawingFoundException} с {@code Kind.OLE},
|
||||
* документ отвергается. Фикстура samples/ole-embedded.docx.
|
||||
*/
|
||||
@Test
|
||||
void drawingErrors_errorFlagRejectsOle() throws Exception {
|
||||
ConversionException ex = assertThrows(ConversionException.class, () ->
|
||||
convertPdf(sampleBytes("ole-embedded.docx"), "ole-embedded",
|
||||
new ConvertOptions(false, false, true,
|
||||
WordPdfSettings.MAX_INPUT_MB, WordPdfSettings.MAX_PAGES)));
|
||||
|
||||
assertTrue(ex instanceof DrawingFoundException dfe
|
||||
&& dfe.kind() == DrawingFoundException.Kind.OLE,
|
||||
"ожидался DrawingFoundException(OLE), получено: " + ex);
|
||||
assertTrue(ex.getMessage().contains("OLE-объект"),
|
||||
"сообщение должно упоминать OLE-объекты: " + ex.getMessage());
|
||||
}
|
||||
|
||||
/**
|
||||
* Маркеры списков из символьных шрифтов (Symbol/Wingdings, коды из
|
||||
* PUA U+F0xx) экспорт в FO не понимает и рисует .notdef — решётку «#».
|
||||
@@ -442,7 +477,7 @@ class WordPdfConverterTest {
|
||||
byte[] big = new byte[1024 * 1024 + 1];
|
||||
ValidationException ex = assertThrows(ValidationException.class, () ->
|
||||
WordPdfConverter.convert(big, "x",
|
||||
new ConvertOptions(false, false, 1, WordPdfSettings.MAX_PAGES)));
|
||||
new ConvertOptions(false, false, false, 1, WordPdfSettings.MAX_PAGES)));
|
||||
assertTrue(ex.getMessage().contains("1 МБ"),
|
||||
"сообщение должно упоминать переданный лимит: " + ex.getMessage());
|
||||
assertTrue(ex.getMessage().contains("1048576 байт"),
|
||||
@@ -459,7 +494,7 @@ class WordPdfConverterTest {
|
||||
ValidationException ex = assertThrows(ValidationException.class, () ->
|
||||
WordPdfConverter.convert(
|
||||
sampleBytes("too-many-pages.docx"), "too-many-pages",
|
||||
new ConvertOptions(false, false, WordPdfSettings.MAX_INPUT_MB, 100)));
|
||||
new ConvertOptions(false, false, false, WordPdfSettings.MAX_INPUT_MB, 100)));
|
||||
assertTrue(ex.getMessage().contains("100"),
|
||||
"сообщение должно упоминать лимит: " + ex.getMessage());
|
||||
}
|
||||
@@ -475,7 +510,7 @@ class WordPdfConverterTest {
|
||||
void staleCachePageCountRejectedBeforeRender() {
|
||||
ValidationException ex = assertThrows(ValidationException.class, () ->
|
||||
WordPdfConverter.convert(sampleBytes("stale-cache.docx"), "stale-cache",
|
||||
new ConvertOptions(false, false, WordPdfSettings.MAX_INPUT_MB, 100)));
|
||||
new ConvertOptions(false, false, false, WordPdfSettings.MAX_INPUT_MB, 100)));
|
||||
assertTrue(ex.getMessage().contains("100"),
|
||||
"сообщение должно упоминать лимит: " + ex.getMessage());
|
||||
}
|
||||
|
||||
@@ -263,7 +263,7 @@ class WordPdfValidatorTest {
|
||||
// ===== validate(byte[], ConvertOptions) =====
|
||||
|
||||
private static ConvertOptions options(long maxMb, int maxPages) {
|
||||
return new ConvertOptions(false, false, maxMb, maxPages);
|
||||
return new ConvertOptions(false, false, false, maxMb, maxPages);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -0,0 +1,223 @@
|
||||
package ru.pjandro.wordpdf.internal;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import ru.pjandro.wordpdf.DrawingFoundException;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
* Удаление OLE-объектов из docx (docx4j падает и на ложном XML-типе
|
||||
* bin-части, и на VML w:object, см. OleObjectNormalizer).
|
||||
* Многочастный нормализатор — тесты через normalize на in-memory zip.
|
||||
*/
|
||||
class OleObjectNormalizerTest {
|
||||
|
||||
private static final String CT_LIE =
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"
|
||||
+ "<Default Extension=\"bin\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml\"/>"
|
||||
+ "<Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>"
|
||||
+ "<Default Extension=\"xml\" ContentType=\"application/xml\"/>"
|
||||
+ "<Override PartName=\"/word/document.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\"/>"
|
||||
+ "</Types>";
|
||||
|
||||
private static final String CT_OLE =
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"
|
||||
+ "<Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>"
|
||||
+ "<Default Extension=\"xml\" ContentType=\"application/xml\"/>"
|
||||
+ "<Override PartName=\"/word/document.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\"/>"
|
||||
+ "<Override PartName=\"/word/_embedded/ole.bin\" ContentType=\"application/vnd.openxmlformats-officedocument.oleObject\"/>"
|
||||
+ "</Types>";
|
||||
|
||||
private static final String ROOT_RELS =
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
|
||||
+ "<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"word/document.xml\"/>"
|
||||
+ "</Relationships>";
|
||||
|
||||
/** Документ без w:object. */
|
||||
private static final String DOC_PLAIN =
|
||||
"<w:document xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\">"
|
||||
+ "<w:body><w:p><w:r><w:t>before</w:t></w:r></w:p></w:body></w:document>";
|
||||
|
||||
/** Документ с w:object между текстами. */
|
||||
private static final String DOC_OBJECT =
|
||||
"<w:document xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\">"
|
||||
+ "<w:body><w:p><w:r><w:t>before</w:t></w:r>"
|
||||
+ "<w:r><w:object><v:shape><v:imagedata/></v:shape>"
|
||||
+ "<o:OLEObject Type=\"Embed\" r:id=\"rId1\"/></w:object></w:r>"
|
||||
+ "<w:r><w:t>after</w:t></w:r></w:p></w:body></w:document>";
|
||||
|
||||
private static final String DOCRELS_TO_BIN =
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
|
||||
+ "<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/bin\" Target=\"_embedded/ole.bin\"/>"
|
||||
+ "</Relationships>";
|
||||
|
||||
private static final byte[] BIN = {'P', 'K', 3, 4, 0, 1, 2, (byte) 0xFF};
|
||||
|
||||
private static byte[] zip(Map<String, byte[]> entries) throws IOException {
|
||||
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||
try (ZipOutputStream zos = new ZipOutputStream(out)) {
|
||||
for (Map.Entry<String, byte[]> e : entries.entrySet()) {
|
||||
zos.putNextEntry(new ZipEntry(e.getKey()));
|
||||
zos.write(e.getValue());
|
||||
zos.closeEntry();
|
||||
}
|
||||
}
|
||||
return out.toByteArray();
|
||||
}
|
||||
|
||||
private static byte[] utf8(String s) {
|
||||
return s.getBytes(StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
/** Форма «ложь продюсера»: Default bin -> footer+xml + осиротевший bin + rel. */
|
||||
private static byte[] lyingDocx() throws IOException {
|
||||
Map<String, byte[]> m = new LinkedHashMap<>();
|
||||
m.put("[Content_Types].xml", utf8(CT_LIE));
|
||||
m.put("_rels/.rels", utf8(ROOT_RELS));
|
||||
m.put("word/document.xml", utf8(DOC_PLAIN));
|
||||
m.put("word/_rels/document.xml.rels", utf8(DOCRELS_TO_BIN));
|
||||
m.put("word/_embedded/ole.bin", BIN);
|
||||
return zip(m);
|
||||
}
|
||||
|
||||
/** Настоящий w:object + честный Override -> oleObject. */
|
||||
private static byte[] referencedDocx() throws IOException {
|
||||
Map<String, byte[]> m = new LinkedHashMap<>();
|
||||
m.put("[Content_Types].xml", utf8(CT_OLE));
|
||||
m.put("_rels/.rels", utf8(ROOT_RELS));
|
||||
m.put("word/document.xml", utf8(DOC_OBJECT));
|
||||
m.put("word/_rels/document.xml.rels", utf8(DOCRELS_TO_BIN));
|
||||
m.put("word/_embedded/ole.bin", BIN);
|
||||
return zip(m);
|
||||
}
|
||||
|
||||
private static Map<String, byte[]> unzip(byte[] z) throws IOException {
|
||||
Map<String, byte[]> m = new LinkedHashMap<>();
|
||||
try (ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(z))) {
|
||||
ZipEntry e;
|
||||
while ((e = zis.getNextEntry()) != null) {
|
||||
m.put(e.getName(), zis.readAllBytes());
|
||||
}
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
private static String readEntry(byte[] zip, String name) throws IOException {
|
||||
byte[] data = unzip(zip).get(name);
|
||||
assertNotNull(data, "нет записи " + name);
|
||||
return new String(data, StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
@Test
|
||||
void oleBinWithXmlTypeRemoved() throws Exception {
|
||||
byte[] result = OleObjectNormalizer.normalize(lyingDocx(), false);
|
||||
|
||||
Map<String, byte[]> entries = unzip(result);
|
||||
assertFalse(entries.containsKey("word/_embedded/ole.bin"),
|
||||
"bin-часть с ложным XML-типом обязана быть удалена");
|
||||
String rels = readEntry(result, "word/_rels/document.xml.rels");
|
||||
assertFalse(rels.contains("_embedded/ole.bin"),
|
||||
"rel на удалённую часть обязан исчезнуть: " + rels);
|
||||
// прочие entries — байтово идентичны
|
||||
Map<String, byte[]> before = unzip(lyingDocx());
|
||||
assertArrayEquals(before.get("word/document.xml"), entries.get("word/document.xml"));
|
||||
assertArrayEquals(before.get("_rels/.rels"), entries.get("_rels/.rels"));
|
||||
assertArrayEquals(before.get("[Content_Types].xml"), entries.get("[Content_Types].xml"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void referencedOleRemovedWithObjectElement() throws Exception {
|
||||
byte[] result = OleObjectNormalizer.normalize(referencedDocx(), false);
|
||||
|
||||
String doc = readEntry(result, "word/document.xml");
|
||||
assertFalse(doc.contains("w:object"), "w:object обязан быть вырезан: " + doc);
|
||||
assertTrue(doc.contains("before") && doc.contains("after"),
|
||||
"тексты вокруг объекта обязаны сохраниться: " + doc);
|
||||
Map<String, byte[]> entries = unzip(result);
|
||||
assertFalse(entries.containsKey("word/_embedded/ole.bin"));
|
||||
assertFalse(readEntry(result, "word/_rels/document.xml.rels").contains("ole.bin"));
|
||||
String ct = readEntry(result, "[Content_Types].xml");
|
||||
assertFalse(ct.contains("/word/_embedded/ole.bin"),
|
||||
"Override удалённой части обязан исчезнуть: " + ct);
|
||||
assertTrue(ct.contains("/word/document.xml"),
|
||||
"чужой Override обязан сохраниться: " + ct);
|
||||
}
|
||||
|
||||
@Test
|
||||
void errorOnOleThrowsDrawingFound() throws Exception {
|
||||
DrawingFoundException ex = assertThrows(DrawingFoundException.class,
|
||||
() -> OleObjectNormalizer.normalize(referencedDocx(), true));
|
||||
assertEquals(DrawingFoundException.Kind.OLE, ex.kind());
|
||||
}
|
||||
|
||||
@Test
|
||||
void printerSettingsBinUntouched() throws Exception {
|
||||
Map<String, byte[]> m = new LinkedHashMap<>();
|
||||
m.put("[Content_Types].xml", utf8(
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"
|
||||
+ "<Default Extension=\"bin\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.printerSettings\"/>"
|
||||
+ "<Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>"
|
||||
+ "<Default Extension=\"xml\" ContentType=\"application/xml\"/>"
|
||||
+ "</Types>"));
|
||||
m.put("_rels/.rels", utf8(ROOT_RELS));
|
||||
m.put("word/document.xml", utf8(DOC_PLAIN));
|
||||
m.put("word/printSettings.bin", BIN);
|
||||
byte[] docx = zip(m);
|
||||
|
||||
assertSame(docx, OleObjectNormalizer.normalize(docx, false));
|
||||
}
|
||||
|
||||
@Test
|
||||
void noOleReturnsOriginalArray() throws Exception {
|
||||
Map<String, byte[]> m = new LinkedHashMap<>();
|
||||
m.put("[Content_Types].xml", utf8(
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"
|
||||
+ "<Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>"
|
||||
+ "<Default Extension=\"xml\" ContentType=\"application/xml\"/>"
|
||||
+ "</Types>"));
|
||||
m.put("_rels/.rels", utf8(ROOT_RELS));
|
||||
m.put("word/document.xml", utf8(DOC_PLAIN));
|
||||
byte[] docx = zip(m);
|
||||
|
||||
assertSame(docx, OleObjectNormalizer.normalize(docx, false));
|
||||
assertSame(docx, OleObjectNormalizer.normalize(docx, true));
|
||||
}
|
||||
|
||||
@Test
|
||||
void externalHyperlinkRelNotTouched() throws Exception {
|
||||
Map<String, byte[]> m = new LinkedHashMap<>();
|
||||
m.put("[Content_Types].xml", utf8(CT_LIE));
|
||||
m.put("_rels/.rels", utf8(ROOT_RELS));
|
||||
m.put("word/document.xml", utf8(DOC_PLAIN));
|
||||
m.put("word/_rels/document.xml.rels", utf8(
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
|
||||
+ "<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/bin\" Target=\"_embedded/ole.bin\"/>"
|
||||
+ "<Relationship Id=\"rId2\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink\" Target=\"https://example.com/\" TargetMode=\"External\"/>"
|
||||
+ "</Relationships>"));
|
||||
m.put("word/_embedded/ole.bin", BIN);
|
||||
|
||||
String rels = readEntry(OleObjectNormalizer.normalize(zip(m), false),
|
||||
"word/_rels/document.xml.rels");
|
||||
assertTrue(rels.contains("https://example.com/"),
|
||||
"внешняя гиперссылка не должна удаляться: " + rels);
|
||||
assertFalse(rels.contains("_embedded/ole.bin"),
|
||||
"rel на OLE-часть обязан исчезнуть: " + rels);
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Reference in New Issue
Block a user