You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by mi...@apache.org on 2012/09/02 16:09:52 UTC
svn commit: r1379971 - in /tika/trunk: ./
tika-parsers/src/main/java/org/apache/tika/parser/crypto/
tika-parsers/src/test/java/org/apache/tika/parser/crypto/
tika-parsers/src/test/resources/test-documents/
Author: mikemccand
Date: Sun Sep 2 14:09:52 2012
New Revision: 1379971
URL: http://svn.apache.org/viewvc?rev=1379971&view=rev
Log:
TIKA-986: don't throw NullPointerException on detached PKCS7 signature
Added:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java (with props)
tika/trunk/tika-parsers/src/test/resources/test-documents/testDetached.p7s (with props)
Modified:
tika/trunk/CHANGES.txt
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1379971&r1=1379970&r2=1379971&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Sun Sep 2 14:09:52 2012
@@ -8,6 +8,9 @@ Release 1.3 - Current Development
* PDF: Text from pop-up annotations is now extracted (TIKA-981)
+ * PKCS7: Detached signatures no longer through NullPointerException
+ (TIKA-986).
+
Release 1.2 - 07/10/2012
---------------------------------
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java?rev=1379971&r1=1379970&r2=1379971&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java Sun Sep 2 14:09:52 2012
@@ -60,7 +60,10 @@ public class Pkcs7Parser extends Abstrac
CMSSignedDataParser parser =
new CMSSignedDataParser(new CloseShieldInputStream(stream));
try {
- CMSTypedStream content = parser.getSignedContent();
+ CMSTypedStream content = parser.getSignedContent();
+ if (content == null) {
+ throw new TikaException("cannot parse detached pkcs7 signature (no signed data to parse)");
+ }
InputStream input = content.getContentStream();
try {
Parser delegate =
Added: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java?rev=1379971&view=auto
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java (added)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java Sun Sep 2 14:09:52 2012
@@ -0,0 +1,45 @@
+/**
+ * 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.tika.parser.crypto;
+
+import java.io.InputStream;
+
+import org.apache.tika.TikaTest;
+import org.apache.tika.exception.TikaException;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.sax.BodyContentHandler;
+import org.xml.sax.ContentHandler;
+
+public class Pkcs7ParserTest extends TikaTest {
+ public void testDetachedSignature() throws Exception {
+ InputStream input = Pkcs7ParserTest.class.getResourceAsStream(
+ "/test-documents/testDetached.p7s");
+ try {
+ ContentHandler handler = new BodyContentHandler();
+ Metadata metadata = new Metadata();
+ new Pkcs7Parser().parse(input, handler, metadata, new ParseContext());
+ } catch (NullPointerException npe) {
+ fail("should not get NPE");
+ } catch (TikaException te) {
+ assertTrue(te.toString().indexOf("cannot parse detached pkcs7 signature") != -1);
+ } finally {
+ input.close();
+ }
+ }
+}
Propchange: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testDetached.p7s
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testDetached.p7s?rev=1379971&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tika/trunk/tika-parsers/src/test/resources/test-documents/testDetached.p7s
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream