You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2012/06/30 15:01:40 UTC
svn commit: r1355724 - in /tika/trunk:
tika-core/src/main/resources/org/apache/tika/mime/
tika-parsers/src/main/java/org/apache/tika/parser/crypto/
tika-parsers/src/main/resources/META-INF/services/
Author: jukka
Date: Sat Jun 30 13:01:38 2012
New Revision: 1355724
URL: http://svn.apache.org/viewvc?rev=1355724&view=rev
Log:
TIKA-876: Signed pdf parsing
Add a simple Pkcs7Parser class that can parse the pkcs7 format with Bouncy Castle
Added:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1355724&r1=1355723&r2=1355724&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original)
+++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Sat Jun 30 13:01:38 2012
@@ -390,10 +390,12 @@
<mime-type type="application/pkcs10">
<glob pattern="*.p10"/>
</mime-type>
+
<mime-type type="application/pkcs7-mime">
<glob pattern="*.p7m"/>
<glob pattern="*.p7c"/>
</mime-type>
+
<mime-type type="application/pkcs7-signature">
<glob pattern="*.p7s"/>
<magic priority="50">
@@ -404,6 +406,7 @@
mask="0xFFFFFFFFFFFFFFFFFFFFFFFF00FF" offset="0"/>
</magic>
</mime-type>
+
<mime-type type="application/pkix-cert">
<glob pattern="*.cer"/>
</mime-type>
Added: 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=1355724&view=auto
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java (added)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java Sat Jun 30 13:01:38 2012
@@ -0,0 +1,80 @@
+/*
+ * 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.IOException;
+import java.io.InputStream;
+import java.util.Set;
+
+import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.CloseShieldInputStream;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
+import org.apache.tika.parser.EmptyParser;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.bouncycastle.cms.CMSException;
+import org.bouncycastle.cms.CMSSignedDataParser;
+import org.bouncycastle.cms.CMSTypedStream;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+/**
+ * Basic parser for PKCS7 data.
+ */
+public class Pkcs7Parser extends AbstractParser {
+
+ /** Serial version UID */
+ private static final long serialVersionUID = -7310531559075115044L;
+
+ private static final MediaType PKCS7_MIME =
+ MediaType.application("pkcs7-mime");
+
+ private static final MediaType PKCS7_SIGNATURE =
+ MediaType.application("pkcs7-signature");
+
+ public Set<MediaType> getSupportedTypes(ParseContext context) {
+ return MediaType.set(PKCS7_MIME, PKCS7_SIGNATURE);
+ }
+
+ public void parse(
+ InputStream stream, ContentHandler handler,
+ Metadata metadata, ParseContext context)
+ throws IOException, SAXException, TikaException {
+ try {
+ CMSSignedDataParser parser =
+ new CMSSignedDataParser(new CloseShieldInputStream(stream));
+ try {
+ CMSTypedStream content = parser.getSignedContent();
+ InputStream input = content.getContentStream();
+ try {
+ Parser delegate =
+ context.get(Parser.class, EmptyParser.INSTANCE);
+ delegate.parse(input, handler, metadata, context);
+ } finally {
+ input.close();
+ }
+ } finally {
+ parser.close();
+ }
+ } catch (CMSException e) {
+ throw new TikaException("Unable to parse pkcs7 signed data", e);
+ }
+ }
+
+}
Modified: tika/trunk/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.parser.Parser?rev=1355724&r1=1355723&r2=1355724&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.parser.Parser (original)
+++ tika/trunk/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.parser.Parser Sat Jun 30 13:01:38 2012
@@ -16,6 +16,7 @@
org.apache.tika.parser.asm.ClassParser
org.apache.tika.parser.audio.AudioParser
org.apache.tika.parser.audio.MidiParser
+org.apache.tika.parser.crypto.Pkcs7Parser
org.apache.tika.parser.dwg.DWGParser
org.apache.tika.parser.epub.EpubParser
org.apache.tika.parser.executable.ExecutableParser