Checkbox to automatically set the new ssl certificate alias

James Moger

2012-12-05 d63157b22bb8a7294080be29ca0fca8ecda96db9

 src/com/gitblit/utils/X509Utils.java

@@ -46,11 +46,13 @@
import java.security.cert.X509Certificate;

import java.text.MessageFormat;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.TimeZone;

@@ -556,6 +558,16 @@
         certBuilder.addExtension(X509Extension.basicConstraints, false, new BasicConstraints(false));

         certBuilder.addExtension(X509Extension.authorityKeyIdentifier, false, extUtils.createAuthorityKeyIdentifier(caCert.getPublicKey()));



         // support alternateSubjectNames for SSL certificates

         List<GeneralName> altNames = new ArrayList<GeneralName>();

         if (HttpUtils.isIpAddress(sslMetadata.commonName)) {

            altNames.add(new GeneralName(GeneralName.iPAddress, sslMetadata.commonName));				
         }

         if (altNames.size() > 0) {

            GeneralNames subjectAltName = new GeneralNames(altNames.toArray(new GeneralName [altNames.size()]));

            certBuilder.addExtension(X509Extension.subjectAlternativeName, false, subjectAltName);

         }



         ContentSigner caSigner = new JcaContentSignerBuilder(SIGNING_ALGORITHM)

               .setProvider(BC).build(caPrivateKey);

         X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC)

@@ -759,6 +771,17 @@
                 zos.write(FileUtils.readContent(pemFile));

                 zos.closeEntry();

              }

	        	
              // include user's public certificate

              zos.putNextEntry(new ZipEntry(clientMetadata.commonName + ".cer"));

              zos.write(cert.getEncoded());

              zos.closeEntry();

        		
              // include CA public certificate

              zos.putNextEntry(new ZipEntry("ca.cer"));

              zos.write(caCert.getEncoded());

              zos.closeEntry();

        		
              if (readme != null) {

                 zos.putNextEntry(new ZipEntry("README.TXT"));

                 zos.write(readme.getBytes("UTF-8"));