cas-admin | 8 +++++---
lib/cas/network.py | 7 ++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 35f8db21b3d67488b95a967aaa676d3c60683b67
Author: uzr <uzr(a)riddick.localdomain>
Date: Sat Oct 10 20:26:23 2009 -0400
- start of safeguard against invalid ssh connections
diff --git a/cas-admin b/cas-admin
index f7aead9..42274ec 100755
--- a/cas-admin
+++ b/cas-admin
@@ -115,9 +115,11 @@ class CasServerHandler(object):
fd = open(self.server_list, 'r')
for server in fd.readlines():
server = server.strip()
- results, err = Executor(server, settings["CASUSER"],
"/bin/uname -m").run()
- if err:
- self.casLog.debug(err)
+ server_connect = Executor(server, settings["CASUSER"],
"/bin/uname -m").run()
+ if not server_connect:
+ self.casLog.debug("Unable to authenticate %s" % (server,))
+ else:
+ results = server_connect[0]
# clean up arch string
for i in results:
arch = i.strip()
diff --git a/lib/cas/network.py b/lib/cas/network.py
index 842863c..50b4b30 100644
--- a/lib/cas/network.py
+++ b/lib/cas/network.py
@@ -76,7 +76,12 @@ class Executor(object):
self.cmd = cmd
self.client = paramiko.SSHClient()
self.client.load_system_host_keys()
- self.client.connect(self.host, username=self.user)
+
+ def go(self):
+ try:
+ self.client.connect(self.host, username=self.user)
+ except paramiko.AuthenticationException:
+ return False
def run(self):
stdin, stdout, stderr = self.client.exec_command(self.cmd)
Show replies by date