Changeset 5179 for branches/2.3

Timestamp:

11/14/11 18:25:14 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2307 - Erro ao tentar logar com cadastrar certificado digital.

Location:

branches/2.3/security

Files:

• ExpressoCert.jar (modified) (previous)
• ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (2 diffs)
• ExpressoCert/src/br/gov/serpro/cert/Token.java (modified) (3 diffs)
• ExpressoCert/src/br/gov/serpro/ui/DialogBuilder.java (modified) (1 diff)

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

@@ -807 +807 @@
             // Adiciona parâmetro certificado no método post, executa o método, pega a resposta do servidor
             // como uma string com CRLF de separador entre os campos e gera um array de Strings
-            httppost.addParameter("certificado", Base64Utils.der2pem(cert.getEncoded()));
+
+            if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+                System.out.println("\nthis.cert: "+Base64Utils.der2pem(this.cert.getEncoded())+"\n");
+            }
+
+            httppost.addParameter("certificado", Base64Utils.der2pem(this.cert.getEncoded()));
             httpclient.executeMethod(httppost);
             resposta = httppost.getResponseBodyAsString().split(CRLF);
@@ -913 +918 @@
             
                 if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+                    System.out.println("Selected Alias: "+this.selectedCertificateAlias);
                     System.out.println("Aliases (" + this.keyStore.size() + "): ");
                     for (Enumeration alias = this.keyStore.aliases(); alias.hasMoreElements();) {

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

@@ -17 +17 @@
 import java.util.logging.Logger;
 import java.security.cert.X509Certificate;
+import java.text.DateFormat;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import sun.security.pkcs11.wrapper.CK_ATTRIBUTE;
@@ -191 +193 @@
                         System.out.println("Private key LABEL: "+new String((char [])TEMPLATE_KEY_LABEL_ID[0].pValue));
                     }
-                    System.out.println("\nCerts:");
-                }
-
+                }
+
+                if (setup.getParameter("debug").equalsIgnoreCase("true")) {
+                    System.out.println("Certs:");
+                }
+                
                 for (long cert : certs){
                     tmpPKCS11.C_GetAttributeValue(session, cert, TEMPLATE_CERT_LABEL_ID);
@@ -208 +213 @@
                             X509Certificate certObj = (X509Certificate)cf.generateCertificate(in);
                             if (certObj.getBasicConstraints() == -1 ){
+
+                                StringBuilder selector = new StringBuilder();
+                                // get more info to generate the value
+                                // Subject's CN / Issuer's CN / Expiration Data
+                                String subject = certObj.getSubjectX500Principal().getName();
+                                int pInicial = subject.indexOf('=')+1;
+                                int pFinal = subject.indexOf(',', pInicial);
+                                selector.append(subject.substring(pInicial, pFinal)+" | ");
+
+                                String issuer = certObj.getIssuerX500Principal().getName();
+                                pInicial = issuer.indexOf('=')+1;
+                                pFinal = issuer.indexOf(',', pInicial);
+                                selector.append(issuer.substring(pInicial, pFinal)+" | ");
+
+                                Locale locale = new Locale("pt", "BR");
+                                DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+                                selector.append(df.format(certObj.getNotAfter())+" | ");
+                                
+                                selector.append("("+certObj.getSerialNumber()+")");
+                                
                                 aliases.put(new String((char [])TEMPLATE_CERT_LABEL_ID[0].pValue),
-                                        certObj.getSubjectX500Principal().getName());
+                                        selector.toString());
                             }
                         }

branches/2.3/security/ExpressoCert/src/br/gov/serpro/ui/DialogBuilder.java

@@ -372 +372 @@
 
             String subject = certificateSelectorDialog.getCertificateSubject();
-            String label = "";
+            String label = null;
 
             for (Map.Entry<String, String> entry : entries){