GitHubMirror/sshyp-labs
1
0
Fork 0
mirror of https://github.com/rwinkhart/sshyp-labs.git synced 2026-08-28 04:46:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

sshyp-mfa - sshyp v1.3.0 compatibility (no longer pass gpg to decrypt())

Browse Source
This commit is contained in:
RandyTheSilly
2022-12-07 23:15:17 -05:00
parent 7b03cfdc5e
commit 6ee49d6b95
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sshyp-mfa/lib/sshyp-mfa.py
+2 -6
View File
@@ -27,9 +27,9 @@ def mfa_read_shortcut(): # reads and extracts MFA info from the user-specified
s_exit(1) s_exit(1)
_shm_folder, _shm_entry = shm_gen() _shm_folder, _shm_entry = shm_gen()
if quick_unlock_enabled == 'y': if quick_unlock_enabled == 'y':
decrypt(directory + argument, _shm_folder, _shm_entry, gpg, whitelist_verify(port, username_ssh, ip, device_id)) decrypt(directory + argument, _shm_folder, _shm_entry, whitelist_verify(port, username_ssh, ip, device_id))
else: else:
decrypt(directory + argument, _shm_folder, _shm_entry, gpg, False) decrypt(directory + argument, _shm_folder, _shm_entry, False)
try: try:
_mfa_data = open(f"{path.expanduser('~/.config/sshyp/tmp/')}{_shm_folder}/{_shm_entry}", 'r').readlines() _mfa_data = open(f"{path.expanduser('~/.config/sshyp/tmp/')}{_shm_folder}/{_shm_entry}", 'r').readlines()
_type = _mfa_data[4].split('otpauth://')[1].split('/')[0] _type = _mfa_data[4].split('otpauth://')[1].split('/')[0]
@@ -60,10 +60,6 @@ if __name__ == '__main__':
ip = str(ssh_info[1].rstrip()) ip = str(ssh_info[1].rstrip())
port = str(ssh_info[2].rstrip()) port = str(ssh_info[2].rstrip())
directory = str(ssh_info[3].rstrip()) directory = str(ssh_info[3].rstrip())
if uname()[0] == 'Haiku': # set proper gpg command for OS
gpg = 'gpg --pinentry-mode loopback'
else:
gpg = 'gpg'
# main process: runs functions to generate MFA key, then continuously copies up-to-date MFA key to clipboard # main process: runs functions to generate MFA key, then continuously copies up-to-date MFA key to clipboard
try: try: