[jbosstools-commits] JBoss Tools SVN: r35634 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.

Author: adietish Date: 2011-10-13 16:10:24 -0400 (Thu, 13 Oct 2011) New Revision: 35634 Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java Log: [JBIDE-9793] implemented key validator and "new" (create new key pair) functionality Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-13 20:09:45 UTC (rev 35633) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-13 20:10:24 UTC (rev 35634) @@ -30,4 +30,5 @@ Import-Package: org.jboss.tools.common.databinding, org.jboss.tools.common.ui, org.jboss.tools.common.ui.databinding, - org.jboss.tools.common.ui.preferencevalue + org.jboss.tools.common.ui.preferencevalue, + org.jboss.tools.common.ui.ssh Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-13 20:09:45 UTC (rev 35633) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-10-13 20:10:24 UTC (rev 35634) @@ -11,16 +11,26 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import java.io.File; +import java.io.FileNotFoundException; import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.validation.IValidator; +import org.eclipse.core.databinding.validation.ValidationStatus; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport; import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.dialogs.IInputValidator; +import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -29,17 +39,25 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.ui.databinding.DataBindingUtils; +import org.jboss.tools.common.ui.databinding.MandatoryStringValidator; +import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; +import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences; +import org.jboss.tools.openshift.express.client.OpenshiftException; +import org.jboss.tools.openshift.express.client.SSHKeyPair; +import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; /** * @author André Dietisheim */ public class NewDomainWizardPage extends AbstractOpenshiftWizardPage { - private static final String DIRECTORY_SSH_KEYS = ".ssh"; + private static final String OPENSHIFT_KEY_PREFIX = "openshift_id_rsa_"; + private static final String PUBLIC_KEY_SUFFIX = ".pub"; private static final String FILTEREXPRESSION_PUBLIC_SSH_KEY = "*.pub"; private static final String FILTERNAME_PUBLIC_SSH_KEY = "Public ssh key file (*.pub)"; @@ -51,44 +69,133 @@ } protected void doCreateControls(Composite container, DataBindingContext dbc) { - GridLayoutFactory.fillDefaults().numColumns(3).applyTo(container); + GridLayoutFactory.fillDefaults().numColumns(4).applyTo(container); Label namespaceLabel = new Label(container, SWT.NONE); namespaceLabel.setText("&Domain name"); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(namespaceLabel); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).applyTo(namespaceLabel); Text namespaceText = new Text(container, SWT.BORDER); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(namespaceText); + GridDataFactory.fillDefaults() + .span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(namespaceText); DataBindingUtils.bindMandatoryTextField( namespaceText, "Domain name", NewDomainWizardModel.PROPERTY_NAMESPACE, model, dbc); Label sshKeyLabel = new Label(container, SWT.NONE); sshKeyLabel.setText("SSH Public Key"); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(sshKeyLabel); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).applyTo(sshKeyLabel); Text sshKeyText = new Text(container, SWT.READ_ONLY | SWT.BORDER); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(sshKeyText); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(sshKeyText); + Binding sshKeyTextBinding = dbc.bindValue( + WidgetProperties.text(SWT.Modify).observe(sshKeyText), + BeanProperties.value(NewDomainWizardModel.PROPERTY_SSHKEY).observe(model), + new UpdateValueStrategy().setAfterGetValidator(new MandatoryStringValidator( + "You have to select a ssh public key")), + new UpdateValueStrategy().setAfterGetValidator(new SSHKeyValidator())); + ControlDecorationSupport.create(sshKeyTextBinding, SWT.TOP | SWT.LEFT); - Binding sshKeyBinding = dbc.bindValue( - WidgetProperties.text(SWT.Modify).observe(sshKeyText) - , BeanProperties.value(NewDomainWizardModel.PROPERTY_SSHKEY).observe(model) - , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER) - , null - ); - ControlDecorationSupport.create(sshKeyBinding, SWT.TOP | SWT.LEFT); + Button browseButton = new Button(container, SWT.PUSH); + browseButton.setText("Browse"); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseButton); + browseButton.addSelectionListener(onBrowse()); - Button browseSShKeyButton = new Button(container, SWT.PUSH); - browseSShKeyButton.setText("Browse"); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseSShKeyButton); - browseSShKeyButton.addSelectionListener(onBrowseSshKey()); + Button createButton = new Button(container, SWT.PUSH); + createButton.setText("New"); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(createButton); + createButton.addSelectionListener(onNew()); + + new Label(container, SWT.NONE); // spacer + Link sshPrefsLink = new Link(container, SWT.NONE); + sshPrefsLink + .setText("Please make sure that your private key for the public key is listed in the <a>SSH2 Preferences</a>"); + GridDataFactory.fillDefaults() + .span(2, 1).align(SWT.FILL, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(sshPrefsLink); + sshPrefsLink.addSelectionListener(onSshPrefs()); + } - private SelectionListener onBrowseSshKey() { + private SelectionListener onNew() { return new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { + + InputDialog dialog = new InputDialog(getShell(), + "New ssh key" + , "Please pick a passphrase for your new ssh key pair", "openshift" + , new IInputValidator() { + + @Override + public String isValid(String input) { + if (isEmpty(input)) { + return "You have to provide a pass phrase"; + } + return null; + } + }); + if (Dialog.OK == dialog.open()) { + try { + String passPhrase = dialog.getValue(); + String sshKeysDirectory = SshPrivateKeysPreferences.getSshKeyDirectory(); + SSHKeyPair keyPair = createSshKeyPair(passPhrase, sshKeysDirectory); + SshPrivateKeysPreferences.add(keyPair.getPrivateKeyPath()); + model.setSshKey(keyPair.getPublicKeyPath()); + } catch (FileNotFoundException ex) { + IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + "Could not read the ssh key folder", ex); + OpenshiftUIActivator.log(status); + ErrorDialog.openError(getShell(), + "Error creating a new ssh key pair", + "Could not create a new ssh key pair", status); + } catch (OpenshiftException ex) { + IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, + "Could not create an ssh key pair", ex); + OpenshiftUIActivator.log(status); + ErrorDialog.openError(getShell(), + "Error creating a new ssh key pair", + "Could not create a new ssh key pair", status); + } + } + } + }; + } + + private SSHKeyPair createSshKeyPair(String passPhrase, String sshKeysDirectory) throws OpenshiftException { + String privateKeyPath = getKeyPairFileName(sshKeysDirectory); + String publicKeyPath = getPublicKeyPath(privateKeyPath); + return SSHKeyPair.create(passPhrase, privateKeyPath, publicKeyPath); + } + + private String getKeyPairFileName(String sshKeysDirectory) { + int i = 0; + File privateKey = null; + while (isReadable(privateKey = new File(sshKeysDirectory, OPENSHIFT_KEY_PREFIX + i)) + || isReadable(new File(sshKeysDirectory, getPublicKeyPath(privateKey.getName())))) { + i++; + } + return privateKey.getAbsolutePath(); + } + + private String getPublicKeyPath(String privateKeyPath) { + return privateKeyPath + PUBLIC_KEY_SUFFIX; + } + + private SelectionListener onBrowse() { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); FileDialog dialog = new FileDialog(shell); - dialog.setFilterPath(getSshKeysDirectory()); + try { + dialog.setFilterPath(SshPrivateKeysPreferences.getSshKeyDirectory()); + } catch (FileNotFoundException ex) { + // ignore + } dialog.setFilterNames(new String[] { FILTERNAME_PUBLIC_SSH_KEY }); dialog.setFilterExtensions(new String[] { FILTEREXPRESSION_PUBLIC_SSH_KEY }); String sshKeyPath = dialog.open(); @@ -99,9 +206,79 @@ }; } - private String getSshKeysDirectory() { - String userHome = System.getProperty("user.home"); - File sshKeysDirectory = new File(userHome, DIRECTORY_SSH_KEYS); - return sshKeysDirectory.getAbsolutePath(); + private SelectionAdapter onSshPrefs() { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + SshPrivateKeysPreferences.openPreferencesPage(getShell()); + } + }; } + + @Override + protected void setupWizardPageSupport(DataBindingContext dbc) { + ParametrizableWizardPageSupport.create( + IStatus.ERROR, this, + dbc); + } + + private class SSHKeyValidator implements IValidator { + + @Override + public IStatus validate(Object value) { + if (!(value instanceof String) + || isEmpty((String) value) + || !isReadable((String) value)) { + return ValidationStatus.error("You have to provide a valid ssh public key"); + } + if (!isKeyKnownToSsh((String) value)) { + return ValidationStatus.warning( + NLS.bind("Could not find the private portion for the public key \"{0}\". " + + "Make sure your private key is listed in the ssh2 preferences.", value)); + } + return ValidationStatus.ok(); + } + + private boolean isKeyKnownToSsh(String publicKeyPath) { + if (isEmpty(publicKeyPath)) { + return false; + } + for (String preferencesKey : SshPrivateKeysPreferences.getKeys()) { + try { + File privateKey = SshPrivateKeysPreferences.getPrivateKey(preferencesKey); + if (privateKey == null + || !isReadable(privateKey)) { + continue; + } + if (publicKeyPath.startsWith(privateKey.getAbsolutePath() + ".")) { + return true; + } + } catch (FileNotFoundException e) { + continue; + } + } + return false; + } + } + + private boolean isReadable(String path) { + if (path == null) { + return false; + } + return isReadable(new File(path)); + } + + private boolean isReadable(File file) { + if (file == null) { + return false; + } + return file.exists() + && file.canRead(); + } + + private boolean isEmpty(String value) { + return value == null + || ((String) value).length() == 0; + } }