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

Moved password generator to new function

Browse Source
This commit is contained in:
RandyTheSilly
2022-04-19 01:14:20 -04:00
parent 41aa093685
commit 0056f60af1
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/sshyp
+14 -9
View File
@@ -73,6 +73,17 @@ def shm_gen(): # generates a random temporary folder for security and returns r
return _shm_folder_gen, _shm_entry_gen return _shm_folder_gen, _shm_entry_gen
def pass_gen():
_length = int(input('How many characters should be in the password? '))
_complexity = str(input('Should the password be simple (for compatibility) or complex (for security)? (s/C) '))
if _complexity.lower() == 's':
_complexity = string.ascii_letters + string.digits
else:
_complexity = string.ascii_letters + string.digits + string.punctuation
_gen = ''.join(random.SystemRandom().choice(_complexity) for _ in range(_length))
return _gen
def encrypt(_shm_folder, _shm_entry, _location): def encrypt(_shm_folder, _shm_entry, _location):
system(f"gpg -r {str(gpg_id)} -e '{tmp_dir}{_shm_folder}/{_shm_entry}'") system(f"gpg -r {str(gpg_id)} -e '{tmp_dir}{_shm_folder}/{_shm_entry}'")
move(f"{tmp_dir}{_shm_folder}/{_shm_entry}.gpg", f"{directory}{_location}.gpg") move(f"{tmp_dir}{_shm_folder}/{_shm_entry}.gpg", f"{directory}{_location}.gpg")
@@ -436,13 +447,7 @@ def gen(): # generates a password for a new or an existing entry
s_exit() s_exit()
else: else:
_username = str(input('Username: ')) _username = str(input('Username: '))
_pass_length = int(input('How many characters should be in the password? ')) _password = pass_gen()
_pass_type = str(input('Should the password be simple (for compatibility) or complex (for security)? (s/C) '))
if _pass_type.lower() == 's':
_pass_type = string.ascii_letters + string.digits
else:
_pass_type = string.ascii_letters + string.digits + string.punctuation
_pass_gen = ''.join(random.SystemRandom().choice(_pass_type) for _ in range(_pass_length))
if not argument.startswith('gen update') and not argument.startswith('gen -u'): if not argument.startswith('gen update') and not argument.startswith('gen -u'):
_url = str(input('URL: ')) _url = str(input('URL: '))
_add_note = input('Add a note to this entry? (y/N) ') _add_note = input('Add a note to this entry? (y/N) ')
@@ -452,14 +457,14 @@ def gen(): # generates a password for a new or an existing entry
_notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'r').read() _notes = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}-n", 'r').read()
else: else:
_notes = '' _notes = ''
open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_username + '\n' + _pass_gen + '\n' + _url + '\n\n' open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'w').writelines(_username + '\n' + _password + '\n' + _url + '\n\n'
+ _notes + '\n\n') + _notes + '\n\n')
encrypt(_shm_folder, _shm_entry, _entry_name) encrypt(_shm_folder, _shm_entry, _entry_name)
system(f"gpg -d '{directory}{_entry_name}.gpg'") system(f"gpg -d '{directory}{_entry_name}.gpg'")
else: else:
_shm_folder, _shm_entry = shm_gen() _shm_folder, _shm_entry = shm_gen()
system(f"gpg -d --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'") system(f"gpg -d --output {tmp_dir}{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 1, _pass_gen + '\n') replace_line(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 1, _password + '\n')
remove(f"{directory}{_entry_name}.gpg") remove(f"{directory}{_entry_name}.gpg")
encrypt(_shm_folder, _shm_entry, _entry_name) encrypt(_shm_folder, _shm_entry, _entry_name)
system(f"gpg -d '{directory}{_entry_name}.gpg'") system(f"gpg -d '{directory}{_entry_name}.gpg'")