Skip to content
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

Ask for SSH password using getpass #263

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Ask for SSH password using getpass #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b936ec6
Ask for SSH password using getpass
jan-janssen Feb 5, 2024
31be443
Format black
pyiron-runner Feb 5, 2024
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
33 changes: 31 additions & 2 deletions pysqa/ext/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# coding: utf-8
# Copyright (c) Jan Janssen

import getpass
import json
import os
import warnings
Expand All @@ -25,12 +26,18 @@ def __init__(self, config, directory="~/.queues", execute_command=execute_comman
)
if "ssh_key" in config.keys():
self._ssh_key = os.path.abspath(os.path.expanduser(config["ssh_key"]))
self._ssh_ask_for_password = False
else:
self._ssh_key = None
if "ssh_password" in config.keys():
self._ssh_password = config["ssh_password"]
self._ssh_ask_for_password = False
else:
self._ssh_password = None
if "ssh_ask_for_password" in config.keys():
self._ssh_ask_for_password = config["ssh_ask_for_password"]
else:
self._ssh_ask_for_password = False
if "ssh_key_passphrase" in config.keys():
self._ssh_key_passphrase = config["ssh_key_passphrase"]
else:
Expand Down Expand Up @@ -221,15 +228,19 @@ def _transfer_files(self, file_dict, sftp=None, transfer_back=False):
def _open_ssh_connection(self):
ssh = paramiko.SSHClient()
ssh.load_host_keys(self._ssh_known_hosts)
if self._ssh_key is not None and self._ssh_key_passphrase is not None:
if (
self._ssh_key is not None
and self._ssh_key_passphrase is not None
and not self._ssh_ask_for_password
):
ssh.connect(
hostname=self._ssh_host,
port=self._ssh_port,
username=self._ssh_username,
key_filename=self._ssh_key,
passphrase=self._ssh_key_passphrase,
)
elif self._ssh_key is not None:
elif self._ssh_key is not None and not self._ssh_ask_for_password:
ssh.connect(
hostname=self._ssh_host,
port=self._ssh_port,
Expand All @@ -240,13 +251,21 @@ def _open_ssh_connection(self):
self._ssh_password is not None
and self._ssh_authenticator_service is None
and not self._ssh_two_factor_authentication
and not self._ssh_ask_for_password
):
ssh.connect(
hostname=self._ssh_host,
port=self._ssh_port,
username=self._ssh_username,
password=self._ssh_password,
)
elif self._ssh_ask_for_password and not self._ssh_two_factor_authentication:
ssh.connect(
hostname=self._ssh_host,
port=self._ssh_port,
username=self._ssh_username,
password=getpass.getpass(prompt="SSH Password: ", stream=None),
)
elif (
self._ssh_password is not None
and self._ssh_authenticator_service is not None
Expand Down Expand Up @@ -287,6 +306,16 @@ def authentication(title, instructions, prompt_list):
ssh._transport.auth_interactive_dumb(
username=self._ssh_username, handler=None, submethods=""
)
elif self._ssh_ask_for_password and self._ssh_two_factor_authentication:
ssh.connect(
hostname=self._ssh_host,
port=self._ssh_port,
username=self._ssh_username,
password=getpass.getpass(prompt="SSH Password: ", stream=None),
)
ssh._transport.auth_interactive_dumb(
username=self._ssh_username, handler=None, submethods=""
)
else:
raise ValueError("Un-supported authentication method.")

Expand Down
Loading