Checkbox to automatically set the new ssl certificate alias

James Moger

2012-12-05 d63157b22bb8a7294080be29ca0fca8ecda96db9

 src/com/gitblit/authority/GitblitAuthority.java

@@ -67,6 +67,7 @@
import javax.swing.JScrollPane;

import javax.swing.JSplitPane;

import javax.swing.JTable;

import javax.swing.JTextArea;

import javax.swing.JTextField;

import javax.swing.RowFilter;

import javax.swing.SwingConstants;

@@ -92,6 +93,7 @@
import com.gitblit.client.Translation;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.FileUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;

import com.gitblit.utils.X509Utils;

@@ -343,6 +345,7 @@


      X509Metadata metadata = new X509Metadata("localhost", caKeystorePassword);

      setMetadataDefaults(metadata);

      metadata.notAfter = new Date(System.currentTimeMillis() + 10*TimeUtils.ONEYEAR);

      X509Utils.prepareX509Infrastructure(metadata, folder, this);

      return true;

   }

@@ -604,7 +607,8 @@
            }

            final Date expires = dialog.getExpiration();

            final String hostname = dialog.getHostname();



            final boolean serveCertificate = dialog.isServeCertificate();

				
            AuthorityWorker worker = new AuthorityWorker(GitblitAuthority.this) {



               @Override

@@ -620,17 +624,31 @@
                  

                  // generate new SSL certificate

                  X509Metadata metadata = new X509Metadata(hostname, caKeystorePassword);

                  setMetadataDefaults(metadata);

                  metadata.notAfter = expires;

                  File serverKeystoreFile = new File(folder, X509Utils.SERVER_KEY_STORE);

                  X509Certificate cert = X509Utils.newSSLCertificate(metadata, caPrivateKey, caCert, serverKeystoreFile, GitblitAuthority.this);

                  return cert != null;

                  boolean hasCert = cert != null;

                  if (hasCert && serveCertificate) {

                     // update Gitblit https connector alias

                     Map<String, String> updates = new HashMap<String, String>();

                     updates.put(Keys.server.certificateAlias, metadata.commonName);

                     gitblitSettings.saveSettings(updates);

                  }

                  return hasCert;

               }



               @Override

               protected void onSuccess() {

                  JOptionPane.showMessageDialog(GitblitAuthority.this, 
                  if (serveCertificate) {

                     JOptionPane.showMessageDialog(GitblitAuthority.this, 
                           MessageFormat.format(Translation.get("gb.sslCertificateGeneratedRestart"), hostname),

                           Translation.get("gb.newSSLCertificate"), JOptionPane.INFORMATION_MESSAGE);

                  } else {

                     JOptionPane.showMessageDialog(GitblitAuthority.this, 
                        MessageFormat.format(Translation.get("gb.sslCertificateGenerated"), hostname),

                        Translation.get("gb.newSSLCertificate"), JOptionPane.INFORMATION_MESSAGE);

                  }

               }

            };

            

@@ -681,6 +699,23 @@
         }

      });

      

      JButton logButton = new JButton(new ImageIcon(getClass().getResource("/script_16x16.png")));

      logButton.setFocusable(false);

      logButton.setToolTipText(Translation.get("gb.log"));		
      logButton.addActionListener(new ActionListener() {

         @Override

         public void actionPerformed(ActionEvent e) {

            File log = new File(folder, X509Utils.CERTS + File.separator + "log.txt");

            if (log.exists()) {

               String content = FileUtils.readContent(log,  "\n");

               JTextArea textarea = new JTextArea(content);

               JScrollPane scrollPane = new JScrollPane(textarea);

               scrollPane.setPreferredSize(new Dimension(700, 400));

               JOptionPane.showMessageDialog(GitblitAuthority.this, scrollPane, log.getAbsolutePath(), JOptionPane.INFORMATION_MESSAGE);

            }

         }

      });

		
      final JTextField filterTextfield = new JTextField(15);

      filterTextfield.addActionListener(new ActionListener() {

         public void actionPerformed(ActionEvent e) {

@@ -697,6 +732,7 @@
      buttonControls.add(certificateDefaultsButton);

      buttonControls.add(newSSLCertificate);

      buttonControls.add(emailBundle);

      buttonControls.add(logButton);



      JPanel userControls = new JPanel(new FlowLayout(FlowLayout.RIGHT, Utils.MARGIN, Utils.MARGIN));

      userControls.add(new JLabel(Translation.get("gb.filter")));