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

Made error message for when quick-unlock fails more clear

Browse Source 
Former-commit-id: 2acc2f84b9205e32cf5bd6bda23abb576002c2a9 [formerly fd12a3c003]
Former-commit-id: 14dc80d8c7c22baed913a0c84abdb3c67138bef9
This commit is contained in:
RandyTheSilly
2022-10-12 16:24:27 -04:00
parent 0adf00d81e
commit 46d539f386
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+5 -5
View File
@@ -143,26 +143,26 @@ def encrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_com, _gpg_id, _tmp_dir=pat
rmtree(f"{_tmp_dir}{_shm_folder}") rmtree(f"{_tmp_dir}{_shm_folder}")
def decrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_command, _tmp_dir=path.expanduser('~/.config/sshyp/tmp/')): def decrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_com, _tmp_dir=path.expanduser('~/.config/sshyp/tmp/')):
# decrypts an entry to a temporary directory # decrypts an entry to a temporary directory
if _shm_folder == 0 and _shm_entry == 0: if _shm_folder == 0 and _shm_entry == 0:
if quick_unlock_enabled == 'y': if quick_unlock_enabled == 'y':
_command = f"gpg --pinentry-mode loopback --passphrase {whitelist_verify()} -qd --output /dev/null " \ _command = f"gpg --pinentry-mode loopback --passphrase {whitelist_verify()} -qd --output /dev/null " \
f"{path.expanduser('~/.config/sshyp/lock.gpg')}" f"{path.expanduser('~/.config/sshyp/lock.gpg')}"
else: else:
_command = f"{_gpg_command} -qd --output /dev/null {path.expanduser('~/.config/sshyp/lock.gpg')}" _command = f"{_gpg_com} -qd --output /dev/null {path.expanduser('~/.config/sshyp/lock.gpg')}"
elif quick_unlock_enabled == 'y': elif quick_unlock_enabled == 'y':
_command = f"gpg --pinentry-mode loopback --passphrase '{whitelist_verify()}' -qd --output " \ _command = f"gpg --pinentry-mode loopback --passphrase '{whitelist_verify()}' -qd --output " \
f"{_tmp_dir}{_shm_folder}/{_shm_entry} '{_entry_dir}.gpg'" f"{_tmp_dir}{_shm_folder}/{_shm_entry} '{_entry_dir}.gpg'"
else: else:
_command = f"{_gpg_command} -qd --output {_tmp_dir}{_shm_folder}/{_shm_entry} '{_entry_dir}.gpg'" _command = f"{_gpg_com} -qd --output {_tmp_dir}{_shm_folder}/{_shm_entry} '{_entry_dir}.gpg'"
try: try:
run(_command, shell=True, stderr=PIPE, check=True, close_fds=True) run(_command, shell=True, stderr=PIPE, check=True, close_fds=True)
except CalledProcessError: except CalledProcessError:
print(f"\n\u001b[38;5;9merror: could not decrypt - ensure the correct gpg key is present\u001b[0m\n") print(f"\n\u001b[38;5;9merror: could not decrypt - ensure the correct gpg key is present\u001b[0m\n")
if quick_unlock_enabled == 'y': if quick_unlock_enabled == 'y':
print(f"\u001b[38;5;9mensure that quick-unlock is properly set up on the server and that this device is " print(f"\u001b[38;5;9mensure that your quick-unlock passphrase was input correctly and that the whitelist "
f"whitelisted\u001b[0m\n") f"is properly configured on the server\u001b[0m\n")
s_exit(1) s_exit(1)