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

Replace remaining uses of system()

Browse Source 
Former-commit-id: 5a8ca97389b8d37c8050ba23d1e455357f5be0b1 [formerly e8703300fd]
Former-commit-id: 81b4d2783d5b09cc31515ab22f0f42e5ed55218b
This commit is contained in:
RandyTheSilly
2022-11-28 13:38:17 -05:00
parent 02ee2a5c0e
commit 46d5f8d515
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
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from os import environ, listdir, remove, system, uname, walk from os import environ, listdir, remove, uname, walk
from os.path import expanduser from os.path import expanduser
from pathlib import Path from pathlib import Path
from random import randint from random import randint
@@ -146,7 +146,7 @@ def shm_gen(_tmp_dir=expanduser('~/.config/sshyp/tmp/')): # creates a temporary
def encrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_id, _tmp_dir=expanduser('~/.config/sshyp/tmp/')): def encrypt(_entry_dir, _shm_folder, _shm_entry, _gpg_id, _tmp_dir=expanduser('~/.config/sshyp/tmp/')):
# encrypts an entry and cleans up the temporary files # encrypts an entry and cleans up the temporary files
system(f"gpg -qr {str(_gpg_id)} -e '{_tmp_dir}{_shm_folder}/{_shm_entry}'") run(['gpg', '-qr', str(_gpg_id), '-e', f"{_tmp_dir}{_shm_folder}/{_shm_entry}"])
move(f"{_tmp_dir}{_shm_folder}/{_shm_entry}.gpg", f"{_entry_dir}.gpg") move(f"{_tmp_dir}{_shm_folder}/{_shm_entry}.gpg", f"{_entry_dir}.gpg")
rmtree(f"{_tmp_dir}{_shm_folder}") rmtree(f"{_tmp_dir}{_shm_folder}")
@@ -260,7 +260,7 @@ def tweak(): # runs configuration wizard
_gpg_gen = input(f"{_divider}sshyp requires the use of a unique gpg key - use an (e)xisting key or (g)enerate a" _gpg_gen = input(f"{_divider}sshyp requires the use of a unique gpg key - use an (e)xisting key or (g)enerate a"
f" new one? (E/g) ") f" new one? (E/g) ")
if _gpg_gen.lower() != 'g': if _gpg_gen.lower() != 'g':
system('gpg -k') run(['gpg', '-k'])
_sshyp_data += [str(input('gpg key id: '))] _sshyp_data += [str(input('gpg key id: '))]
else: else:
print('\na unique gpg key is being generated for you...') print('\na unique gpg key is being generated for you...')
@@ -268,7 +268,7 @@ def tweak(): # runs configuration wizard
open(expanduser('~/.config/sshyp/gpg-gen'), 'w').writelines([ open(expanduser('~/.config/sshyp/gpg-gen'), 'w').writelines([
'Key-Type: 1\n', 'Key-Length: 4096\n', 'Key-Usage: sign encrypt\n', 'Name-Real: sshyp\n', 'Key-Type: 1\n', 'Key-Length: 4096\n', 'Key-Usage: sign encrypt\n', 'Name-Real: sshyp\n',
'Name-Comment: gpg-sshyp\n', 'Name-Email: https://github.com/rwinkhart/sshyp\n', 'Expire-Date: 0']) 'Name-Comment: gpg-sshyp\n', 'Name-Email: https://github.com/rwinkhart/sshyp\n', 'Expire-Date: 0'])
system(f"gpg --batch --generate-key '{expanduser('~/.config/sshyp/gpg-gen')}'") run(['gpg', '--batch', '--generate-key', expanduser('~/.config/sshyp/gpg-gen')])
remove(expanduser('~/.config/sshyp/gpg-gen')) remove(expanduser('~/.config/sshyp/gpg-gen'))
_sshyp_data += [run('gpg -k', shell=True, stdout=PIPE, text=True).stdout.split('\n')[-4].strip()] _sshyp_data += [run('gpg -k', shell=True, stdout=PIPE, text=True).stdout.split('\n')[-4].strip()]
@@ -279,7 +279,7 @@ def tweak(): # runs configuration wizard
if Path(expanduser('~/.config/sshyp/lock.gpg')).is_file(): if Path(expanduser('~/.config/sshyp/lock.gpg')).is_file():
remove(expanduser('~/.config/sshyp/lock.gpg')) remove(expanduser('~/.config/sshyp/lock.gpg'))
open(expanduser('~/.config/sshyp/lock'), 'w') open(expanduser('~/.config/sshyp/lock'), 'w')
system(f"gpg -qr {str(_sshyp_data[1])} -e {expanduser('~/.config/sshyp/lock')}") run(['gpg', '-qr', str(_sshyp_data[1]), '-e', expanduser('~/.config/sshyp/lock')])
remove(expanduser('~/.config/sshyp/lock')) remove(expanduser('~/.config/sshyp/lock'))
# ssh key configuration # ssh key configuration