diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-06-03 20:03:04 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-06-03 20:03:48 +0530 |
| commit | 585603532b2fea19e2784a4aa8e0dbf904e7b4d6 (patch) | |
| tree | f7f73076dd17d613ca4fd67ea11eb3d0228b8138 /src/com.gluster.storage.management.server | |
| parent | 9b22146e7fffce7056c063b3738422198f43b1f7 (diff) | |
Design changes - introducing cluster-server mapping on gateway
Diffstat (limited to 'src/com.gluster.storage.management.server')
2 files changed, 10 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java index 6955b723..e1971322 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java @@ -93,7 +93,6 @@ public class ClustersResource { return new StringListResponse(clusterList); } - @SuppressWarnings("unchecked") @POST @Produces(MediaType.TEXT_XML) public Status createCluster(@FormParam(FORM_PARAM_CLUSTER_NAME) String clusterName) { diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java index 82cec63b..1cc51d23 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java @@ -55,6 +55,7 @@ public class SshUtil { private LRUCache<String, Connection> sshConnCache = new LRUCache<String, Connection>(10); private static final File PEM_FILE = new File(CoreConstants.USER_HOME + File.separator + ".ssh/id_rsa"); private static final File PUBLIC_KEY_FILE = new File(CoreConstants.USER_HOME + File.separator + ".ssh/id_rsa.pub"); + private static final String SCRIPT_DISABLE_SSH_PASSWORD_AUTH = "disable-ssh-password-auth.sh"; // TODO: Make user name configurable private static final String USER_NAME = "root"; @@ -89,7 +90,6 @@ public class SshUtil { localTempFile.delete(); } try { - // get authorized_keys from server scpClient.get(SSH_AUTHORIZED_KEYS_PATH, TEMP_DIR); } catch (IOException e) { @@ -119,7 +119,15 @@ public class SshUtil { throw new GlusterRuntimeException("Couldn't add public key to server [" + serverName + "]", e); } - // TODO: Disable password based ssh connections + disableSshPasswordLogin(serverName, scpClient); + } + + private void disableSshPasswordLogin(String serverName, SCPClient scpClient) { + ProcessResult result = executeRemote(serverName, SCRIPT_DISABLE_SSH_PASSWORD_AUTH); + if(!result.isSuccess()) { + throw new GlusterRuntimeException("Couldn't disable SSH password authentication on [" + serverName + + "]. Error: " + result); + } } private Connection getConnectionWithPassword(String serverName) { |