+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.console;
+
+import java.io.Console;
+
+import org.eclipse.jgit.transport.OpenSshConfig;
+import org.eclipse.jgit.transport.SshConfigSessionFactory;
+import org.eclipse.jgit.transport.SshSessionFactory;
+
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.UIKeyboardInteractive;
+import com.jcraft.jsch.UserInfo;
+
+/**
+ * Loads known hosts and private keys from $HOME/.ssh.
+ *
+ * This is the default implementation used by JGit and provides most of the
+ * compatibility necessary to match OpenSSH, a popular implementation of SSH
+ * used by C Git.
+ *
+ * If user interactivity is required by SSH (e.g. to obtain a password) the
+ * system console is used to display a prompt to the end-user.
+ */
+public class ConsoleSshSessionFactory extends SshConfigSessionFactory {
+ /** Install this session factory implementation into the JVM. */
+ public static void install() {
+ final ConsoleSshSessionFactory c = new ConsoleSshSessionFactory();
+ if (c.cons == null)
+ throw new NoClassDefFoundError("No System.console available");
+ SshSessionFactory.setInstance(c);
+ }
+
+ private final Console cons = System.console();
+
+ @Override
+ protected void configure(final OpenSshConfig.Host hc, final Session session) {
+ if (!hc.isBatchMode())
+ session.setUserInfo(new ConsoleUserInfo());
+ }
+
+ private class ConsoleUserInfo implements UserInfo, UIKeyboardInteractive {
+ private String passwd;
+
+ private String passphrase;
+
+ public void showMessage(final String msg) {
+ cons.printf("%s\n", msg);
+ cons.flush();
+ }
+
+ public boolean promptYesNo(final String msg) {
+ String r = cons.readLine("%s [y/n]? ", msg);
+ return "y".equalsIgnoreCase(r);
+ }
+
+ public boolean promptPassword(final String msg) {
+ passwd = null;
+ char[] p = cons.readPassword("%s: ", msg);
+ if (p != null) {
+ passwd = new String(p);
+ return true;
+ }
+ return false;
+ }
+
+ public boolean promptPassphrase(final String msg) {
+ passphrase = null;
+ char[] p = cons.readPassword("%s: ", msg);
+ if (p != null) {
+ passphrase = new String(p);
+ return true;
+ }
+ return false;
+ }
+
+ public String getPassword() {
+ return passwd;
+ }
+
+ public String getPassphrase() {
+ return passphrase;
+ }
+
+ public String[] promptKeyboardInteractive(final String destination,
+ final String name, final String instruction,
+ final String[] prompt, final boolean[] echo) {
+ cons.printf("%s: %s\n", destination, name);
+ cons.printf("%s\n", instruction);
+ final String[] response = new String[prompt.length];
+ for (int i = 0; i < prompt.length; i++) {
+ if (echo[i]) {
+ response[i] = cons.readLine("%s: ", prompt[i]);
+ } else {
+ final char[] p = cons.readPassword("%s: ", prompt[i]);
+ response[i] = p != null ? new String(p) : "";
+ }
+ }
+ return response;
+ }
+ }
+}
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 8f2312b85..e06dbc2d0 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -77,6 +77,22 @@
+
+
+ java6
+
+ true
+
+
+
+ org.eclipse.jgit
+ org.eclipse.jgit.console
+ ${project.version}
+
+
+
+
+
src/
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
index 3579b65e3..18cf8be46 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
@@ -45,6 +45,7 @@
package org.eclipse.jgit.pgm;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -88,8 +89,10 @@ public class Main {
public static void main(final String[] argv) {
final Main me = new Main();
try {
- AwtAuthenticator.install();
- AwtSshSessionFactory.install();
+ if (!installConsole()) {
+ AwtAuthenticator.install();
+ AwtSshSessionFactory.install();
+ }
configureHttpProxy();
me.execute(argv);
} catch (Die err) {
@@ -184,6 +187,45 @@ public class Main {
return null;
}
+ private static boolean installConsole() {
+ try {
+ install("org.eclipse.jgit.console.ConsoleAuthenticator");
+ install("org.eclipse.jgit.console.ConsoleSshSessionFactory");
+ return true;
+ } catch (ClassNotFoundException e) {
+ return false;
+ } catch (NoClassDefFoundError e) {
+ return false;
+ } catch (UnsupportedClassVersionError e) {
+ return false;
+
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException("Cannot setup console", e);
+ } catch (SecurityException e) {
+ throw new RuntimeException("Cannot setup console", e);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException("Cannot setup console", e);
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException("Cannot setup console", e);
+ } catch (NoSuchMethodException e) {
+ throw new RuntimeException("Cannot setup console", e);
+ }
+ }
+
+ private static void install(final String name)
+ throws IllegalAccessException, InvocationTargetException,
+ NoSuchMethodException, ClassNotFoundException {
+ try {
+ Class.forName(name).getMethod("install").invoke(null);
+ } catch (InvocationTargetException e) {
+ if (e.getCause() instanceof RuntimeException)
+ throw (RuntimeException) e.getCause();
+ if (e.getCause() instanceof Error)
+ throw (Error) e.getCause();
+ throw e;
+ }
+ }
+
/**
* Configure the JRE's standard HTTP based on http_proxy.
*
diff --git a/pom.xml b/pom.xml
index e144f492d..974b58f93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,6 +231,21 @@
+
+
+
+ java6
+
+
+ !jgit.java6.skip
+
+
+
+ org.eclipse.jgit.console
+
+
+
+
org.eclipse.jgit
org.eclipse.jgit.ui