cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jburwell <...@git.apache.org>
Subject [GitHub] cloudstack pull request #1511: 4.9/master bountycastle changes
Date Tue, 13 Sep 2016 21:31:11 GMT
Github user jburwell commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1511#discussion_r78648332
  
    --- Diff: utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
    @@ -38,125 +38,139 @@
     import java.security.spec.InvalidKeySpecException;
     import java.security.spec.PKCS8EncodedKeySpec;
     import java.util.ArrayList;
    +import java.util.Collection;
    +import java.util.Iterator;
     import java.util.List;
     
    -import com.cloud.utils.exception.CloudRuntimeException;
     import org.apache.commons.codec.binary.Base64;
    +import org.bouncycastle.util.io.pem.PemObject;
    +import org.bouncycastle.util.io.pem.PemReader;
     
     import com.cloud.utils.Ternary;
    -import org.bouncycastle.openssl.PEMReader;
    +import com.cloud.utils.exception.CloudRuntimeException;
     
     public class CertificateHelper {
    -    public static byte[] buildAndSaveKeystore(String alias, String cert, String privateKey,
String storePassword) throws KeyStoreException, CertificateException,
    -        NoSuchAlgorithmException, InvalidKeySpecException, IOException {
    -        KeyStore ks = buildKeystore(alias, cert, privateKey, storePassword);
    +    public static byte[] buildAndSaveKeystore(final String alias, final String cert,
final String privateKey, final String storePassword) throws KeyStoreException, CertificateException,
    +    NoSuchAlgorithmException, InvalidKeySpecException, IOException {
    +        final KeyStore ks = buildKeystore(alias, cert, privateKey, storePassword);
     
    -        ByteArrayOutputStream os = new ByteArrayOutputStream();
    +        final ByteArrayOutputStream os = new ByteArrayOutputStream();
             ks.store(os, storePassword != null ? storePassword.toCharArray() : null);
             os.close();
             return os.toByteArray();
         }
     
    -    public static byte[] buildAndSaveKeystore(List<Ternary<String, String, String>>
certs, String storePassword) throws KeyStoreException, NoSuchAlgorithmException,
    -        CertificateException, IOException, InvalidKeySpecException {
    -        KeyStore ks = KeyStore.getInstance("JKS");
    +    public static byte[] buildAndSaveKeystore(final List<Ternary<String, String,
String>> certs, final String storePassword) throws KeyStoreException, NoSuchAlgorithmException,
    +    CertificateException, IOException, InvalidKeySpecException {
    +        final KeyStore ks = KeyStore.getInstance("JKS");
             ks.load(null, storePassword != null ? storePassword.toCharArray() : null);
     
             //name,cert,key
    -        for (Ternary<String, String, String> cert : certs) {
    +        for (final Ternary<String, String, String> cert : certs) {
                 if (cert.third() == null) {
    -                Certificate c = buildCertificate(cert.second());
    +                final Certificate c = buildCertificate(cert.second());
                     ks.setCertificateEntry(cert.first(), c);
                 } else {
    -                Certificate[] c = new Certificate[certs.size()];
    +                final Certificate[] c = new Certificate[certs.size()];
                     int i = certs.size();
    -                for (Ternary<String, String, String> ct : certs) {
    +                for (final Ternary<String, String, String> ct : certs) {
                         c[i - 1] = buildCertificate(ct.second());
                         i--;
                     }
                     ks.setKeyEntry(cert.first(), buildPrivateKey(cert.third()), storePassword
!= null ? storePassword.toCharArray() : null, c);
                 }
             }
     
    -        ByteArrayOutputStream os = new ByteArrayOutputStream();
    +        final ByteArrayOutputStream os = new ByteArrayOutputStream();
             ks.store(os, storePassword != null ? storePassword.toCharArray() : null);
             os.close();
    --- End diff --
    
    It appears that we are potentially leaving a dangling `OutputSteam` instance.  It seems
like lines 84 and 85 should be wrapped in a try with resources block that translates all checked
exceptions to unchecked exceptions and logs the error.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message