MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] Refactor-simplify git-ssh architecture

Browse Source 
Remove one more abstraction: GitSSHService.Handler interface.
Move some javadocs to the only implementation: GitSSHGUIHandler.
This commit is contained in:
Kirill Likhodedov
2013-03-09 20:49:06 +04:00
parent 978e16ba02
commit cd9ebaa807
2 changed files with 40 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitSSHGUIHandler.java
+34 -4
View File
@@ -25,7 +25,6 @@ import git4idea.config.SSHConnectionSettings;
import git4idea.i18n.GitBundle;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.git4idea.ssh.GitSSHService;
import javax.swing.*;
import javax.swing.text.JTextComponent;
@@ -38,7 +37,7 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* Swing GUI handler for the SSH events
*/
class GitSSHGUIHandler implements GitSSHService.Handler {
public class GitSSHGUIHandler {
@Nullable private final Project myProject;
@Nullable private final ModalityState myState;
@@ -112,6 +111,18 @@ class GitSSHGUIHandler implements GitSSHService.Handler {
}
}
/**
* Reply to challenge in keyboard-interactive scenario
*
* @param username a user name
* @param name a name of challenge
* @param instruction a instructions
* @param numPrompts number of prompts
* @param prompt prompts
* @param echo true if the reply for corresponding prompt should be echoed
* @param lastError the last error
* @return replies to the challenges
*/
@SuppressWarnings({"UseOfObsoleteCollectionType", "unchecked"})
public Vector<String> replyToChallenge(final String username,
final String name,
@@ -143,6 +154,13 @@ class GitSSHGUIHandler implements GitSSHService.Handler {
return rc.get();
}
/**
* Ask password
*
* @param username a user name
* @param resetPassword true if the previous password supplied to the service was incorrect
* @param lastError the previous error @return a password or null if dialog was cancelled.
*/
public String askPassword(final String username, boolean resetPassword, final String lastError) {
String error = processLastError(resetPassword, lastError);
return PasswordSafePromptDialog.askPassword(myProject, myState, GitBundle.getString("ssh.password.title"),
@@ -150,14 +168,26 @@ class GitSSHGUIHandler implements GitSSHService.Handler {
GitSSHGUIHandler.class, "PASSWORD:" + username, resetPassword, error);
}
@Override
/**
* Get last successful authentication method. The default implementation returns empty string
* meaning that last authentication is unknown or failed.
*
* @param userName the user name
* @return the successful authentication method
*/
public String getLastSuccessful(String userName) {
SSHConnectionSettings s = SSHConnectionSettings.getInstance();
String rc = s.getLastSuccessful(userName);
return rc == null ? "" : rc;
}
@Override
/**
* Set last successful authentication method
*
* @param userName the user name
* @param method the authentication method, the empty string if authentication process failed.
* @param error the error to show to user in case when authentication process failed.
*/
public void setLastSuccessful(String userName, String method, final String error) {
SSHConnectionSettings s = SSHConnectionSettings.getInstance();
s.setLastSuccessful(userName, method);
plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java
+6 -84
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import com.intellij.ide.XmlRpcServer;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.util.io.FileUtilRt;
import com.trilead.ssh2.KnownHosts;
import git4idea.commands.GitSSHGUIHandler;
import gnu.trove.THashMap;
import org.apache.commons.codec.DecoderException;
import org.apache.xmlrpc.XmlRpcClientLite;
@@ -48,7 +49,7 @@ public class GitSSHService {
/**
* Registered handlers
*/
private final THashMap<Integer, Handler> handlers = new THashMap<Integer, Handler>();
private final THashMap<Integer, GitSSHGUIHandler> handlers = new THashMap<Integer, GitSSHGUIHandler>();
@NotNull
public static GitSSHService getInstance() {
@@ -94,7 +95,7 @@ public class GitSSHService {
* @param handler a handler to register
* @return an identifier to pass to the environment variable
*/
public synchronized int registerHandler(@NotNull Handler handler) {
public synchronized int registerHandler(@NotNull GitSSHGUIHandler handler) {
XmlRpcServer xmlRpcServer = XmlRpcServer.SERVICE.getInstance();
if (!xmlRpcServer.hasHandler(GitSSHHandler.HANDLER_NAME)) {
xmlRpcServer.addHandler(GitSSHHandler.HANDLER_NAME, new InternalRequestHandler());
@@ -121,8 +122,8 @@ public class GitSSHService {
* @return the registered handler
*/
@NotNull
private synchronized Handler getHandler(int key) {
Handler rc = handlers.get(key);
private synchronized GitSSHGUIHandler getHandler(int key) {
GitSSHGUIHandler rc = handlers.get(key);
if (rc == null) {
throw new IllegalStateException("No handler for the key " + key);
}
@@ -140,85 +141,6 @@ public class GitSSHService {
}
}
/**
* Handler interface to use by the client code
*/
public interface Handler {
/**
* Verify key
*
* @param hostname a host name
* @param port a port number
* @param serverHostKeyAlgorithm an algorithm
* @param serverHostKey a key
* @param isNew a isNew key
* @return true if the key is valid
*/
boolean verifyServerHostKey(final String hostname,
final int port,
final String serverHostKeyAlgorithm,
final String serverHostKey,
final boolean isNew);
/**
* Ask passphrase
*
* @param username a user name
* @param keyPath a key path
* @param resetPassword
* @param lastError the last error for the handler @return a passphrase or null if dialog was cancelled.
*/
String askPassphrase(final String username, final String keyPath, boolean resetPassword, final String lastError);
/**
* Reply to challenge in keyboard-interactive scenario
*
* @param username a user name
* @param name a name of challenge
* @param instruction a instructions
* @param numPrompts number of prompts
* @param prompt prompts
* @param echo true if the reply for corresponding prompt should be echoed
* @param lastError the last error
* @return replies to the challenges
*/
@SuppressWarnings({"UseOfObsoleteCollectionType"})
Vector<String> replyToChallenge(final String username,
final String name,
final String instruction,
final int numPrompts,
final Vector<String> prompt,
final Vector<Boolean> echo,
final String lastError);
/**
* Ask password
*
* @param username a user name
* @param resetPassword true if the previous password supplied to the service was incorrect
* @param lastError the previous error @return a password or null if dialog was cancelled.
*/
String askPassword(final String username, boolean resetPassword, final String lastError);
/**
* Get last successful authentication method. The default implementation returns empty string
* meaning that last authentication is unknown or failed.
*
* @param userName the user name
* @return the successful authentication method
*/
String getLastSuccessful(String userName);
/**
* Set last successful authentication method
*
* @param userName the user name
* @param method the authentication method, the empty string if authentication process failed.
* @param error the error to show to user in case when authentication process failed.
*/
void setLastSuccessful(String userName, String method, String error);
}
/**
* Internal handler implementation class, do not use it.
*/