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

Removed interactive input for whitelist management (to match the removal of interactive input from clients in v1.4.0)

Browse Source 
Former-commit-id: f49e2fc04e0ffd8fa231c6e714bf73354d93d633
Former-commit-id: aad37b6fbda6b0605a45a9dbe7453398a8c920da
This commit is contained in:
RandyTheSilly
2023-04-25 14:10:13 -04:00
parent d48a1af167
commit af655b1292
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+7 -10
View File
@@ -387,6 +387,9 @@ def print_info():
update/-u{14*' '}generate a password for an existing entry\n""") update/-u{14*' '}generate a password for an existing entry\n""")
elif arguments[0] == 'whitelist': elif arguments[0] == 'whitelist':
if device_type == 'server': if device_type == 'server':
if arg_count > 1 and arguments[1] in ('add', 'del'):
print("\nwhen adding or deleting devices from the whitelist,\nthe device ID must be specified as an"
" argument\n\nexample: sshyp whitelist add 'this-is-a-quoted-device-id'")
print(f"""\n\u001b[1musage:\u001b[0m sshyp whitelist <flag> [device id]\u001b[0m\n print(f"""\n\u001b[1musage:\u001b[0m sshyp whitelist <flag> [device id]\u001b[0m\n
\u001b[1mflags:\u001b[0m \u001b[1mflags:\u001b[0m
whitelist: whitelist:
@@ -529,12 +532,7 @@ def whitelist_list():
# adds or removes quick-unlock whitelisted device ids # adds or removes quick-unlock whitelisted device ids
def whitelist_manage(): def whitelist_manage():
if arg_count == 2:
whitelist_list()
_device_id = input('device id: ')
else:
_device_id = arguments[2] _device_id = arguments[2]
if arguments[1] == 'add': if arguments[1] == 'add':
if _device_id in listdir(f"{home}/.config/sshyp/devices"): if _device_id in listdir(f"{home}/.config/sshyp/devices"):
open(f"{home}/.config/sshyp/whitelist/{_device_id}", 'w').write('') open(f"{home}/.config/sshyp/whitelist/{_device_id}", 'w').write('')
@@ -542,7 +540,6 @@ def whitelist_manage():
else: else:
print(f"\n\u001b[38;5;9merror: device id ({_device_id}) is not registered\u001b[0m\n") print(f"\n\u001b[38;5;9merror: device id ({_device_id}) is not registered\u001b[0m\n")
s_exit(1) s_exit(1)
elif isfile(f"{home}/.config/sshyp/whitelist/{_device_id}"): elif isfile(f"{home}/.config/sshyp/whitelist/{_device_id}"):
remove(f"{home}/.config/sshyp/whitelist/{_device_id}") remove(f"{home}/.config/sshyp/whitelist/{_device_id}")
whitelist_list() whitelist_list()
@@ -906,16 +903,16 @@ if __name__ == "__main__":
if arg_count < 1: if arg_count < 1:
arguments.append('help') arguments.append('help')
print_info() print_info()
elif arg_count > 1 and arguments[0] == 'whitelist': elif arg_count == 2 and arguments[0] == 'whitelist':
if arguments[1] in ('list', '-l'): if arguments[1] in ('list', '-l'):
success_flag = True success_flag = True
whitelist_list() whitelist_list()
elif arguments[1] in ('add', 'del'):
success_flag = True
whitelist_manage()
elif arguments[1] == 'setup': elif arguments[1] == 'setup':
success_flag = True success_flag = True
whitelist_setup() whitelist_setup()
elif arg_count > 2 and arguments[1] in ('add', 'del'):
success_flag = True
whitelist_manage()
# PORT END ARGS-SERVER # PORT END ARGS-SERVER
if arg_count > 0 and success_flag == 0 and arguments[0] != 'sync': if arg_count > 0 and success_flag == 0 and arguments[0] != 'sync':