Changeset 5152 for branches/2.3/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java

Timestamp:

11/04/11 16:50:31 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2165 - Erro ao enviar mensagens assinadas digitalmente.

File:

• branches/2.3/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (5 diffs)

branches/2.3/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java

@@ -31 +31 @@
 import java.util.Properties;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.crypto.Cipher;
 import javax.mail.Message;
@@ -55 +57 @@
 import br.gov.serpro.ui.DialogBuilder;
 import br.gov.serpro.util.Base64Utils;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.StringReader;
 import java.security.AlgorithmParameters;
 import java.security.cert.CertificateEncodingException;
@@ -65 +71 @@
 import javax.activation.MailcapCommandMap;
 import javax.mail.internet.ContentType;
+import javax.mail.internet.HeaderTokenizer;
 import javax.mail.internet.MimeUtility;
 import javax.mail.internet.PreencodedMimeBodyPart;
@@ -337 +344 @@
     }
 
+    static public String verifyP7S(MimeMessage body){
+        try {
+
+            MimeMultipart mm = (MimeMultipart) body.getContent();
+            externalLoop:for (int i = mm.getCount() - 1; i >= 0 ; i--){
+                MimeBodyPart mbp = (MimeBodyPart) mm.getBodyPart(i);
+                if (mbp.getContentType().contains("application/pkcs7-signature")){
+                    String[] contentTypeArray = body.getHeader("Content-Type");
+                    HeaderTokenizer hTokenizer = new HeaderTokenizer(contentTypeArray[0]);
+
+                    String boundary = "";
+                    HeaderTokenizer.Token t = hTokenizer.next();
+                    for (; t.getType() != HeaderTokenizer.Token.EOF; t = hTokenizer.next()){
+                        if (t.getType() == HeaderTokenizer.Token.ATOM && t.getValue().equalsIgnoreCase("boundary=")){
+                            break;
+                        }
+                    }
+                    t = hTokenizer.next();
+                    if (t.getType() == HeaderTokenizer.Token.QUOTEDSTRING){
+                        boundary = t.getValue();
+                    }
+
+                    InputStreamReader rawStreamReader = new InputStreamReader(mbp.getRawInputStream(), "iso-8859-1");
+
+                    StringBuilder signature = new StringBuilder(256);
+                    while (rawStreamReader.ready()){
+                        char[] buffer = new char[256];
+                        rawStreamReader.read(buffer);
+                        signature.append(buffer);
+                    }
+                    
+                    String[] array = signature.toString().split("\\r\\n|(?<!\\r)\\n");
+
+                    boolean badFormat = false;
+                    for (int j = 0; j < array.length; j++){
+                        if (array[j].length() > array[0].length()){
+                            badFormat = true;
+                            break;
+                        }
+                    }
+
+                    signature = null;
+                    array = null;
+
+                    if (badFormat){
+                        BufferedInputStream parsedIS = new BufferedInputStream(mbp.getInputStream());
+                        ByteArrayOutputStream baos = new ByteArrayOutputStream(parsedIS.available());
+                        
+                        while (parsedIS.available() > 0){
+                            byte[] buffer = new byte[parsedIS.available()];
+                            parsedIS.read(buffer);
+                            baos.write(buffer);
+                        }
+
+                        Enumeration headers = headers = mbp.getAllHeaderLines();
+                        String headersString = "";
+                        while (headers.hasMoreElements()){
+                            String header = (String) headers.nextElement();
+                            System.out.println("header: "+header);
+                            headersString += header+"\r\n";
+                        }
+
+                        String base64Encoded = Base64Utils.der2pem(baos.toByteArray(), false);
+
+                        mm.removeBodyPart(i);
+                        body.saveChanges();
+        
+                        ByteArrayOutputStream oStream = new ByteArrayOutputStream();
+
+                        oStream = new ByteArrayOutputStream();
+                        body.writeTo(oStream);
+
+                        BufferedReader reader = new BufferedReader(new StringReader(oStream.toString()));
+                        OutputStream os = new ByteArrayOutputStream();
+
+                        String line = "";
+                        while ((line = reader.readLine()) != null ){
+                            if (!line.equals("--"+boundary+"--")){
+                                os.write((line+"\r\n").getBytes("iso-8859-1"));
+                            }
+                        }
+
+                        return os.toString()
+                                +"--"+boundary+"\r\n"+headersString
+                                +"\r\n"+base64Encoded
+                                +"--"+boundary+"--\r\n";
+
+                    }
+
+                    break externalLoop;
+                }
+            }
+
+        } catch (IOException ex) {
+            Logger.getLogger(DigitalCertificate.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (MessagingException ex) {
+            Logger.getLogger(DigitalCertificate.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (ClassCastException ex) {
+            Logger.getLogger(DigitalCertificate.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+        return null;
+    }
+
     /**
      * Usado para assinar digitalmente um e-mail.
@@ -506 +617 @@
         body.saveChanges();
 
-        ByteArrayOutputStream oStream = new ByteArrayOutputStream();
+        ByteArrayOutputStream oStream = new ByteArrayOutputStream();
 
         oStream = new ByteArrayOutputStream();
-        body.writeTo(oStream);
-
-        body = null;
-        return oStream.toString("iso-8859-1");
-
+        body.writeTo(oStream);
+
+        String verified = DigitalCertificate.verifyP7S(body);
+        body = null;
+
+        if (verified != null){
+            return verified;
+        } else {
+            return oStream.toString("iso-8859-1");
+        }
     }