Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JBIDE-15679 - Unable to create SSH session for application 'main' Auth fail #248

Merged
merged 1 commit into from
Oct 16, 2013
Merged

JBIDE-15679 - Unable to create SSH session for application 'main' Auth fail #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/org.jboss.tools.openshift.express.client/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/openshift-java-client-2.4.0.Final.jar"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/openshift-java-client-2.5.0-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jboss-dmr-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
lib/openshift-java-client-2.4.0.Final.jar,
lib/openshift-java-client-2.5.0-SNAPSHOT.jar,
lib/jboss-dmr-1.0.0.Final.jar,
lib/log4j-1.2.17.jar,
lib/slf4j-api-1.6.1.jar,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.express.client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>org.jboss.tools.openshift.express.client</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<openshift-java-client.version>2.4.0.Final</openshift-java-client.version>
<openshift-java-client.version>2.5.0-SNAPSHOT</openshift-java-client.version>
<jboss-dmr.version>1.0.0.Final</jboss-dmr.version>
<log4j.version>1.2.17</log4j.version>
<slf4j-api.version>1.6.1</slf4j-api.version>
Expand Down
48 changes: 27 additions & 21 deletions ...i/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.utils;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -69,31 +71,35 @@ public static OpenShiftSshSessionFactory getInstance() {
}

public Session createSession(final IApplication application) throws OpenShiftSSHOperationException {
final URIish uri = getSshUri(application);
final Session session = cache.get(uri);
if (session == null || !session.isConnected()) {
final FS fs = FS.DETECTED;
if (config == null) {
config = OpenSshConfig.get(fs);
}
String user = uri.getUser();
String host = uri.getHost();
int port = uri.getPort();
JSch.setLogger(new JschToEclipseLogger());
final OpenSshConfig.Host hc = config.lookup(host);
try {
cache.put(uri, createSession(hc, user, host, port, fs));
} catch (JSchException e) {
throw new OpenShiftSSHOperationException(e, "Unable to create SSH session for application ''{0}''", application);
try {
final URIish uri = getSshUri(application);
final Session session = cache.get(uri);
if (session == null || !session.isConnected()) {
final FS fs = FS.DETECTED;
if (config == null) {
config = OpenSshConfig.get(fs);
}
String user = uri.getUser();
String host = uri.getHost();
int port = uri.getPort();
JSch.setLogger(new JschToEclipseLogger());
final OpenSshConfig.Host hc = config.lookup(host);
try {
cache.put(uri, createSession(hc, user, host, port, fs));
} catch (JSchException e) {
throw new OpenShiftSSHOperationException(e, "Unable to create SSH session for application ''{0}''", application);
}
}
return cache.get(uri);
} catch (URISyntaxException e1) {
throw new OpenShiftSSHOperationException(e1, "Failed to create SSH Session for application ''{0}''", application.getName());
}
return cache.get(uri);
}

static URIish getSshUri(IApplication application) {
final String host = application.getName() + "-" + application.getDomain().getId() + "."
+ application.getDomain().getSuffix();
final String user = application.getUUID();
static URIish getSshUri(IApplication application) throws URISyntaxException {
final URI sshURI = new URI(application.getSshUrl());
final String host = sshURI.getHost();
final String user = sshURI.getUserInfo();
final URIish uri = new URIish().setHost(host).setPort(22).setUser(user);
return uri;
}
Expand Down