Merged and enhanced pull request #55 (disallow forks setting)

mschaefers

2012-12-04 428b2244aadeb4724e705044d73ac74be724f6e9

 src/com/gitblit/authority/GitblitAuthority.java

@@ -17,6 +17,7 @@


import java.awt.BorderLayout;

import java.awt.Container;

import java.awt.Desktop;

import java.awt.Dimension;

import java.awt.EventQueue;

import java.awt.FlowLayout;

@@ -35,6 +36,7 @@
import java.io.FileWriter;

import java.io.FilenameFilter;

import java.io.IOException;

import java.net.URI;

import java.security.PrivateKey;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

@@ -65,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;

@@ -90,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;

@@ -296,6 +300,24 @@
         

         File caKeystore = new File(folder, X509Utils.CA_KEY_STORE);

         if (!caKeystore.exists()) {

				
            if (!X509Utils.unlimitedStrength) {

               // prompt to confirm user understands JCE Standard Strength encryption

               int res = JOptionPane.showConfirmDialog(GitblitAuthority.this, Translation.get("gb.jceWarning"),

                     Translation.get("gb.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);

               if (res != JOptionPane.YES_OPTION) {

                  if (Desktop.isDesktopSupported()) {

                     if (Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {

                        try {

                           Desktop.getDesktop().browse(URI.create("http://www.oracle.com/technetwork/java/javase/downloads/index.html"));

                        } catch (IOException e) {

                        }

                     }

                  }

                  System.exit(1);

               }

            }

				
            // show certificate defaults dialog 

            certificateDefaultsButton.doClick();

            

@@ -323,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;

   }

@@ -661,6 +684,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) {

@@ -677,6 +717,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")));