From 0943aed6e8e64411ff50e75ff9483208c4ec7bf9 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 23 Apr 2007 10:45:49 +0000 Subject: [PATCH] Detect, and report a meaningful error, if we come across an Office 2007 XML document git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@531419 13f79535-47bb-0310-9956-ffa450edef68 --- .../filesystem/OfficeXmlFileException.java | 36 +++++++++++++ .../poi/poifs/storage/HeaderBlockReader.java | 8 +++ .../org/apache/poi/hssf/data/sample.xlsx | Bin 0 -> 8836 bytes .../TestOffice2007XMLException.java | 50 ++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java create mode 100644 src/testcases/org/apache/poi/hssf/data/sample.xlsx create mode 100644 src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java diff --git a/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java b/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java new file mode 100644 index 000000000..b83ccd0f2 --- /dev/null +++ b/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java @@ -0,0 +1,36 @@ + +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + + + +package org.apache.poi.poifs.filesystem; + +/** + * This exception is thrown when we try to open a file that's actually + * an Office 2007+ XML file, rather than an OLE2 file (which is what + * POI works with) + * + * @author Nick Burch + */ + +public class OfficeXmlFileException extends IllegalArgumentException +{ + public OfficeXmlFileException(String s) { + super(s); + } +} diff --git a/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java b/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java index 70e1c301b..16c94e2c2 100644 --- a/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java +++ b/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java @@ -24,6 +24,7 @@ import java.io.*; import java.util.*; import org.apache.poi.poifs.common.POIFSConstants; +import org.apache.poi.poifs.filesystem.OfficeXmlFileException; import org.apache.poi.util.IOUtils; import org.apache.poi.util.IntegerField; import org.apache.poi.util.LittleEndian; @@ -89,6 +90,13 @@ public class HeaderBlockReader if (signature.get() != _signature) { + // Is it one of the usual suspects? + if(_data[0] == 0x50 && _data[1] == 0x4b && _data[2] == 0x03 && + _data[3] == 0x04) { + throw new OfficeXmlFileException("The supplied data appears to be in the Office 2007+ XML. POI only supports OLE2 Office documents"); + } + + // Give a generic error throw new IOException("Invalid header signature; read " + signature.get() + ", expected " + _signature); diff --git a/src/testcases/org/apache/poi/hssf/data/sample.xlsx b/src/testcases/org/apache/poi/hssf/data/sample.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2eb36ee2a0a1c3d1ce59617161d522cf86f0564b GIT binary patch literal 8836 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

QP43(wznmzxB=z3KHKLF7l22$LdNk=r z%=+=2 zJvjV9mkR$b@D0L~6?eoa;@P|5W?!BgMTe8qyGAw-`@vbCjaZW?5rGYN8y6wzme9?m z75kRkSPV~D4qu6nWLQgj)z0xMu>|X=^*dU{^o2!Bma6oC0c)(i)tqN|zeCW`-85b; zB%ADzC?Y{ti)>u2bv#_%Ji*qk9=6};gsiOoTO>kKD?UZt30d5T*pK{*RR9A?XsMAj zp#`l?$mVf@+Ho9GV@!xxixMw`Y$e!|foX>oqstYX#7wq}xZyVIbHPh-jnk=w0Sq2=KMJv=(q z&iC9b@FZ!x)+Z-E-`n!z4t>)&X~I|WWa-P6Zl*~y0OM;F?u2w-C?+F@sSURKQrr3o zQ5Hpc>)lnsB)fO)uLiBOC})-JR#rOd#qie#heBdz+0Bx9*bW2bCDF>4PS&SOJCIQO zHH@Wj?}%g|TeQ#s0OFrPXzAwmF9wm|`|HR~?bcfTrp&kx2p{fGI2h;YuT$ss#P%{@ zZ|s^CO@;T=f<}lNB`?GWql#g}k+*LMTy9No(wN@frORq0M)(@meCDyE5#3c^^~MNT z_$qnXeS>vf&9?o1I0IldP4bL=3V{`41E{xoTVo-lYvhsG8m07>XONdGEh!-%3THUc zw-sFQy_gDR=@>XvCk#L}l=owl#-Ck&4tZBmTr|x9ly)Y%hNAAy5H4h*D_+zlBJTf* z!nQepz~Dm}C+Q;QCsRSM>$aHkgI%-2I z!MVGRDsuEKd8IyrQyHhii7rLD359FO4rpGB$wV$Gg#SW1`&i5R(Cp490xnVK9em7W z)@)`M0^_b|$13KF=u<1T1p)jvwAaO}S=yhaRRSCiS_G4|v?qzKA6zIleALw0W4b)Y z0OGA=xL2Q2H+@wiiHC`TVl}Inp$!8|drhA4Z9RQ;+2!lBwt^E{ZCcJE>G;R_yZ z^AJmT=5l{DQwS2Szk*rZfd@4cIbk)(lNfm-HHx(*#9G1L(!u2$m?abCaC^ROD2DrB z*Ef%QUt?Cq#m$i=A}+o~XP=USQ?#`7-2F_t?ebGiw4!tNixT@>Cleidt_0~0g0`Hb zaSSLqm2z|80H!n#-^{99s_B-r1W;e-w(UK=X`yg90o-=suA1tE3S?{~@n!rmQy(aK8KbxqN-q z_-gI+hw(ey@5WavsaG9bEkXQnu!>Z3$hY|R@4plz{`X!WB)|3YeKmd6%hko-k7qd| z{jHbpOTnvNuIld}UY=8Y_wtJxzv|(tV*TM^fbvfdf9uz)rvH>GKMVl?Tp9r27vXZ% x{GUnYXY(YwpUnSCIajT(vigVpZN~4<{SS`osAC{;`c0D)0Mw9BX9a%y^GPe literal 0 HcmV?d00001 diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java b/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java new file mode 100644 index 000000000..db8607d37 --- /dev/null +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java @@ -0,0 +1,50 @@ + +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + + +package org.apache.poi.poifs.filesystem; + +import junit.framework.TestCase; +import java.io.*; + +/** + * Class to test that POIFS complains when given an Office 2007 XML document + * + * @author Marc Johnson + */ + +public class TestOffice2007XMLException extends TestCase +{ + public String dirname; + + public void setUp() { + dirname = System.getProperty("HSSF.testdata.path"); + } + + public void testXMLException() throws IOException + { + FileInputStream in = new FileInputStream(dirname + "/sample.xlsx"); + + try { + new POIFSFileSystem(in); + fail(); + } catch(OfficeXmlFileException e) { + // Good + } + } +}