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

PY-21629 New OPEN_SSH auth type replaces AUTH_AGENT used previously

Browse Source 
New authentication type `OPEN_SSH` enhances `AUTH_AGENT`. Beside using authentication agent (ssh-agent or PuTTY) OpenSSH config is used to locate identity files that could be used for authentication.
This commit is contained in:
Alexander Koshevoy
2017-10-10 02:00:06 +03:00
parent 1660fa1f4c
commit 0a656a6c43
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/remote/AuthType.kt
+7 -4
View File
@@ -15,9 +15,12 @@
*/
package com.intellij.remote
/**
* @author Alexander Koshevoy
*/
enum class AuthType {
PASSWORD, KEY_PAIR, AUTH_AGENT
PASSWORD, KEY_PAIR,
/**
* Use the way OpenSSH `ssh` client authenticates:
* - read OpenSSH configuration files, get `IdentityFile` declared in it;
* - use identity files provided by authentication agent (ssh-agent or PuTTY).
*/
OPEN_SSH
}
platform/platform-impl/src/com/intellij/remote/RemoteCredentialsHolder.java
+9 -7
View File
@@ -48,7 +48,7 @@ public class RemoteCredentialsHolder implements MutableRemoteCredentials {
private static final Map<AuthType, String> CREDENTIAL_ATTRIBUTES_QUALIFIERS = ImmutableMap.of(AuthType.PASSWORD, "password",
AuthType.KEY_PAIR, "passphrase",
AuthType.AUTH_AGENT, "empty");
AuthType.OPEN_SSH, "empty");
private String myHost;
private int myPort;//will always be equal to myLiteralPort, if it's valid, or equal to 0 otherwise
@@ -232,17 +232,17 @@ public class RemoteCredentialsHolder implements MutableRemoteCredentials {
@Deprecated
@Override
public boolean isUseAuthAgent() {
return myAuthType == AuthType.AUTH_AGENT;
return myAuthType == AuthType.OPEN_SSH;
}
@Deprecated
@Override
public void setUseAuthAgent(boolean useAuthAgent) {
if (useAuthAgent) {
myAuthType = AuthType.AUTH_AGENT;
myAuthType = AuthType.OPEN_SSH;
}
else {
if (myAuthType == AuthType.AUTH_AGENT) {
if (myAuthType == AuthType.OPEN_SSH) {
myAuthType = AuthType.PASSWORD;
}
else {
@@ -283,7 +283,8 @@ public class RemoteCredentialsHolder implements MutableRemoteCredentials {
myAuthType = AuthType.KEY_PAIR;
}
else if (useAuthAgent) {
myAuthType = AuthType.AUTH_AGENT;
// the old `USE_AUTH_AGENT` attribute is used to avoid settings migration
myAuthType = AuthType.OPEN_SSH;
}
else {
myAuthType = AuthType.PASSWORD;
@@ -332,11 +333,12 @@ public class RemoteCredentialsHolder implements MutableRemoteCredentials {
rootElement.setAttribute(USERNAME, getSerializedUserName());
rootElement.setAttribute(PRIVATE_KEY_FILE, StringUtil.notNullize(getPrivateKeyFile()));
rootElement.setAttribute(USE_KEY_PAIR, Boolean.toString(myAuthType == AuthType.KEY_PAIR));
rootElement.setAttribute(USE_AUTH_AGENT, Boolean.toString(myAuthType == AuthType.AUTH_AGENT));
// the old `USE_AUTH_AGENT` attribute is used to avoid settings migration
rootElement.setAttribute(USE_AUTH_AGENT, Boolean.toString(myAuthType == AuthType.OPEN_SSH));
boolean memoryOnly = (myAuthType == AuthType.KEY_PAIR && !isStorePassphrase())
|| (myAuthType == AuthType.PASSWORD && !isStorePassword())
|| myAuthType == AuthType.AUTH_AGENT;
|| myAuthType == AuthType.OPEN_SSH;
String password;
if (myAuthType == AuthType.KEY_PAIR) {
password = getPassphrase();