[jbosstools-commits] JBoss Tools SVN: r39765 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-03-22 09:23:43 -0400 (Thu, 22 Mar 2012)
New Revision: 39765

Modified:
   branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
Log:
[JBIDE-11322] creating ssh home directory if necessary

Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java	2012-03-22 12:04:05 UTC (rev 39764)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java	2012-03-22 13:23:43 UTC (rev 39765)
@@ -71,14 +71,18 @@
 	}
 
 	public File getLibraPrivateKey() throws OpenShiftException {
+		String ssh2Home = getSSH2Home();
+		return new File(ssh2Home, LIBRA_KEY);
+	}
+
+	private String getSSH2Home() throws OpenShiftException {
 		Preferences preferences = JSchCorePlugin.getPlugin().getPluginPreferences();
 		String ssh2Home = preferences.getString(IConstants.KEY_SSH2HOME);
 		if (ssh2Home == null 
 				|| ssh2Home.trim().length() == 0) {
 			throw new OpenShiftException("Could not determine your ssh2 home directory");
 		}
-		
-		return new File(ssh2Home, LIBRA_KEY);
+		return ssh2Home;
 	}
 
 	public String getNamespace() {
@@ -103,6 +107,7 @@
 			// key already exists
 			return;
 		}
+		createSSHHome(getSSH2Home());
 		File libraPrivateKey = getLibraPrivateKey();
 		SSHKeyPair keyPair = SSHKeyPair.create(passPhrase, libraPrivateKey.getAbsolutePath(), libraPublicKey.getAbsolutePath());
 		setFilePermissions(libraPrivateKey);
@@ -110,6 +115,26 @@
 		setSshKey(keyPair.getPublicKeyPath());
 	}
 	
+	private void createSSHHome(String ssh2Home)
+			throws OpenShiftException {
+		File ssh2HomeFile = new File(ssh2Home);
+		if (FileUtils.canRead(ssh2HomeFile)) {
+			if (!FileUtils.isDirectory(ssh2HomeFile)) {
+				throw new OpenShiftException(
+						ssh2Home + " is a file instead of a directory. This prevents creation and usage of ssh keys");
+			}
+			return;
+		}
+
+		try {
+			if(!ssh2HomeFile.mkdirs()) {
+				throw new OpenShiftException("Could not create ssh2 home directory at {0}", ssh2Home);
+			}
+		} catch(SecurityException e) {
+			throw new OpenShiftException(e, "Could not create ssh2 home directory at {0}", ssh2Home);
+		}
+	}
+	
 	private void setFilePermissions(File file) {
 		// set f permission to correspond to 'chmod 0600' read/write only for user
 		// First clear all permissions for both user and others