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

Fixed gpg decryption warnings

Browse Source
This commit is contained in:
RandyTheSilly
2021-09-07 23:59:58 -04:00
parent d98f9a8f3a
commit 98b6d40c19
4 changed files with 21 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.SRCINFO
-15
View File
@@ -1,15 +0,0 @@
pkgbase = rpass
pkgdesc = An rsync-based password manager and alternative to GNU pass
pkgver = 2021.09.07.pr3.1
pkgrel = 1
arch = x86_64
arch = aarch64
license = GPL3
depends = python
depends = gnupg
depends = openssh
depends = rsync
source = https://cloud.watergateserver.xyz/api/public/dl/6b0Wqz-J
sha512sums = f59cd1cd3c981b9424fba85bfd5e7b33e26a482d48b9b47a77be6f8e7cecbf078ec956a46b37db488d5173cd0a439f572ff06fc7d35cc3e9b0a7666e49cadeee
pkgname = rpass
PKGBUILD
-21
View File
@@ -1,21 +0,0 @@
# Maintainer: Randall Winkhart (Cuan) <idgr at tutanota dot com>
pkgname=rpass
pkgver=2021.09.07.pr3.1
pkgrel=1
pkgdesc="An rsync-based password manager and alternative to GNU pass"
arch=('x86_64' 'aarch64')
license=('GPL3')
depends=( python gnupg openssh rsync )
source=('https://cloud.watergateserver.xyz/api/public/dl/6b0Wqz-J')
sha512sums=('f59cd1cd3c981b9424fba85bfd5e7b33e26a482d48b9b47a77be6f8e7cecbf078ec956a46b37db488d5173cd0a439f572ff06fc7d35cc3e9b0a7666e49cadeee')
package() {
mv 6b0Wqz-J rpass-2021.09.07.pr3.1.tar.xz
tar xf rpass-2021.09.07.pr3.1.tar.xz -C "${pkgdir}"
chown -R "$USER" ${pkgdir}/var/lib/rpass
}
usr/bin/rpass → usr/bin/rpass.py
+18 -17
View File
@@ -1,6 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
# rpass 2021.09.07.pr3.1 # rpass 2021.09.08.pr4
# rpass is the gnu pass alternative for those who don't want to use git # rpass is the gnu pass alternative for those who don't want to use git
# rpass is freely licensed for modification and redistribution under the GNU General Public License V3 # rpass is freely licensed for modification and redistribution under the GNU General Public License V3
@@ -53,7 +53,7 @@ def rsyncdown():
# argument - filter the argument to usable text - some replacements are only done once to prevent interference # argument - filter the argument to usable text - some replacements are only done once to prevent interference
argument = str(argv).replace('[', '', 1).replace(']', '', 1).replace(',', '').replace("'", '') \ argument = str(argv).replace('[', '', 1).replace(']', '', 1).replace(',', '').replace("'", '') \
.replace(' ', '', 1).replace('/usr/bin/', '', 1).replace('rpass', '', 1) .replace(' ', '', 1).replace('/usr/bin/', '', 1).replace('rpass', '', 1).replace('./', '', 1).replace('.py', '', 1)
# startup help # startup help
@@ -81,6 +81,7 @@ if argument == 'help' or argument == '--help' or argument == '-h':
print() print()
print('Options: ') print('Options: ')
print('help/--help/-h bring up this menu') print('help/--help/-h bring up this menu')
print('version/-v display rpass version info')
print('config configure rpass') print('config configure rpass')
print('add add an entry') print('add add an entry')
print('gen generate a new password') print('gen generate a new password')
@@ -363,21 +364,21 @@ if argument == 'edit username' or argument == 'edit -u':
if entryname.startswith('/'): if entryname.startswith('/'):
if entryname.replace('/', '', 1).__contains__('/'): if entryname.replace('/', '', 1).__contains__('/'):
folder, sep, folderentry = entryname.replace('/', '', 1).partition('/') folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
folder + '/' + folderentry + '.gpg') folder + '/' + folderentry + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 0, username + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 0, username + '\n')
remove(directory + folder + '/' + folderentry + '.gpg') remove(directory + folder + '/' + folderentry + '.gpg')
encryptfolder() encryptfolder()
term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'") term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
entryname.replace('/', '', 1) + '.gpg') entryname.replace('/', '', 1) + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 0, username + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 0, username + '\n')
remove(directory + entryname.replace('/', '', 1) + '.gpg') remove(directory + entryname.replace('/', '', 1) + '.gpg')
encrypt() encrypt()
term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'") term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg') term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 0, username + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 0, username + '\n')
remove(directory + entryname + '.gpg') remove(directory + entryname + '.gpg')
encrypt() encrypt()
@@ -399,21 +400,21 @@ if argument == 'edit password' or argument == 'edit -p':
if entryname.startswith('/'): if entryname.startswith('/'):
if entryname.replace('/', '', 1).__contains__('/'): if entryname.replace('/', '', 1).__contains__('/'):
folder, sep, folderentry = entryname.replace('/', '', 1).partition('/') folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
folder + '/' + folderentry + '.gpg') folder + '/' + folderentry + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, password + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, password + '\n')
remove(directory + folder + '/' + folderentry + '.gpg') remove(directory + folder + '/' + folderentry + '.gpg')
encryptfolder() encryptfolder()
term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'") term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
entryname.replace('/', '', 1) + '.gpg') entryname.replace('/', '', 1) + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, password + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, password + '\n')
remove(directory + entryname.replace('/', '', 1) + '.gpg') remove(directory + entryname.replace('/', '', 1) + '.gpg')
encrypt() encrypt()
term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'") term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg') term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, password + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, password + '\n')
remove(directory + entryname + '.gpg') remove(directory + entryname + '.gpg')
encrypt() encrypt()
@@ -435,21 +436,21 @@ if argument == 'edit url' or argument == 'edit -l':
if entryname.startswith('/'): if entryname.startswith('/'):
if entryname.replace('/', '', 1).__contains__('/'): if entryname.replace('/', '', 1).__contains__('/'):
folder, sep, folderentry = entryname.replace('/', '', 1).partition('/') folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
folder + '/' + folderentry + '.gpg') folder + '/' + folderentry + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 2, url + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 2, url + '\n')
remove(directory + folder + '/' + folderentry + '.gpg') remove(directory + folder + '/' + folderentry + '.gpg')
encryptfolder() encryptfolder()
term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'") term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
entryname.replace('/', '', 1) + '.gpg') entryname.replace('/', '', 1) + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 2, url + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 2, url + '\n')
remove(directory + entryname.replace('/', '', 1) + '.gpg') remove(directory + entryname.replace('/', '', 1) + '.gpg')
encrypt() encrypt()
term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'") term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg') term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 2, url + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 2, url + '\n')
remove(directory + entryname + '.gpg') remove(directory + entryname + '.gpg')
encrypt() encrypt()
@@ -471,21 +472,21 @@ if argument == 'edit note' or argument == 'edit -n':
if entryname.startswith('/'): if entryname.startswith('/'):
if entryname.replace('/', '', 1).__contains__('/'): if entryname.replace('/', '', 1).__contains__('/'):
folder, sep, folderentry = entryname.replace('/', '', 1).partition('/') folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
folder + '/' + folderentry + '.gpg') folder + '/' + folderentry + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n')
remove(directory + folder + '/' + folderentry + '.gpg') remove(directory + folder + '/' + folderentry + '.gpg')
encryptfolder() encryptfolder()
term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'") term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
entryname.replace('/', '', 1) + '.gpg') entryname.replace('/', '', 1) + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n')
remove(directory + entryname.replace('/', '', 1) + '.gpg') remove(directory + entryname.replace('/', '', 1) + '.gpg')
encrypt() encrypt()
term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'") term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg') term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n')
remove(directory + entryname + '.gpg') remove(directory + entryname + '.gpg')
encrypt() encrypt()
@@ -553,21 +554,21 @@ if argument == 'gen update' or argument == 'gen -u':
if entryname.startswith('/'): if entryname.startswith('/'):
if entryname.replace('/', '', 1).__contains__('/'): if entryname.replace('/', '', 1).__contains__('/'):
folder, sep, folderentry = entryname.replace('/', '', 1).partition('/') folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
folder + '/' + folderentry + '.gpg') folder + '/' + folderentry + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, passgen + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, passgen + '\n')
remove(directory + folder + '/' + folderentry.replace('/', '', 1) + '.gpg') remove(directory + folder + '/' + folderentry.replace('/', '', 1) + '.gpg')
encryptfolder() encryptfolder()
term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'") term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
entryname.replace('/', '', 1) + '.gpg') entryname.replace('/', '', 1) + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, passgen + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, passgen + '\n')
remove(directory + entryname.replace('/', '', 1) + '.gpg') remove(directory + entryname.replace('/', '', 1) + '.gpg')
encrypt() encrypt()
term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'") term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
else: else:
term('gpg --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg') term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg')
replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, passgen + '\n') replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 1, passgen + '\n')
remove(directory + entryname + '.gpg') remove(directory + entryname + '.gpg')
encrypt() encrypt()
usr/share/doc/rpass/changelog
+3 -3
View File
@@ -17,14 +17,14 @@ New features:
Changes: Changes:
**move project to github - fixed gpg decryption warnings
**change gpg prompt to get rid of expiration date
**get rid of gpg decryption warnings
**optimize code (specifically for when there is no folder but there is a slash) **optimize code (specifically for when there is no folder but there is a slash)
**add version info argument **add version info argument
**update rsync config wizard **update rsync config wizard
**fix rsync delete on upload
**properly comment the code **properly comment the code
**validate for Python 3.10 **validate for Python 3.10
**do a better job at clearing /dev/shm
Planned for next update (The Secret Update): Planned for next update (The Secret Update):