Skip to content

enabling ssh connection without passphrase when --password arg is given #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GohuHQ wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enabling ssh connection without passphrase when --password arg is given #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions schecks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,14 @@ def get_client(opts):
ssh_key_file = opts.ssh_key_file
user = opts.user
passphrase = opts.passphrase
password = opts.password

# Ok now connect, and try to get values for memory
client = connect(hostname, port, ssh_key_file, passphrase, user)
client = connect(hostname, port, ssh_key_file, passphrase, user, password)
return client


def connect(hostname, port, ssh_key_file, passphrase, user):
def connect(hostname, port, ssh_key_file, passphrase, user, password):
# If we are in a localhost case, don't play with ssh
if is_local(hostname):
return LocalExec()
Expand All @@ -87,11 +88,6 @@ def connect(hostname, port, ssh_key_file, passphrase, user):
print "ERROR : this plugin needs the python-paramiko module. Please install it"
sys.exit(2)

if not os.path.exists(os.path.expanduser(ssh_key_file)):
err = "Error : missing ssh key file. please specify it with -i parameter"
raise Exception(err)

ssh_key_file = os.path.expanduser(ssh_key_file)
client = paramiko.SSHClient()
client.load_system_host_keys()
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
Expand All @@ -102,7 +98,17 @@ def connect(hostname, port, ssh_key_file, passphrase, user):
with open(user_config_file) as f:
ssh_config.parse(f)

cfg = {'hostname': hostname, 'port': port, 'username': user, 'key_filename': ssh_key_file, 'password': passphrase}
cfg = {'hostname': hostname, 'port': port, 'username': user}
if password:
{'password': password}
else:
if not os.path.exists(os.path.expanduser(ssh_key_file)):
err = "Error : missing ssh key file. please specify it with -i parameter"
raise Exception(err)

ssh_key_file = os.path.expanduser(ssh_key_file)
{'key_filename': ssh_key_file, 'password': passphrase}


user_config = ssh_config.lookup(cfg['hostname'])
for k in ('hostname', port, 'username', 'key_filename', 'password'):
Expand Down Expand Up @@ -162,6 +168,8 @@ def get_parser():
dest="user", help='remote use to use. By default shinken.')
parser.add_option('-P', '--passphrase', default='',
dest="passphrase", help='SSH key passphrase. By default will use void')
parser.add_option('--password', default='',
dest="password", help='SSH password. By default will use void')
parser.add_option('-t',
dest="modname", help='Check to load')
parser.add_option('-l', action='store_true',
Expand Down