Changeset 3633 for branches/2.2/security/ExpressoCert/src/br/gov/serpro/cert

Timestamp:

12/27/10 12:27:43 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1430 - Mais de um certificados gravados no mesmo token.

File:

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

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

@@ -81 +81 @@
 
     private TokenCollection tokens;
+    private String selectedCertificateAlias;
     private Certificate cert; // Certificado extraído da KeyStore. Pode ser nulo.
     private KeyStore keyStore; // KeyStore que guarda o certificado do usuário. Pode ser nulo.
@@ -233 +234 @@
 
         this.cert = null;
+        this.selectedCertificateAlias = null;
         this.keyStore = null;
         this.hostAddress = null;
@@ -343 +345 @@
             if (pin != null) {
                 openKeyStore(pin.toCharArray());
-                privateKey = this.keyStore.getKey(keyStore.aliases().nextElement(), pin.toCharArray());
+                if (this.selectedCertificateAlias == null){
+                    return null;
+                }
+                privateKey = this.keyStore.getKey(this.selectedCertificateAlias, pin.toCharArray());
             } else {
                 return null;
@@ -521 +526 @@
             if (pin != null) {
                 openKeyStore(pin.toCharArray());
-                privateKey = this.keyStore.getKey(keyStore.aliases().nextElement(), pin.toCharArray());
+                if (this.selectedCertificateAlias == null){
+                    return null;
+                }
+                privateKey = this.keyStore.getKey(this.selectedCertificateAlias, pin.toCharArray());
             } else {
                 return null;
@@ -601 +609 @@
                 ByteArrayOutputStream oStream = new ByteArrayOutputStream();
                 decriptedBodyPart.writeTo(oStream);
-                decriptedBodyPart = null;
+
+                decriptedBodyPart = null;
                 encriptedMsg = null;
 
@@ -609 +618 @@
 
             } else {
+                
                 encriptedMsg.setContent(decriptedBodyPart.getContent(), decriptedBodyPart.getContentType());
                 encriptedMsg.saveChanges();
@@ -650 +660 @@
         String[] resposta = null;
 
+        if (this.selectedCertificateAlias == null){
+            return resposta;
+        }
+
         if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
             System.out.println("Proxy Configurado no browser: " + System.getProperty("http.proxyHost") + ":" + System.getProperty("http.proxyPort"));
@@ -710 +724 @@
 
         // Pega a chave privada do primeiro certificado armazenado na KeyStore
-        Enumeration<String> en = this.keyStore.aliases();
-        String certAlias = en.nextElement();
-        Key privateKey = this.keyStore.getKey(certAlias, pin.toCharArray());
+        Key privateKey = this.keyStore.getKey(selectedCertificateAlias, pin.toCharArray());
 
         // Inicializa os cipher com os parâmetros corretos para realizar a decriptação
@@ -745 +757 @@
      */
     public void openKeyStore(char[] pin) throws IOException {
-
+        // TODO:  Verify if object DigitalCertificate was initiated
         try {
 
@@ -754 +766 @@
             }
 
-            this.cert = this.keyStore.getCertificate(this.keyStore.aliases().nextElement());
-
-            System.out.println("Aliases (" + this.keyStore.size() + "): ");
-            if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
-                for (Enumeration alias = this.keyStore.aliases(); alias.hasMoreElements();) {
-                    System.out.println(alias.nextElement());
-                }
-            }
+            List<String> aliases = new ArrayList<String>();
+            for (Enumeration<String> certificateList = keyStore.aliases(); certificateList.hasMoreElements();){
+                aliases.add(certificateList.nextElement());
+            }
+
+            // selecionador de certificado
+            this.selectedCertificateAlias = DialogBuilder.showCertificateSelector(this.parentFrame, this.setup, aliases);
+            if (this.selectedCertificateAlias != null){
+                this.cert = this.keyStore.getCertificate(this.selectedCertificateAlias);
+            
+                System.out.println("Aliases (" + this.keyStore.size() + "): ");
+                if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+                    for (Enumeration alias = this.keyStore.aliases(); alias.hasMoreElements();) {
+                        System.out.println(alias.nextElement());
+                    }
+                }
+            }
 
         } catch (GeneralSecurityException e) {