Changeset 5386 for branches/2.3/security

Timestamp:

01/17/12 15:57:56 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2451 - Erro no login com certificado, verificação cas.

Location:

branches/2.3/security

Files:

• ExpressoCert.jar (modified) (previous)
• ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (3 diffs)
• ExpressoCert/src/br/gov/serpro/setup/Setup.java (modified) (2 diffs)
• ExpressoCert/src/br/gov/serpro/util/Base64Utils.java (modified) (1 diff)
• ExpressoCertLogin.jar (modified) (previous)
• ExpressoCertLogin/src/br (added)
• ExpressoCertLogin/src/br/gov (added)
• ExpressoCertLogin/src/br/gov/serpro (added)
• ExpressoCertLogin/src/br/gov/serpro/i18n (added)
• ExpressoCertLogin/src/br/gov/serpro/i18n/ExpressoCertLoginMessages_pt_BR.properties (added)
• ExpressoCertLoginMessages_pt_BR.properties (deleted)
• ExpressoCertMail.jar (modified) (previous)
• ExpressoCertMail/src/ExpressoSmimeApplet.java (modified) (1 diff)
• ExpressoCertMail/src/br/gov/serpro/i18n (added)
• ExpressoCertMail/src/br/gov/serpro/i18n/ExpressoCertMailMessages_pt_BR.properties (added)
• ExpressoCertMailMessages_pt_BR.properties (deleted)
• ExpressoCertMessages_pt_BR.properties (deleted)

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

@@ -483 +483 @@
             return null;
         }
-
+        
         Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
 
@@ -837 +837 @@
 
             if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
-                System.out.println("\nthis.cert: "+Base64Utils.der2pem(this.cert.getEncoded())+"\n");
+                System.out.println("\nthis.cert: "+ this.getPEMCertificate()+"\n");
             }
 
-            httppost.addParameter("certificado", Base64Utils.der2pem(this.cert.getEncoded()));
+            httppost.addParameter("certificado", this.getPEMCertificate());
             httpclient.executeMethod(httppost);
             resposta = httppost.getResponseBodyAsString().split(CRLF);
@@ -976 +976 @@
     public String getPEMCertificate() throws CertificateEncodingException {
         if (this.cert != null){
-            return Base64Utils.der2pem(this.cert.getEncoded());
+            return Base64Utils.der2pem(this.cert.getEncoded(), true);
         }
         return null;

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

@@ -145 +145 @@
     Locale buildLocale(String localeCode) {
 
-        String[] localeItems = localeCode.split("_");
+        String splitter = localeCode.indexOf('_') != -1 ? "_" : "-" ;
+        String[] localeItems = localeCode.split(splitter);
         Locale locale;
 
@@ -168 +169 @@
     public void addLanguageResource(String langResource) {
         System.out.println("registrando recurso de linguagem " + langResource);
-        langResources.put(langResource, ResourceBundle.getBundle(langResource, currentLocale));
+        langResources.put(langResource, ResourceBundle.getBundle("br.gov.serpro.i18n."+langResource, currentLocale));
     }
 

branches/2.3/security/ExpressoCert/src/br/gov/serpro/util/Base64Utils.java

@@ -144 +144 @@
 
         String beginCertificate = "-----BEGIN CERTIFICATE-----" +CRLF;
-        String endCertificate = "-----END CERTIFICATE-----";
+        String endCertificate = "-----END CERTIFICATE-----" +CRLF;
 
         if (isCert){

branches/2.3/security/ExpressoCertMail/src/ExpressoSmimeApplet.java

@@ -31 +31 @@
                 this.setSize(1, 1);
                 this.setup = new Setup(this);
-        this.setup.addLanguageResource("ExpressoCertMailMessages");
+                this.setup.addLanguageResource("ExpressoCertMailMessages");
                 this.dataReader = new Javascript2AppletPassingData();
                 // this.paramReaderThread = new ParamReaderThread(JSObject.getWindow(this), dataReader, setup);