From: Matthias Sohn Date: Wed, 22 Apr 2015 10:53:35 +0000 (+0200) Subject: Restore AwtCredentialsProvider to enable debugging pgm in Eclipse X-Git-Tag: v4.0.0.201505050340-m2~1^2~9^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F46260%2F1;p=jgit.git Restore AwtCredentialsProvider to enable debugging pgm in Eclipse In 6c1f7393882baf8464859136a70199ea96fcae0f the AWT based credentials provider was dropped because we don't support Java 5 any longer so we can always use the ConsoleCredentialsProvider which requires Java 6. This broke debugging org.eclipse.jgit.pgm since Eclipse doesn't support using a system console authenticator [1]. [1] see https://bugs.eclipse.org/bugs/show_bug.cgi?id=148831 Change-Id: Iba71001a7762e73d6579ba9dfa5a08ddaba777ea --- 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 38c3a2fcd4..7151de794d 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 @@ -47,14 +47,15 @@ package org.eclipse.jgit.pgm; import java.io.File; import java.io.IOException; import java.io.PrintWriter; +import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; import java.net.URL; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import org.eclipse.jgit.console.ConsoleAuthenticator; -import org.eclipse.jgit.console.ConsoleCredentialsProvider; +import org.eclipse.jgit.awtui.AwtAuthenticator; +import org.eclipse.jgit.awtui.AwtCredentialsProvider; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; @@ -115,8 +116,10 @@ public class Main { */ protected void run(final String[] argv) { try { - ConsoleAuthenticator.install(); - ConsoleCredentialsProvider.install(); + if (!installConsole()) { + AwtAuthenticator.install(); + AwtCredentialsProvider.install(); + } configureHttpProxy(); execute(argv); } catch (Die err) { @@ -246,6 +249,45 @@ public class Main { return rb.build(); } + private static boolean installConsole() { + try { + install("org.eclipse.jgit.console.ConsoleAuthenticator"); //$NON-NLS-1$ + install("org.eclipse.jgit.console.ConsoleCredentialsProvider"); //$NON-NLS-1$ + return true; + } catch (ClassNotFoundException e) { + return false; + } catch (NoClassDefFoundError e) { + return false; + } catch (UnsupportedClassVersionError e) { + return false; + + } catch (IllegalArgumentException e) { + throw new RuntimeException(CLIText.get().cannotSetupConsole, e); + } catch (SecurityException e) { + throw new RuntimeException(CLIText.get().cannotSetupConsole, e); + } catch (IllegalAccessException e) { + throw new RuntimeException(CLIText.get().cannotSetupConsole, e); + } catch (InvocationTargetException e) { + throw new RuntimeException(CLIText.get().cannotSetupConsole, e); + } catch (NoSuchMethodException e) { + throw new RuntimeException(CLIText.get().cannotSetupConsole, e); + } + } + + private static void install(final String name) + throws IllegalAccessException, InvocationTargetException, + NoSuchMethodException, ClassNotFoundException { + try { + Class.forName(name).getMethod("install").invoke(null); //$NON-NLS-1$ + } 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/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtCredentialsProvider.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtCredentialsProvider.java new file mode 100644 index 0000000000..fd26bfa7f9 --- /dev/null +++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AwtCredentialsProvider.java @@ -0,0 +1,204 @@ +/* + * Copyright (C) 2010, Google Inc. + * Copyright (C) 2008, Robin Rosenberg + * Copyright (C) 2008, Shawn O. Pearce + * 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 static 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; + } +}