Changeset 3394

Timestamp:

10/21/10 15:52:45 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1265 - Tratamento de mensagens encapsuladas do Outlook.

Location:

branches/2.2

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (10 diffs)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• security/ExpressoCert.jar (modified) (previous)
• security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (2 diffs)
• security/ExpressoCert/src/br/gov/serpro/setup/Setup.java (modified) (7 diffs)
• security/ExpressoCertLogin.jar (modified) (previous)
• security/ExpressoCertMail.jar (modified) (previous)
• security/commons-codec-1.3.jar (modified) (previous)
• security/commons-httpclient-3.1.jar (modified) (previous)
• security/commons-logging-1.1.1.jar (modified) (previous)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -52 +52 @@
         function open_mbox($folder = False,$force_die=true)
         {
+                $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
                 if (is_resource($this->mbox))
-                        return $this->mbox;
-                $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
-                                if($force_die) 
-                        $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
-                else 
-                        $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password);
-                return $this->mbox;
+                {
+                     if ($force_die)
+                     {
+                        @imap_reopen($this->mbox, "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
+                     }
+                     else
+                        {
+                            @imap_reopen($this->mbox, "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder);
+                        }
+                }
+                else
+                    {
+                        if($force_die)
+                        {
+                            $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
+                        }
+                        else
+                            {
+                                $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password);
+                            }
+                        
+                    }
+                    return $this->mbox;
          }
 
@@ -493 +510 @@
                 if(!$this->mbox || !is_resource($this->mbox))
                         $this->mbox = $this->open_mbox($msg_folder);
-
                 $header = $this->get_header($msg_number);
                 if (!$header) {
@@ -753 +769 @@
                 $return['login'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];//$GLOBALS['phpgw_info']['user']['account_id'];
                 $return['reply_toaddress'] = $header->reply_toaddress;
+                
+                if($return_get_body['body']=='isSigned'){
+                    imap_close($this->mbox);
+                    $new_mail = $this->show_decript($return_get_body,$dec = 1);
+                    //$new_mail['signature'] =  $return_get_body['signature'];
+                    $return['body']             = $new_mail['body'];
+                    $return['attachments']      = $new_mail['attachments'];
+                    $return['thumbs']           = $new_mail['thumbs'];
+                    $return['folder'] = $return['msg_folder'];
+                    $return['original_ID'] =  $return['msg_number'];
+                    $return['msg_folder']       = 'INBOX'.$this->imap_delimiter.'decifradas';
+                    $return['msg_number']       = $new_mail['msg_no'];
+                    //$return['signature']      = $return_get_body['signature'];
+                }
                 return $return;
         }
@@ -817 +847 @@
                 if(!$msg->structure[$msg_number]->parts) //Simple message, only 1 piece
                 {
-                        if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
+                        if((strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime') && (count($return['signature']) == 0 ) ){
                                 $return['body']='isCripted';
                                 return $return;
@@ -824 +854 @@
                         $attachment = array(); //No attachments
 
-                        if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
-                                $return['body']='isCripted';
-                                return $return;
+                        if (strtolower($msg->structure[$msg_number]->subtype) == "x-pkcs7-mime")
+                        {
+                                $return['body']='isSigned';
+                                $headers = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
+                                $header_body_array = explode('MIME-Version: 1.0', $headers);
+                                $show_pkcs7 = $header_body_array[0] . 'MIME-Version: 1.0' . chr(0x0D) .chr(0x0A). $return['signature'][0];
+                                $return['source']=$show_pkcs7;
+                                array_shift($return['signature']);
+                                $return['signature'];
+                                //$return['signature'] = $this->get_signature($msg,$msg_number,$msg_folder);
+                                imap_close($this->mbox);
+                                return $return;
                         }
 
@@ -860 +899 @@
                         $has_multipart = true;
                         $this->has_cid = false;
-
+                        array_shift($return['signature']);
                         if (strtolower($msg->structure[$msg_number]->subtype) == "related")
                                 $this->has_cid = true;
@@ -1307 +1346 @@
                 if(strtolower($msg->encoding[$msg_number][$index]) == 'base64')
                 {
-                    if ($file_type == 'application/x-pkcs7-signature' || $file_type == 'application/pkcs7-signature')
+                    if ($temp['ContentType'] == 'signature')
                     {
-                        if(!$this->mbox || !is_resource($this->mbox))
-                            $this->mbox = $this->open_mbox($msg_folder);
+                        if(!$this->mbox || !is_resource($this->mbox))
+                        $this->mbox = $this->open_mbox($msg_folder);
 
                         $header = @imap_headerinfo($this->mbox, imap_msgno($this->mbox, $msg_number), 80, 255);
@@ -1319 +1358 @@
                         $certificado = new certificadoB();
                         $validade = $certificado->verificar($imap_msg);
-
+                                        $sign[] = $certificado->msg_sem_assinatura;
                         if ($certificado->apresentado)
                         {
@@ -1584 +1623 @@
      */
     function getMessageType($msg_number, $headers = false){
-
+            include_once(dirname( __FILE__ ) ."/../../security/classes/CertificadoB.php");
             $contentType = "normal";
             if (!$headers){
                 $headers = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
             }
-            //$header2 = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
-            if (preg_match("/Content-Type:.*pkcs7-signature/i", $headers) == 1){
+            
+            if (preg_match("/pkcs7-signature/i", $headers) == 1){
                 $contentType = "signature";
-            } else if (preg_match("/Content-Type:.*x-pkcs7-mime/i", $headers) == 1){
-                $contentType = "cipher";
+            } else if (preg_match("/pkcs7-mime/i", $headers) == 1){
+                $contentType = testa_p7m( imap_body($this->mbox, imap_msgno($this->mbox, $msg_number)) );
             }
 
@@ -3677 +3716 @@
     }
 
-    function show_decript($params){
+    function show_decript($params,$dec=0){
+        
         $source = $params['source'];
         //error_log("source: $source\nversao: " . PHP_VERSION, 3, '/tmp/teste.log');
-        $source = str_replace(" ", "+", $source,$i);
-
-        if (version_compare(PHP_VERSION, '5.2.0', '>=')){
-            if(!$source = base64_decode($source,true))
-                return "error ".$source."Espaços ".$i;
-
+
+        if ($dec == 0)
+        {
+            $source = str_replace(" ", "+", $source,$i);
+            if (version_compare(PHP_VERSION, '5.2.0', '>=')){
+                if(!$source = base64_decode($source,true))
+                    return "error ".$source."Espaços ".$i;
+
+            }
+            else {
+                if(!$source = base64_decode($source))
+                    return "error ".$source."Espaços ".$i;
+            }
         }
-        else {
-            if(!$source = base64_decode($source))
-                return "error ".$source."Espaços ".$i;
-        }
-
         $insert = $this->insert_email($source,'INBOX'.$this->imap_delimiter.'decifradas');
 

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -1166 +1166 @@
         img_next_msg.style.cursor = 'pointer';
 
-        var folder_id = 0;
-        folder_id = info_msg.original_ID ? info_msg.original_ID: info_msg.msg_number;
-        var folder = document.getElementById(folder_id);
+        var folder_id = ID.match(/\d+/)[0];
+        var folder;
+
+        //Correção para fazer funcionar e-mails assinados no formato encapsulado.
+       // folder_id = info_msg.original_ID ? info_msg.original_ID: info_msg.msg_number;
+        if ((folder = document.getElementById(info_msg.original_ID)) == null)
+        //if ((folder = document.getElementById(info_msg.msg_number)) == null)
+            folder = document.getElementById(info_msg.msg_number);
         if (!folder){
                 delete_border(ID);

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

@@ -55 +55 @@
 import br.gov.serpro.ui.DialogBuilder;
 import br.gov.serpro.util.Base64Utils;
-import com.sun.mail.util.BASE64DecoderStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.security.AlgorithmParameters;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.activation.CommandMap;
 import javax.activation.MailcapCommandMap;
-import javax.mail.BodyPart;
 import javax.mail.internet.ContentType;
 import javax.mail.internet.MimeUtility;
 import javax.mail.internet.PreencodedMimeBodyPart;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERObject;
 import org.bouncycastle.cms.CMSException;
 import org.bouncycastle.cms.RecipientId;
@@ -623 +618 @@
             }
 
+            // Corrige problemas com e-mails vindos do Outlook
+            // Corrige linhas que são terminadas por \n (\x0A) e deveriam ser terminadas por \r\n (\x0D\x0A)
+            Pattern p = Pattern.compile("(?<!\\r)\\n");
+            Matcher matcher = p.matcher(retorno);
+            retorno = matcher.replaceAll(CRLF);
+
             return retorno;
         } else {

branches/2.2/security/ExpressoCert/src/br/gov/serpro/setup/Setup.java

@@ -1 +1 @@
 package br.gov.serpro.setup;
+
 import java.applet.Applet;
 import java.util.HashMap;
@@ -8 +9 @@
 import java.util.ResourceBundle;
 
-
 public class Setup {
 
-        /**
-         *
-         */
-        private static final long serialVersionUID = -8164125429139606589L;
-
-        private Properties parameters;
-        private Properties preferences;
+    /**
+     *
+     */
+    private static final long serialVersionUID = -8164125429139606589L;
+    private Properties parameters;
+    private Properties preferences;
     private Map<String, ResourceBundle> langResources;
     Locale currentLocale;
-        private Applet currentApplet;
-        
+    private Applet currentApplet;
     private static final String PREFERENCES_PATH;
     private static final String EPASS_2000;
@@ -27 +25 @@
     static {
 
-        //PrintStream ps = new PrintStream(System.out);
-                //System.getProperties().list(System.out);
-
-        if (System.getProperty("os.name").equalsIgnoreCase("linux")){
-                        EPASS_2000 = "/usr/lib/libepsng_p11.so";
-                }
-                else {
-                        EPASS_2000 = System.getenv("SystemRoot").replaceAll("\\\\", "/")+"/system32/ngp11v211.dll";
-            //EPASS_2000 = System.getenv("ProgramFiles")+"\\Gemplus\\GemSafe Libraries\\BIN\\gclib.dll";
-                }
+        if (System.getProperty("os.name").equalsIgnoreCase("linux")) {
+            EPASS_2000 = "/usr/lib/libepsng_p11.so";
+        } else {
+            EPASS_2000 = System.getenv("SystemRoot").replaceAll("\\\\", "/") + "/system32/ngp11v211.dll";
+        }
 
 
-                PREFERENCES_PATH = "TESTE";
+        PREFERENCES_PATH = "TESTE";
 
-        }
+    }
 
-        public Setup(Applet applet){
+    public Setup(Applet applet) {
 
-                this.currentApplet = applet;
-                parameters = new Properties();
-                //preferences = Do arquivo apontado por preferences_path
+        this.currentApplet = applet;
+        parameters = new Properties();
+        //preferences = Do arquivo apontado por preferences_path
 
-                // Pega os parâmetros da applet
-                for (String[] parameter: getParameterInfo()){
-                        String parameterName = parameter[0];
-                        String parameterValue;
+        // Pega os parâmetros da applet
+        for (String[] parameter : getParameterInfo()) {
+            String parameterName = parameter[0];
+            String parameterValue;
 
-                        if (this.currentApplet.isActive()){
-                            parameterValue = this.currentApplet.getParameter(parameterName);
-                        }
-                        else {
-                            parameterValue = null;
-                        }
+            parameterValue = this.currentApplet.getParameter(parameterName);
 
-                        //System.out.println("Parameter a ser adicionado - " + parameterName + "= " + parameterValue);
+            System.out.println("parameter: "+parameterName+" value: "+parameterValue);
 
-                        if (parameterValue != null && !parameterValue.equals("")){
-                                parameters.setProperty(parameterName.toLowerCase(), parameterValue);
-                if (parameterName.equalsIgnoreCase("locale")){
+            if (parameterValue != null && !parameterValue.equals("")) {
+                parameters.setProperty(parameterName.toLowerCase(), parameterValue);
+                if (parameterName.equalsIgnoreCase("locale")) {
                     System.out.println("Locale recebido.");
                 }
-                        }
-            else {
+            } else {
                 //Defaults
-                if (parameterName.equalsIgnoreCase("debug")){
+                if (parameterName.equalsIgnoreCase("debug")) {
                     parameters.setProperty(parameterName.toLowerCase(), "false");
                 }
-                if (parameterName.equalsIgnoreCase("token")){
-                    parameters.setProperty(parameterName.toLowerCase(), "Epass2000;"+EPASS_2000);
+                if (parameterName.equalsIgnoreCase("token")) {
+                    parameters.setProperty(parameterName.toLowerCase(), "Epass2000;" + EPASS_2000);
                 }
-                if (parameterName.equalsIgnoreCase("locale")){
+                if (parameterName.equalsIgnoreCase("locale")) {
                     System.out.println("Locale não recebido, definindo valor default.");
                     parameters.setProperty(parameterName.toLowerCase(), "pt_BR");
                 }
             }
-                }
+        }
 
-                //TODO: Pega as preferências do arquivo de preferências se encontrado;
+        //TODO: Pegar as preferências do arquivo de preferências se encontrado;
 
         // Lang Resources
@@ -91 +78 @@
         langResources.put("ExpressoCertMessages", ResourceBundle.getBundle("ExpressoCertMessages", currentLocale));
 
-        }
+    }
 
-        public String[][] getParameterInfo(){
+    public String[][] getParameterInfo() {
 
-                String[][] info = {
-                        {"debug", "boolean", "Habilita mensagens de debug"},
+        String[][] info = {
+            {"debug", "boolean", "Habilita mensagens de debug"},
             {"token", "string", "Lista de tokens suportados. Formato: nome1;caminho1,nome2;caminho2"},
             {"locale", "string", "Locale do sistema"}
-                };
+        };
 
-                return info;
-        }
+        return info;
+    }
 
-        public String[][] getPreferencesInfo(){
+    public String[][] getPreferencesInfo() {
 
-                String[][] info = {
-                        {"preferedToken", "string", "Token preferencial do usuário. Formato: nome;caminho"}
-                };
+        String[][] info = {
+            {"preferedToken", "string", "Token preferencial do usuário. Formato: nome;caminho"}
+        };
 
-                return info;
+        return info;
 
-        }
+    }
 
-        public String getParameter(String key){
-                return parameters.getProperty(key);
-        }
+    public String getParameter(String key) {
+        return parameters.getProperty(key);
+    }
 
-        public String getPreference(String key){
-                return getPreference(key);
-        }
+    public String getPreference(String key) {
+        return getPreference(key);
+    }
 
-        //TODO: implementar PreferenceNotRegisteredException
-        public void setPreference(String key, String value){
+    //TODO: implementar PreferenceNotRegisteredException
+    public void setPreference(String key, String value) {
 
-                boolean exists = false;
-                while (!exists){
-                        for (String[] preference: getPreferencesInfo()){
-                                if (key.equalsIgnoreCase(preference[1])){
-                                        exists = true;
-                                        preferences.setProperty(key, value);
-                                }
-                        }
-                }
+        boolean exists = false;
+        while (!exists) {
+            for (String[] preference : getPreferencesInfo()) {
+                if (key.equalsIgnoreCase(preference[1])) {
+                    exists = true;
+                    preferences.setProperty(key, value);
+                }
+            }
+        }
 
-                if (!exists){
+        if (!exists) {
 //                       throws PreferenceNotRegisteredException();
             System.out.println("Preferência não existe!");
-                }
-        }
+        }
+    }
 
-    Locale buildLocale(String localeCode){
+    Locale buildLocale(String localeCode) {
 
         String[] localeItems = localeCode.split("_");
         Locale locale;
-        
-        switch (localeItems.length){
-            case 1: locale = new Locale(localeItems[0]);
-                    break;
-            case 2: locale = new Locale(localeItems[0], localeItems[1]);
-                    break;
-            case 3: locale = new Locale(localeItems[0], localeItems[1], localeItems[2]);
-                    break;
-            default: locale = new Locale("pt", "BR");
-                    System.out.println("Locale code error, setting default locale: " + locale.toString());
+
+        switch (localeItems.length) {
+            case 1:
+                locale = new Locale(localeItems[0]);
+                break;
+            case 2:
+                locale = new Locale(localeItems[0], localeItems[1]);
+                break;
+            case 3:
+                locale = new Locale(localeItems[0], localeItems[1], localeItems[2]);
+                break;
+            default:
+                locale = new Locale("pt", "BR");
+                System.out.println("Locale code error, setting default locale: " + locale.toString());
         }
 
@@ -160 +151 @@
     }
 
-    public void addLanguageResource(String langResource){
-        System.out.println("registrando recusro de linguagem " + langResource);
+    public void addLanguageResource(String langResource) {
+        System.out.println("registrando recurso de linguagem " + langResource);
         langResources.put(langResource, ResourceBundle.getBundle(langResource, currentLocale));
     }
 
-    public String getLang(String langResource, String message){
+    public String getLang(String langResource, String message) {
 
         ResourceBundle resource = langResources.get(langResource);
@@ -172 +163 @@
         try {
             i18nText = resource.getString(message);
-        }
-        catch (MissingResourceException e){
+        } catch (MissingResourceException e) {
             e.printStackTrace();
         }
@@ -182 +172 @@
     }
 
-        // TODO: Not Implemented Yet
-        public boolean savePreferences(){
-                return false;
-        }
-
+    // TODO: Not Implemented Yet
+    public boolean savePreferences() {
+        return false;
+    }
 }