From 87d72e9d7b175142f8de9856a0e2e497646eda2f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 29 Nov 2012 17:11:58 -0500 Subject: [PATCH] Tweak css of short commit id in log and history views --- src/com/gitblit/authority/GitblitAuthority.java | 116 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 75 insertions(+), 41 deletions(-) diff --git a/src/com/gitblit/authority/GitblitAuthority.java b/src/com/gitblit/authority/GitblitAuthority.java index 446c029..5ee6af5 100644 --- a/src/com/gitblit/authority/GitblitAuthority.java +++ b/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; @@ -128,6 +130,8 @@ private MailExecutor mail; private JButton certificateDefaultsButton; + + private JButton newSSLCertificate; public static void main(String... args) { EventQueue.invokeLater(new Runnable() { @@ -294,25 +298,38 @@ 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(); + + // create "localhost" ssl certificate + prepareX509Infrastructure(); } } } private boolean prepareX509Infrastructure() { if (caKeystorePassword == null) { - caKeystorePassword = gitblitSettings.getString(Keys.server.storePassword, null); - JPasswordField pass = new JPasswordField(10){ - private static final long serialVersionUID = 1L; - - public void addNotify() - { - super.addNotify(); - requestFocusInWindow(); - } - }; + JPasswordField pass = new JPasswordField(10); pass.setText(caKeystorePassword); + pass.addAncestorListener(new RequestFocusListener()); JPanel panel = new JPanel(new BorderLayout()); panel.add(new JLabel(Translation.get("gb.enterKeystorePassword")), BorderLayout.NORTH); panel.add(pass, BorderLayout.CENTER); @@ -320,12 +337,12 @@ if (result == JOptionPane.OK_OPTION) { caKeystorePassword = new String(pass.getPassword()); } else { - caKeystorePassword = null; return false; } } X509Metadata metadata = new X509Metadata("localhost", caKeystorePassword); + setMetadataDefaults(metadata); X509Utils.prepareX509Infrastructure(metadata, folder, this); return true; } @@ -393,29 +410,11 @@ } Date notAfter = metadata.notAfter; - metadata.serverHostname = gitblitSettings.getString(Keys.web.siteName, Constants.NAME); - if (StringUtils.isEmpty(metadata.serverHostname)) { - metadata.serverHostname = Constants.NAME; - } - UserModel user = ucm.user; - - // set default values from config file - File certificatesConfigFile = new File(folder, X509Utils.CA_CONFIG); - FileBasedConfig config = new FileBasedConfig(certificatesConfigFile, FS.detect()); - if (certificatesConfigFile.exists()) { - try { - config.load(); - } catch (Exception e) { - Utils.showException(GitblitAuthority.this, e); - } - NewCertificateConfig certificateConfig = NewCertificateConfig.KEY.parse(config); - certificateConfig.update(metadata); - } - - // restore expiration date + setMetadataDefaults(metadata); metadata.notAfter = notAfter; // set user's specified OID values + UserModel user = ucm.user; if (!StringUtils.isEmpty(user.organizationalUnit)) { metadata.oids.put("OU", user.organizationalUnit); } @@ -439,12 +438,8 @@ if (ucm.expires == null || metadata.notAfter.before(ucm.expires)) { ucm.expires = metadata.notAfter; } - ucm.update(config); - try { - config.save(); - } catch (Exception e) { - Utils.showException(GitblitAuthority.this, e); - } + + updateAuthorityConfig(ucm); // refresh user ucm.certs = null; @@ -594,7 +589,7 @@ } }); - JButton newSSLCertificate = new JButton(new ImageIcon(getClass().getResource("/rosette_16x16.png"))); + newSSLCertificate = new JButton(new ImageIcon(getClass().getResource("/rosette_16x16.png"))); newSSLCertificate.setFocusable(false); newSSLCertificate.setToolTipText(Translation.get("gb.newSSLCertificate")); newSSLCertificate.addActionListener(new ActionListener() { @@ -672,8 +667,7 @@ metadata.serverHostname = Constants.NAME; } metadata.userDisplayname = ucm.user.getDisplayName(); - sendEmail(ucm.user, metadata, zip); - return true; + return sendEmail(ucm.user, metadata, zip); } @Override @@ -780,7 +774,7 @@ } } - private void sendEmail(UserModel user, X509Metadata metadata, File zip) { + private boolean sendEmail(UserModel user, X509Metadata metadata, File zip) { // send email try { if (mail.isReady()) { @@ -807,11 +801,51 @@ message.setContent(mp); mail.sendNow(message); + return true; } else { JOptionPane.showMessageDialog(GitblitAuthority.this, "Sorry, the mail server settings are not configured properly.\nCan not send email.", Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE); } } catch (Exception e) { Utils.showException(GitblitAuthority.this, e); } + return false; + } + + private void setMetadataDefaults(X509Metadata metadata) { + metadata.serverHostname = gitblitSettings.getString(Keys.web.siteName, Constants.NAME); + if (StringUtils.isEmpty(metadata.serverHostname)) { + metadata.serverHostname = Constants.NAME; + } + + // set default values from config file + File certificatesConfigFile = new File(folder, X509Utils.CA_CONFIG); + FileBasedConfig config = new FileBasedConfig(certificatesConfigFile, FS.detect()); + if (certificatesConfigFile.exists()) { + try { + config.load(); + } catch (Exception e) { + Utils.showException(GitblitAuthority.this, e); + } + NewCertificateConfig certificateConfig = NewCertificateConfig.KEY.parse(config); + certificateConfig.update(metadata); + } + } + + private void updateAuthorityConfig(UserCertificateModel ucm) { + File certificatesConfigFile = new File(folder, X509Utils.CA_CONFIG); + FileBasedConfig config = new FileBasedConfig(certificatesConfigFile, FS.detect()); + if (certificatesConfigFile.exists()) { + try { + config.load(); + } catch (Exception e) { + Utils.showException(GitblitAuthority.this, e); + } + } + ucm.update(config); + try { + config.save(); + } catch (Exception e) { + Utils.showException(GitblitAuthority.this, e); + } } } -- Gitblit v1.9.1