Implement command line support for CredentialsProvider
Instead of configuring the JSch session factory, configure a more generic CredentialsProvider, which will work for other transport types such as http, in addition to the existing ssh. Change-Id: I22b13303c17e654ba6720edf4be2ef15fe29537a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
d279bc83b0
commit
17d9c68636
|
@ -7,7 +7,8 @@ Bundle-Version: 0.10.0.qualifier
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Export-Package: org.eclipse.jgit.console;version="0.10.0"
|
Export-Package: org.eclipse.jgit.console;version="0.10.0"
|
||||||
Import-Package: org.eclipse.jgit.nls;version="[0.10.0,0.11.0)",
|
Import-Package: org.eclipse.jgit.errors;version="[0.10.0,0.11.0)",
|
||||||
|
org.eclipse.jgit.nls;version="[0.10.0,0.11.0)",
|
||||||
org.eclipse.jgit.transport;version="[0.10.0,0.11.0)",
|
org.eclipse.jgit.transport;version="[0.10.0,0.11.0)",
|
||||||
org.eclipse.jgit.util;version="[0.10.0,0.11.0)"
|
org.eclipse.jgit.util;version="[0.10.0,0.11.0)"
|
||||||
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
|
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
|
||||||
|
|
|
@ -0,0 +1,175 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2010, Google Inc.
|
||||||
|
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
|
||||||
|
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
|
||||||
|
* 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.errors.UnsupportedCredentialItem;
|
||||||
|
import org.eclipse.jgit.transport.CredentialItem;
|
||||||
|
import org.eclipse.jgit.transport.CredentialsProvider;
|
||||||
|
import org.eclipse.jgit.transport.URIish;
|
||||||
|
|
||||||
|
/** Interacts with the user during authentication by using the text console. */
|
||||||
|
public class ConsoleCredentialsProvider extends CredentialsProvider {
|
||||||
|
/** Install this implementation as the default. */
|
||||||
|
public static void install() {
|
||||||
|
final ConsoleCredentialsProvider c = new ConsoleCredentialsProvider();
|
||||||
|
if (c.cons == null)
|
||||||
|
throw new NoClassDefFoundError(
|
||||||
|
ConsoleText.get().noSystemConsoleAvailable);
|
||||||
|
CredentialsProvider.setDefault(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final Console cons = System.console();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isInteractive() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean supports(CredentialItem... items) {
|
||||||
|
for (CredentialItem i : items) {
|
||||||
|
if (i instanceof CredentialItem.StringType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else if (i instanceof CredentialItem.CharArrayType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else if (i instanceof CredentialItem.YesNoType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else if (i instanceof CredentialItem.InformationalMessage)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean get(URIish uri, CredentialItem... items)
|
||||||
|
throws UnsupportedCredentialItem {
|
||||||
|
boolean ok = true;
|
||||||
|
for (int i = 0; i < items.length && ok; i++) {
|
||||||
|
CredentialItem item = items[i];
|
||||||
|
|
||||||
|
if (item instanceof CredentialItem.StringType)
|
||||||
|
ok = get(uri, (CredentialItem.StringType) item);
|
||||||
|
|
||||||
|
else if (item instanceof CredentialItem.CharArrayType)
|
||||||
|
ok = get(uri, (CredentialItem.CharArrayType) item);
|
||||||
|
|
||||||
|
else if (item instanceof CredentialItem.YesNoType)
|
||||||
|
ok = get(uri, (CredentialItem.YesNoType) item);
|
||||||
|
|
||||||
|
else if (item instanceof CredentialItem.InformationalMessage)
|
||||||
|
ok = get(uri, (CredentialItem.InformationalMessage) item);
|
||||||
|
|
||||||
|
else
|
||||||
|
throw new UnsupportedCredentialItem(uri, item.getPromptText());
|
||||||
|
}
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean get(URIish uri, CredentialItem.StringType item) {
|
||||||
|
if (item.isValueSecure()) {
|
||||||
|
char[] v = cons.readPassword("%s: ", item.getPromptText());
|
||||||
|
if (v != null) {
|
||||||
|
item.setValue(new String(v));
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
String v = cons.readLine("%s: ", item.getPromptText());
|
||||||
|
if (v != null) {
|
||||||
|
item.setValue(v);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean get(URIish uri, CredentialItem.CharArrayType item) {
|
||||||
|
if (item.isValueSecure()) {
|
||||||
|
char[] v = cons.readPassword("%s: ", item.getPromptText());
|
||||||
|
if (v != null) {
|
||||||
|
item.setValueNoCopy(v);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
String v = cons.readLine("%s: ", item.getPromptText());
|
||||||
|
if (v != null) {
|
||||||
|
item.setValueNoCopy(v.toCharArray());
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean get(URIish uri, CredentialItem.InformationalMessage item) {
|
||||||
|
cons.printf("%s\n", item.getPromptText());
|
||||||
|
cons.flush();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean get(URIish uri, CredentialItem.YesNoType item) {
|
||||||
|
String r = cons.readLine("%s [%s/%s]? ", item.getPromptText(),
|
||||||
|
ConsoleText.get().answerYes, ConsoleText.get().answerNo);
|
||||||
|
if (r != null) {
|
||||||
|
item.setValue(ConsoleText.get().answerYes.equalsIgnoreCase(r));
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,145 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2009, Google Inc.
|
|
||||||
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
|
|
||||||
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
|
|
||||||
* 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 <code>$HOME/.ssh</code>.
|
|
||||||
* <p>
|
|
||||||
* 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.
|
|
||||||
* <p>
|
|
||||||
* 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(ConsoleText.get().noSystemConsoleAvailable);
|
|
||||||
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 [%s/%s]? ", msg, ConsoleText.get().answerYes, ConsoleText.get().answerNo);
|
|
||||||
return ConsoleText.get().answerYes.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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -55,7 +55,7 @@
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.eclipse.jgit.awtui.AwtAuthenticator;
|
import org.eclipse.jgit.awtui.AwtAuthenticator;
|
||||||
import org.eclipse.jgit.awtui.AwtSshSessionFactory;
|
import org.eclipse.jgit.awtui.AwtCredentialsProvider;
|
||||||
import org.eclipse.jgit.errors.TransportException;
|
import org.eclipse.jgit.errors.TransportException;
|
||||||
import org.eclipse.jgit.lib.Repository;
|
import org.eclipse.jgit.lib.Repository;
|
||||||
import org.eclipse.jgit.lib.RepositoryBuilder;
|
import org.eclipse.jgit.lib.RepositoryBuilder;
|
||||||
|
@ -114,7 +114,7 @@ protected void run(final String[] argv) {
|
||||||
try {
|
try {
|
||||||
if (!installConsole()) {
|
if (!installConsole()) {
|
||||||
AwtAuthenticator.install();
|
AwtAuthenticator.install();
|
||||||
AwtSshSessionFactory.install();
|
AwtCredentialsProvider.install();
|
||||||
}
|
}
|
||||||
configureHttpProxy();
|
configureHttpProxy();
|
||||||
execute(argv);
|
execute(argv);
|
||||||
|
@ -218,7 +218,7 @@ protected Repository openGitDir(String gitdir) throws IOException {
|
||||||
private static boolean installConsole() {
|
private static boolean installConsole() {
|
||||||
try {
|
try {
|
||||||
install("org.eclipse.jgit.console.ConsoleAuthenticator");
|
install("org.eclipse.jgit.console.ConsoleAuthenticator");
|
||||||
install("org.eclipse.jgit.console.ConsoleSshSessionFactory");
|
install("org.eclipse.jgit.console.ConsoleCredentialsProvider");
|
||||||
return true;
|
return true;
|
||||||
} catch (ClassNotFoundException e) {
|
} catch (ClassNotFoundException e) {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -7,7 +7,8 @@ Bundle-Version: 0.10.0.qualifier
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
Export-Package: org.eclipse.jgit.awtui;version="0.10.0"
|
Export-Package: org.eclipse.jgit.awtui;version="0.10.0"
|
||||||
Import-Package: org.eclipse.jgit.lib;version="[0.10.0,0.11.0)",
|
Import-Package: org.eclipse.jgit.errors;version="[0.10.0,0.11.0)",
|
||||||
|
org.eclipse.jgit.lib;version="[0.10.0,0.11.0)",
|
||||||
org.eclipse.jgit.nls;version="[0.10.0,0.11.0)",
|
org.eclipse.jgit.nls;version="[0.10.0,0.11.0)",
|
||||||
org.eclipse.jgit.revplot;version="[0.10.0,0.11.0)",
|
org.eclipse.jgit.revplot;version="[0.10.0,0.11.0)",
|
||||||
org.eclipse.jgit.revwalk;version="[0.10.0,0.11.0)",
|
org.eclipse.jgit.revwalk;version="[0.10.0,0.11.0)",
|
||||||
|
|
|
@ -0,0 +1,204 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2010, Google Inc.
|
||||||
|
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
|
||||||
|
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
|
||||||
|
* 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.awtui;
|
||||||
|
|
||||||
|
import java.awt.GridBagConstraints;
|
||||||
|
import java.awt.GridBagLayout;
|
||||||
|
import java.awt.Insets;
|
||||||
|
|
||||||
|
import javax.swing.JLabel;
|
||||||
|
import javax.swing.JOptionPane;
|
||||||
|
import javax.swing.JPanel;
|
||||||
|
import javax.swing.JPasswordField;
|
||||||
|
import javax.swing.JTextField;
|
||||||
|
|
||||||
|
import org.eclipse.jgit.errors.UnsupportedCredentialItem;
|
||||||
|
import org.eclipse.jgit.transport.CredentialItem;
|
||||||
|
import org.eclipse.jgit.transport.CredentialsProvider;
|
||||||
|
import org.eclipse.jgit.transport.URIish;
|
||||||
|
|
||||||
|
/** Interacts with the user during authentication by using AWT/Swing dialogs. */
|
||||||
|
public class AwtCredentialsProvider extends CredentialsProvider {
|
||||||
|
/** Install this implementation as the default. */
|
||||||
|
public static void install() {
|
||||||
|
CredentialsProvider.setDefault(new AwtCredentialsProvider());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isInteractive() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean supports(CredentialItem... items) {
|
||||||
|
for (CredentialItem i : items) {
|
||||||
|
if (i instanceof CredentialItem.StringType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else if (i instanceof CredentialItem.CharArrayType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else if (i instanceof CredentialItem.YesNoType)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else if (i instanceof CredentialItem.InformationalMessage)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean get(URIish uri, CredentialItem... items)
|
||||||
|
throws UnsupportedCredentialItem {
|
||||||
|
if (items.length == 0) {
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} else if (items.length == 1) {
|
||||||
|
final CredentialItem item = items[0];
|
||||||
|
|
||||||
|
if (item instanceof CredentialItem.InformationalMessage) {
|
||||||
|
JOptionPane.showMessageDialog(null, item.getPromptText(),
|
||||||
|
UIText.get().warning, JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} else if (item instanceof CredentialItem.YesNoType) {
|
||||||
|
CredentialItem.YesNoType v = (CredentialItem.YesNoType) item;
|
||||||
|
int r = JOptionPane.showConfirmDialog(null, v.getPromptText(),
|
||||||
|
UIText.get().warning, JOptionPane.YES_NO_OPTION);
|
||||||
|
switch (r) {
|
||||||
|
case JOptionPane.YES_OPTION:
|
||||||
|
v.setValue(true);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
case JOptionPane.NO_OPTION:
|
||||||
|
v.setValue(false);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
case JOptionPane.CANCEL_OPTION:
|
||||||
|
case JOptionPane.CLOSED_OPTION:
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
return interactive(uri, items);
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
return interactive(uri, items);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean interactive(URIish uri, CredentialItem[] items) {
|
||||||
|
final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1, 1, 1,
|
||||||
|
GridBagConstraints.NORTHWEST, GridBagConstraints.NONE,
|
||||||
|
new Insets(0, 0, 0, 0), 0, 0);
|
||||||
|
final JPanel panel = new JPanel();
|
||||||
|
panel.setLayout(new GridBagLayout());
|
||||||
|
|
||||||
|
final JTextField[] texts = new JTextField[items.length];
|
||||||
|
for (int i = 0; i < items.length; i++) {
|
||||||
|
CredentialItem item = items[i];
|
||||||
|
|
||||||
|
if (item instanceof CredentialItem.StringType
|
||||||
|
|| item instanceof CredentialItem.CharArrayType) {
|
||||||
|
gbc.fill = GridBagConstraints.NONE;
|
||||||
|
gbc.gridwidth = GridBagConstraints.RELATIVE;
|
||||||
|
gbc.gridx = 0;
|
||||||
|
panel.add(new JLabel(item.getPromptText()), gbc);
|
||||||
|
|
||||||
|
gbc.fill = GridBagConstraints.HORIZONTAL;
|
||||||
|
gbc.gridwidth = GridBagConstraints.RELATIVE;
|
||||||
|
gbc.gridx = 1;
|
||||||
|
if (item.isValueSecure())
|
||||||
|
texts[i] = new JPasswordField(20);
|
||||||
|
else
|
||||||
|
texts[i] = new JTextField(20);
|
||||||
|
panel.add(texts[i], gbc);
|
||||||
|
gbc.gridy++;
|
||||||
|
|
||||||
|
} else if (item instanceof CredentialItem.InformationalMessage) {
|
||||||
|
gbc.fill = GridBagConstraints.NONE;
|
||||||
|
gbc.gridwidth = GridBagConstraints.REMAINDER;
|
||||||
|
gbc.gridx = 0;
|
||||||
|
panel.add(new JLabel(item.getPromptText()), gbc);
|
||||||
|
gbc.gridy++;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
throw new UnsupportedCredentialItem(uri, item.getPromptText());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (JOptionPane.showConfirmDialog(null, panel,
|
||||||
|
UIText.get().authenticationRequired,
|
||||||
|
JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) != JOptionPane.OK_OPTION)
|
||||||
|
return false; // cancel
|
||||||
|
|
||||||
|
for (int i = 0; i < items.length; i++) {
|
||||||
|
CredentialItem item = items[i];
|
||||||
|
JTextField f = texts[i];
|
||||||
|
|
||||||
|
if (item instanceof CredentialItem.StringType) {
|
||||||
|
CredentialItem.StringType v = (CredentialItem.StringType) item;
|
||||||
|
if (f instanceof JPasswordField)
|
||||||
|
v.setValue(new String(((JPasswordField) f).getPassword()));
|
||||||
|
else
|
||||||
|
v.setValue(f.getText());
|
||||||
|
|
||||||
|
} else if (item instanceof CredentialItem.CharArrayType) {
|
||||||
|
CredentialItem.CharArrayType v = (CredentialItem.CharArrayType) item;
|
||||||
|
if (f instanceof JPasswordField)
|
||||||
|
v.setValueNoCopy(((JPasswordField) f).getPassword());
|
||||||
|
else
|
||||||
|
v.setValueNoCopy(f.getText().toCharArray());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,185 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
|
|
||||||
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
|
|
||||||
* 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.awtui;
|
|
||||||
|
|
||||||
import java.awt.Container;
|
|
||||||
import java.awt.GridBagConstraints;
|
|
||||||
import java.awt.GridBagLayout;
|
|
||||||
import java.awt.Insets;
|
|
||||||
|
|
||||||
import javax.swing.JLabel;
|
|
||||||
import javax.swing.JOptionPane;
|
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.JPasswordField;
|
|
||||||
import javax.swing.JTextField;
|
|
||||||
|
|
||||||
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 <code>$HOME/.ssh</code>.
|
|
||||||
* <p>
|
|
||||||
* 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.
|
|
||||||
* <p>
|
|
||||||
* If user interactivity is required by SSH (e.g. to obtain a password) AWT is
|
|
||||||
* used to display a password input field to the end-user.
|
|
||||||
*/
|
|
||||||
public class AwtSshSessionFactory extends SshConfigSessionFactory {
|
|
||||||
/** Install this session factory implementation into the JVM. */
|
|
||||||
public static void install() {
|
|
||||||
SshSessionFactory.setInstance(new AwtSshSessionFactory());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void configure(final OpenSshConfig.Host hc, final Session session) {
|
|
||||||
if (!hc.isBatchMode())
|
|
||||||
session.setUserInfo(new AWT_UserInfo());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class AWT_UserInfo implements UserInfo,
|
|
||||||
UIKeyboardInteractive {
|
|
||||||
private String passwd;
|
|
||||||
|
|
||||||
private String passphrase;
|
|
||||||
|
|
||||||
public void showMessage(final String msg) {
|
|
||||||
JOptionPane.showMessageDialog(null, msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean promptYesNo(final String msg) {
|
|
||||||
return JOptionPane.showConfirmDialog(null, msg, UIText.get().warning,
|
|
||||||
JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean promptPassword(final String msg) {
|
|
||||||
passwd = null;
|
|
||||||
final JPasswordField passwordField = new JPasswordField(20);
|
|
||||||
final int result = JOptionPane.showConfirmDialog(null,
|
|
||||||
new Object[] { passwordField }, msg,
|
|
||||||
JOptionPane.OK_CANCEL_OPTION);
|
|
||||||
if (result == JOptionPane.OK_OPTION) {
|
|
||||||
passwd = new String(passwordField.getPassword());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean promptPassphrase(final String msg) {
|
|
||||||
passphrase = null;
|
|
||||||
final JPasswordField passwordField = new JPasswordField(20);
|
|
||||||
final int result = JOptionPane.showConfirmDialog(null,
|
|
||||||
new Object[] { passwordField }, msg,
|
|
||||||
JOptionPane.OK_CANCEL_OPTION);
|
|
||||||
if (result == JOptionPane.OK_OPTION) {
|
|
||||||
passphrase = new String(passwordField.getPassword());
|
|
||||||
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) {
|
|
||||||
final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1,
|
|
||||||
1, 1, GridBagConstraints.NORTHWEST,
|
|
||||||
GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0);
|
|
||||||
final Container panel = new JPanel();
|
|
||||||
panel.setLayout(new GridBagLayout());
|
|
||||||
|
|
||||||
gbc.weightx = 1.0;
|
|
||||||
gbc.gridwidth = GridBagConstraints.REMAINDER;
|
|
||||||
gbc.gridx = 0;
|
|
||||||
panel.add(new JLabel(instruction), gbc);
|
|
||||||
gbc.gridy++;
|
|
||||||
|
|
||||||
gbc.gridwidth = GridBagConstraints.RELATIVE;
|
|
||||||
|
|
||||||
final JTextField[] texts = new JTextField[prompt.length];
|
|
||||||
for (int i = 0; i < prompt.length; i++) {
|
|
||||||
gbc.fill = GridBagConstraints.NONE;
|
|
||||||
gbc.gridx = 0;
|
|
||||||
gbc.weightx = 1;
|
|
||||||
panel.add(new JLabel(prompt[i]), gbc);
|
|
||||||
|
|
||||||
gbc.gridx = 1;
|
|
||||||
gbc.fill = GridBagConstraints.HORIZONTAL;
|
|
||||||
gbc.weighty = 1;
|
|
||||||
if (echo[i]) {
|
|
||||||
texts[i] = new JTextField(20);
|
|
||||||
} else {
|
|
||||||
texts[i] = new JPasswordField(20);
|
|
||||||
}
|
|
||||||
panel.add(texts[i], gbc);
|
|
||||||
gbc.gridy++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (JOptionPane.showConfirmDialog(null, panel, destination + ": "
|
|
||||||
+ name, JOptionPane.OK_CANCEL_OPTION,
|
|
||||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
|
|
||||||
String[] response = new String[prompt.length];
|
|
||||||
for (int i = 0; i < prompt.length; i++) {
|
|
||||||
response[i] = texts[i].getText();
|
|
||||||
}
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
return null; // cancel
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue