Update README.md

PKGBUILD

@@ -1,21 +1,22 @@
 # Maintainer: Randall Winkhart <idgr at tutanota dot com>
 
-pkgname=rpass
-pkgver=2021.09.15.mr4.2
+pkgname=sshyp
+pkgver=2021.11.05.fr1
 pkgrel=1
-pkgdesc="An rsync-based password manager and alternative to GNU pass"
+pkgdesc='A self-hosted, synchronized password manager'
+url='https://github.com/rwinkhart/sshyp'
 arch=('x86_64' 'aarch64')
 license=('GPL3')
-depends=( python gnupg openssh rsync xclip wl-clipboard)
+depends=( python gnupg openssh nano xclip wl-clipboard)
 
-source_x86_64=('https://github.com/rwinkhart/rpass/releases/download/v2021.09.15.mr4.1/rpass-2021.09.15.mr4.2.tar.xz')
-source_aarch64=('https://github.com/rwinkhart/rpass/releases/download/v2021.09.15.mr4.1/rpass-2021.09.15.mr4.2.tar.xz')
-sha512sums_x86_64=('f3948d7c6e26f53d19a08db32ba7f7a3576d0386dea2338ff529cb3ee72365c3d405d6de5c812b398e87b8fe50b765a4fc2bcc899fe09cef9d2db44c7978d6bf')
-sha512sums_aarch64=('f3948d7c6e26f53d19a08db32ba7f7a3576d0386dea2338ff529cb3ee72365c3d405d6de5c812b398e87b8fe50b765a4fc2bcc899fe09cef9d2db44c7978d6bf')
+source_x86_64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.11.05.fr1/sshyp-2021.11.05.fr1.tar.xz')
+source_aarch64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.11.05.fr1/sshyp-2021.11.05.fr1.tar.xz')
+sha512sums_x86_64=('dcc2fe2e751120ffed86cad5f170bdf6ba4ef96df4c4cc784496289c7fda1ccef5ded030ce20f4ea6571a0def5bc185037b39f0958958a1aadb1ead63291b879')
+sha512sums_aarch64=('dcc2fe2e751120ffed86cad5f170bdf6ba4ef96df4c4cc784496289c7fda1ccef5ded030ce20f4ea6571a0def5bc185037b39f0958958a1aadb1ead63291b879')
 
 package() {
 
-	tar xf rpass-"$pkgver".tar.xz -C "${pkgdir}"
-	chown -R "$USER" ${pkgdir}/var/lib/rpass
+	tar xf sshyp-"$pkgver".tar.xz -C "${pkgdir}"
+	chown -R "$USER" ${pkgdir}/var/lib/sshyp
 
 }

README.md

@@ -1,16 +1,46 @@
-# rpass
-A very simple password manager with rsync integration - alternative to GNU pass
+# sshyp
+A very simple self-hosted, synchronized password manager. Alternative to GNU pass.
+
+"sshyp" stands for "sshync passwords", or "ssh sync passwords".
+"sshync" is the custom syncing backend (based on sftp) used by "sshyp".
+
+# WARNING
+It is your responsibility to assess the security and stability of "sshyp" before using it and ensure it meets your needs.
+I am not responsible for any data loss or breaches of your information resulting from the use of "sshyp".
+"sshyp" is a new project that is constantly being updated, and though safety and security are priorities, they cannot be guaranteed.
+
+# Mission Statement
+sshyp aims to make it as simple as possible to manage passwords and notes via CLI across multiple devices in a secure, self-hosted fashion.
+
+What sshyp can do:
+
+- securely manage a collection of encrypted passwords and notes via CLI
+- generate new, secure passwords to the user's choice in length and complexity
+- securely sync said passwords and notes seamlessly between multiple POSIX compliant Unix devices
+
+What sshyp will do:
+
+- everything it already does, but also in a GUI for Linux/Android
+- have a distinct retro theme
+- receive many usability enhancements
+
+What sshyp definitely won't do:
+
+- 2FA/MFA (for security purposes, this should not be handled by your password manager)
+- Windows support (I don't use Windows and I have no interest in developing for it)
 
 # Installation
 Arch Linux (x86_64, aarch64)
 
-rpass releases are available in the Arch User Repository as 'rpass'.
+Note: currently unavailable in the AUR (the older version, "rpass", will remain available until sshyp is stable)
+
+sshyp releases will be available in the Arch User Repository as 'sshyp'.
 
 Install with your preferred AUR helper or use:
 
 ```
-git clone https://aur.archlinux.org/rpass.git 
-cd rpass
+git clone https://aur.archlinux.org/sshyp.git
+cd sshyp
 makepkg -si
 ```
 
@@ -20,33 +50,33 @@ Packaging for other distributions coming soon.
 Upon initial installation, be sure to run:
 
 ```
-rpass config
+sshyp config
 ```
 
-This command will allow you to configure the settings necessary for rpass to function.
+This command will allow you to configure the settings necessary for sshyp to function.
+As of right now, sshyp is rapidly changing, and as such, it is a good idea to run "sshyp config" after each update.
 
 All available options can be found with:
 
 ```
-rpass --help
+sshyp --help
 ```
 
 # Roadmap
 Short-term Goals:
 
+- re-write bad, leftover "rpass" code
 - create new file list w/color and w/o file extensions
 - create a man page
-- allow for multi-line notes
 - overhaul argument system
 - fix lots of bugs!
+- make lots of optimizations!
 
 Medium-term Goals:
 
-- add libsecret integration to allow rpass to act as a gnome-keyring alternative
-- create a minimal GUI app optimized for the Pinephone (also compatible with x86_64)
+- create minimal GUI apps (Linux x86_64, Linux aarch64, Android aarch64)
+- auto-completion on tab for CLI version
 
 Long-term Goals:
 
-- make an Android port (including GUI)
-- make a minimal Windows port
-- investigate auto-completion on tab
+- seize the thrones, shear the humans

bin/sshync.py

@@ -0,0 +1,216 @@
+#!/usr/bin/python3
+
+# Main Targets:
+# TODO Make it so that when a new folder is created in sshyp, it is automatically created on the remote server
+# TODO Replace references to sshyp directory with a changeable variable
+# TODO Clean everything up and move sshync to a separate package
+# TODO Add dry run support
+# TODO use partition command instead of split for separating paths
+# TODO use classes!
+
+# sshync 2021.11.05.unreleased5
+# sshync was created to solve a problem with rpass/sshyp, and as such, sshync will be bundled with sshyp until it is
+# polished enough for a standalone release
+
+# sshync is a wrapper around sftp that allows easy remote directory synchronization via Python
+# openssh (on POSIX compliant Unix) is required
+
+# sshync will always overwrite the older files with the newer files, regardless of all other conditions
+#   ^the age is determined by the date and time of the last modification to the files
+
+# syncing via sshync is always done recursively
+
+# external modules
+
+from os import walk
+from os import system as term
+from os.path import getmtime
+from os.path import join as path_join
+
+
+# internal modules
+
+
+# recursively scans a local directory for all files and saves file paths and mod times to lists
+def get_file_paths_mod(directory, name_database, time_database):
+    file_paths = []
+    temp_mod_times = []
+    mod_times = []
+    for root, directories, files in walk(directory):
+        for filename in files:
+            filepath = path_join(root, filename)
+            file_paths.append(filepath)
+            temp_mod_times.append(str(getmtime(filepath)))
+    for time in temp_mod_times:
+        mod_times.append(round(float(time), 2))
+    open(name_database, 'w').write(str(file_paths))
+    open(time_database, 'w').write(str(mod_times))
+    return file_paths, mod_times
+
+
+# recursively scans a remote directory for all files and saves file paths and mod times to lists
+def get_file_paths_mod_remote(profile_dir):
+    # import profile data
+    profile_data = get_profile(profile_dir)
+    user = profile_data[0].replace('\n', '')
+    ip = profile_data[1].replace('\n', '')
+    port = profile_data[2].replace('\n', '')
+    remote_dir = profile_data[4].replace('\n', '')
+    identity = profile_data[5].replace('\n', '')
+    term("ssh -i " + "'" + identity + "'" + " -p " + port + " " + user + "@" + ip + " \"python -c \'import sshync; "
+                                                                                    "sshync.get_file_paths_mod(" +
+         "\"'\"" + remote_dir + "/\"'\", " + "\"'\"/var/lib/sshyp/sshyncdatabase_names\"'\", " +
+         "\"'\"/var/lib/sshyp/sshyncdatabase_times\"'\")\'\"")
+    term(
+        'sftp -P ' + port + ' ' + user + '@' + ip + ':/var/lib/sshyp/sshyncdatabase_names ' +
+        '/var/lib/sshyp/sshyncdatabase_names')
+    term(
+        'sftp -P ' + port + ' ' + user + '@' + ip + ':/var/lib/sshyp/sshyncdatabase_times ' +
+        '/var/lib/sshyp/sshyncdatabase_times')
+    remote_mod_names = (open('/var/lib/sshyp/sshyncdatabase_names').read()).replace('[', '').replace(']', '').replace(
+        ' ', '').replace("'", '').split(',')
+    remote_mod_times = (open('/var/lib/sshyp/sshyncdatabase_times').read()).replace('[', '').replace(']', '').replace(
+        ' ', '').replace("'", '').split(',')
+    return remote_mod_names, remote_mod_times
+
+
+# regular profiles check the mod time of every individual file in the directory, making them slow but versatile
+def make_profile(profile_dir, local_dir, remote_dir, identity, ip, port, user):
+    open(profile_dir, 'w').write(user + '\n' + ip + '\n' + port + '\n' + local_dir + '\n' + remote_dir + '\n' + identity
+                                 + '\n')
+
+
+# returns the settings for a specified profile
+def get_profile(profile_dir):
+    try:
+        profile_data = open(profile_dir).readlines()
+    except (FileNotFoundError, IndexError):
+        profile_data = 0
+    return profile_data
+
+
+# sorts name lists so that local and remote are in the same order
+def name_sort(local_names, remote_names):
+    remote_names_new = []
+    for ele in local_names:
+        if ele in remote_names:
+            remote_names_new.append(ele)
+    for ele in remote_names:
+        if ele not in remote_names_new:
+            remote_names_new.append(ele)
+    return remote_names_new
+
+
+# sorts time lists to compensate for name list re-ordering
+def time_sort(old_names, new_names, old_times):
+    remote_mod_times_new = []
+    new_pos = -1
+    for title in new_names:
+        new_pos += 1
+        if title in old_names:
+            old_pos = old_names.index(title)
+            try:
+                remote_mod_times_new.append(old_times[old_pos])
+            except IndexError:
+                pass
+    return remote_mod_times_new
+
+
+getter_loop_count = -1
+
+
+def loop_getter(split_remote_dir):
+    global getter_loop_count
+    getter_loop_count += 1
+    new_var = split_remote_dir[getter_loop_count] + '/'
+    return new_var
+
+
+def run_profile(profile_dir):
+    # import profile data
+    profile_data = get_profile(profile_dir)
+    user = profile_data[0].replace('\n', '')
+    ip = profile_data[1].replace('\n', '')
+    port = profile_data[2].replace('\n', '')
+    local_dir = profile_data[3].replace('\n', '')
+    remote_dir = profile_data[4].replace('\n', '')
+    identity = profile_data[5].replace('\n', '')
+    # get file modification times
+    local_mod_names, local_mod_times = get_file_paths_mod(local_dir + '/', '/var/lib/sshyp/sshyncdatabase_names',
+                                                          '/var/lib/sshyp/sshyncdatabase_times')
+    remote_mod_times = []
+    remote_mod_names, remote_mod_times_temp = get_file_paths_mod_remote('/var/lib/sshyp/sshyp.sshync')
+    try:
+        for time in remote_mod_times_temp:  # remove quotes from remote_mod_times
+            remote_mod_times.append(float(time))
+    except ValueError:
+        pass
+    lmod_short = []
+    rmod_short = []
+    matching_names = []
+    matching_times_local = []
+    matching_times_remote = []
+    for lmod in local_mod_names:
+        lmod_short.append(lmod.replace(local_dir, ''))
+    for rmod in remote_mod_names:
+        rmod_short.append(rmod.replace(remote_dir, ''))
+    rmod_short_old = rmod_short
+    rmod_short = name_sort(lmod_short, rmod_short)
+    remote_mod_times = time_sort(rmod_short_old, rmod_short, remote_mod_times)
+    i = -1
+    for lshort in lmod_short:
+        i += 1
+        if lshort in rmod_short:
+            matching_names.append(lshort)
+            matching_times_local.append(local_mod_times[i])
+        else:
+            print('Uploading ' + lshort)
+            lshort_split = lshort.replace('/', '', 1).split('/')
+
+            c = -1
+            for _ in lshort_split:
+                c += 1
+
+            global getter_loop_count
+            getter_loop_count = -1
+            q = ''
+            for _ in range(c):
+                q += loop_getter(lshort_split)
+
+            term('sftp -p -i ' + "'" + identity + "' " + '-P ' + port + ' ' + user + '@' + ip + ':' + remote_dir + q +
+                 " <<< $'put " + local_dir + lshort.replace('/', '', 1) + "'")
+    i = -1
+    for rshort in rmod_short:
+        i += 1
+        if rshort in lmod_short:
+            matching_times_remote.append(float(remote_mod_times[i]))
+        else:
+            print('Downloading ' + rshort)
+            term('sftp -p -i ' + "'" + identity + "' " + '-P ' + port + ' ' + user + '@' + ip + ':' + remote_dir +
+                 rshort.replace('/', '', 1) + ' ' + local_dir + rshort.replace('/', '', 1))
+    i = -1
+    for ltime in matching_times_local:
+        i += 1
+        ltime = int(ltime)
+        if ltime == int(matching_times_remote[i]):
+            print('Local ' + matching_names[i] + ' is up to date, not syncing.')
+        elif ltime > int(matching_times_remote[i]):
+            print('Local ' + matching_names[i] + ' is newer, uploading.')
+            matching_names_split = matching_names[i].replace('/', '', 1).split('/')
+
+            c = -1
+            for _ in matching_names_split:
+                c += 1
+
+            getter_loop_count = -1
+            q = ''
+            for _ in range(c):
+                q += loop_getter(matching_names_split)
+
+            term('sftp -p -i ' + "'" + identity + "' " + '-P ' + port + ' ' + user + '@' + ip + ':' + remote_dir + q +
+                 " <<< $'put " + local_dir + matching_names[i].replace('/', '', 1) + "'")
+
+        elif ltime < int(matching_times_remote[i]):
+            print('Local ' + matching_names[i] + ' is older, downloading.')
+            term('sftp -p -i ' + "'" + identity + "' " + '-P ' + port + ' ' + user + '@' + ip + ':' + remote_dir +
+                 matching_names[i].replace('/', '', 1) + ' ' + local_dir + matching_names[i].replace('/', '', 1))

bin/sshyp

@@ -1,33 +1,46 @@
 #!/usr/bin/python3
 
-# internal modules
+# external modules
 
-from os import system
+from os import system as term
 from os import remove
 from os import environ
 from shutil import move
 from shutil import rmtree
+from shutil import copy
 from sys import argv
+from re import search
+from re import escape
 import random
 import string
+import sshync
 
-# custom modules
 
+# internal modules
 
 def clear():
     print('\n' * 100)
 
 
-def term(cmd):
-    _ = system(cmd)
+def string_found(string1, string2):
+    if search(r"\b" + escape(string1) + r"\b", string2):
+        return True
+    return False
 
 
 def replace_line(file_name, line_num, text):
-    lines = open(file_name, 'r').readlines()
-    lines[line_num] = text
-    out = open(file_name, 'w')
-    out.writelines(lines)
-    out.close()
+    xlines = open(file_name, 'r').readlines()
+    xlines[line_num] = text
+    open(file_name, 'w').writelines(xlines)
+
+
+def edit_note():
+    lines = open('/dev/shm/' + shmfolder + '/' + shmentry).readlines()
+    open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(lines[0:3])
+    open('/dev/shm/' + shmfolder + '/' + shmentry + '-n', 'w').writelines(lines[4:-2])
+    term('nano /dev/shm/' + shmfolder + '/' + shmentry + '-n')
+    edit_notes = open('/dev/shm/' + shmfolder + '/' + shmentry + '-n').read()
+    open('/dev/shm/' + shmfolder + '/' + shmentry, 'a').write('\n' + edit_notes + '\n\n')
 
 
 def shmgen():
@@ -54,19 +67,19 @@ def encryptfolder():
 # argument - filter the argument to usable text
 
 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('sshyp', '', 1)
 
 # help
 
 if argument == 'help' or argument == '--help' or argument == '-h':
-    print('\nrpass  Copyright (C) 2021  Randall Winkhart')
-    print("This program comes with ABSOLUTELY NO WARRANTY; for details type `rpass show w'.\nThis is free software, "
-          "and you are welcome to redistribute it under certain conditions; type `rpass show c' for details.")
-    print('\nUSAGE: rpass [/<entry name>] [OPTION] [FLAG]\n')
+    print('\nsshyp  Copyright (C) 2021  Randall Winkhart')
+    print("This program comes with ABSOLUTELY NO WARRANTY; for details type `sshyp show w'.\nThis is free software, "
+          "and you are welcome to redistribute it under certain conditions; type `sshyp show c' for details.")
+    print('\nUSAGE: sshyp [/<entry name>] [OPTION] [FLAG]\n')
     print('Options: ')
     print('help/--help/-h           bring up this menu')
-    print('version/-v               display rpass version info')
-    print('config                   configure rpass')
+    print('version/-v               display sshyp version info')
+    print('config                   configure sshyp')
     print('add                      add an entry')
     print('gen                      generate a new password')
     print('edit                     edit an existing entry')
@@ -91,7 +104,7 @@ if argument == 'help' or argument == '--help' or argument == '-h':
     print(' note/-n                 copy the note of an entry to your clipboard')
     print('gen:')
     print(' update/-u               generate a password for an existing entry\n')
-    print("Tip: You can quickly read an entry with 'rpass /<entry name>'!")
+    print("Tip: You can quickly read an entry with 'sshyp /<entry name>'!")
     print("When specifying entry names, do not include the file extension! '.gpg' is assumed!\n")
 
 # version info
@@ -99,10 +112,10 @@ if argument == 'help' or argument == '--help' or argument == '-h':
 if argument == 'version' or argument == '-v':
     print('\n////////////////////////////////////////////////////////')
     print('/                                                      /')
-    print('/     rpass  Copyright (C) 2021  Randall Winkhart      /')
+    print('/     sshyp  Copyright (C) 2021  Randall Winkhart      /')
     print('/                                                      /')
-    print('/             Version 2021.09.15.mr4.2                 /')
-    print('/          The Housekeeping Update (Pt. 1)             /')
+    print('/               Version 2021.11.05.fr1                 /')
+    print('/                  The sshync Update                   /')
     print('/                                                      /')
     print('////////////////////////////////////////////////////////\n')
 
@@ -126,103 +139,87 @@ if argument == 'show c':
 if argument == 'config':
     try:
         print()
-        directorychoice = str(input('Would you like to use the default entry directory (~/.rpass-store/)? (Y/n) '))
-        if directorychoice == 'n' or directorychoice == 'N':
-            print('\nFormat: /this/path/ends/with/a/slash/\n')
-            directory = str(input('Please input a custom directory: '))
-            with open("/var/lib/rpass/rpass-dir", 'w') as f:
-                f.write(directory + '\n')
-        else:
-            with open("/var/lib/rpass/rpass-dir", 'w') as f:
-                f.write('/home/' + environ.get('USER') + '/.rpass-store/' + '\n')
-        print()
-        devicetype = str(input('Will this be a client, server, or offline device? (C/s/o) '))
+        devicetype = str(input('Will this be a client or a server device? (C/s) '))
         if devicetype == 's' or devicetype == 'S':
-            with open("/var/lib/rpass/rpass-ssh", 'w') as f:
-                f.write('\n\n\n\n' + devicetype)
+            open("/var/lib/sshyp/sshyp-device", 'w').write(devicetype)
             print('\nMake sure the ssh service is running and properly configured.\n')
+            copy('/usr/bin/sshync.py', '/home/' + environ.get('USER') + '/')
+            term('mkdir -p /home/' + environ.get('USER') + '/.password-pasture')
             print('Configuration complete!\n')
         else:
+            devicetype = 'c'
+            gpgid = ''
             print()
             gpgpresent = str(input(
-                'rpass requires the use of a unique gpg key. Do you already have one you are willing to use? (y/N) '))
+                'sshyp requires the use of a unique gpg key. Do you already have one you are willing to use? (y/N) '))
             if gpgpresent == 'y' or gpgpresent == 'Y':
                 print()
                 gpgid = str(input('Please input the ID of your gpg key: '))
-                with open("/var/lib/rpass/rpass-gpg", 'w') as f:
-                    f.write(gpgid + '\n')
+                open("/var/lib/sshyp/sshyp-gpg", 'w').write(gpgid + '\n')
             else:
                 print()
                 gpggen = str(
                     input('Would you like to generate one now? Note that if you choose not to do this, you will have '
-                          'to re-run "rpass config" to specify a gpg key when you acquire one (Y/n) '))
+                          'to re-run "sshyp config" to specify a gpg key when you acquire one (Y/n) '))
                 if gpggen == 'n' or gpggen == 'N':
                     exit()
                 else:
                     term('gpg --full-generate-key')
                     print()
                     gpgid = str(input('Please input the ID of your gpg key: '))
-                    with open("/var/lib/rpass/rpass-gpg", 'w') as f:
-                        f.write(gpgid + '\n')
-        if devicetype == 'o' or devicetype == 'O':
-            with open("/var/lib/rpass/rpass-ssh", 'w') as f:
-                f.write('\n\n\n\n' + devicetype)
-            print('\nConfiguration complete!\n')
-        elif devicetype != 's' and devicetype != 'S':
-            devicetype = 'c'
+                    open("/var/lib/sshyp/sshyp-gpg", 'w').write(gpgid + '\n')
+            try:
+                open('/var/lib/sshyp/lock', 'x').write('locked')
+            except FileExistsError:
+                pass
+            term('gpg -r ' + str(gpgid) + ' -e ' + '/var/lib/sshyp/lock')
+            remove('/var/lib/sshyp/lock')
             print('\nMake sure the ssh service on the remote server is running and properly configured.\n')
             sshgen = str(input('rsync support requires a unique ssh key. Would you like to have this '
                                'automatically generated? (Y/n) '))
             if sshgen != 'n' and sshgen != 'N':
-                term('ssh-keygen -f ~/.ssh/rpass')
+                term('ssh-keygen -t ed25519 -f ~/.ssh/sshyp')
             print('\nExample input: 10.10.10.10:9999\n')
             ip_port = str(input('What is the IP and ssh port of the remote server? '))
             print()
             ip, sep, port = ip_port.partition(':')
             usernamessh = str(input('What is the username of the remote server? '))
-            print('\nDefault directory: ' + '/home/' + usernamessh + '/.rpass-store/\n')
-            directoryssh = str(input('Is the remote server using the default password directory? (Y/n) '))
-            if directoryssh == 'n' or directoryssh == 'N':
-                print('\nFormat: /this/path/ends/with/a/slash/\n')
-                directoryssh = str(input('What directory is the server using?: '))
-            else:
-                directoryssh = ('/home/' + usernamessh + '/.rpass-store/')
-            with open("/var/lib/rpass/rpass-ssh", 'w') as f:
-                f.write(usernamessh + '\n' + ip + '\n' + port + '\n' + directoryssh + '\n' + devicetype)
-            print('\nConfiguration complete!\n')
+            print('\nDefault directory: ' + '/home/' + usernamessh + '/.password-pasture/\n')
+            directoryssh = ('/home/' + usernamessh + '/.password-pasture/')
+            open("/var/lib/sshyp/sshyp-device", 'w').write(devicetype)
+            sshync.make_profile('/var/lib/sshyp/sshyp.sshync', '/home/' + environ.get('USER') + '/.password-pasture/',
+                                directoryssh, '/home/' + environ.get('USER') + '/.ssh/sshyp', ip, port, usernamessh)
+            print('Configuration complete!\n')
     except KeyboardInterrupt:
         print('\n\nConfiguration cancelled.\n')
         exit()
 
-
 # startup help
 
 if argument == '':
     clear()
     print("Use 'help', '--help', or '-h' to see a list of commands.\n")
-    print('rpass is currently early software with very little polish\n')
+    print('sshyp is currently early software with very little polish\n')
 
 # import userdata
 
+devicetype = 'c'
 try:
-    sshinfo = open("/var/lib/rpass/rpass-ssh").readlines()
+    devicetype = open('/var/lib/sshyp/sshyp-device').read().strip()
+    gpgid = open('/var/lib/sshyp/sshyp-gpg').read().strip()
+    sshinfo = sshync.get_profile('/var/lib/sshyp/sshyp.sshync')
     usernamessh = sshinfo[0].replace('\n', '')
     ip = sshinfo[1].replace('\n', '')
     port = sshinfo[2].replace('\n', '')
-    directoryssh = sshinfo[3].replace('\n', '')
-    devicetype = sshinfo[4].replace('\n', '')
-except (FileNotFoundError, IndexError):
-    usernamessh, ip, port, directoryssh, devicetype = (0, 0, 0, 0, 0)
-try:
-    with open("/var/lib/rpass/rpass-gpg") as f:
-        gpgid = f.read().strip()
-    with open("/var/lib/rpass/rpass-dir") as f:
-        directory = f.read().strip()
+    directory = str(sshinfo[3].replace('\n', ''))
+    directoryssh = sshinfo[4].replace('\n', '')
     term('mkdir -p ' + directory)
 except FileNotFoundError:
-    print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-    print("Not all necessary configuration files are present. Please run 'rpass config'!")
-    print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n')
+    if devicetype != 's' and devicetype != 'S':
+        print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
+        print("Not all necessary configuration files are present. Please run 'sshyp config'!")
+        print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n')
+    devicetype, sshinfo, directory, directoryssh, ip, port, usernamessh = [0, 0, 0, 0, 0, 0, 0]
     exit()
 
 # no argument
@@ -252,7 +249,7 @@ if argument.startswith('/'):
 # add
 
 if argument == 'add':
-    print('\nUSAGE: rpass add [FLAG]')
+    print('\nUSAGE: sshyp add [FLAG]')
     print('Flags:')
     print('add:')
     print(' password/-p             add a password entry')
@@ -263,28 +260,26 @@ if argument == 'add note' or argument == 'add -n':
     try:
         clear()
         entryname = str(input('Name of note: '))
-        notes = str(input('Contents of note: '))
     except KeyboardInterrupt:
         entryname, notes = (0, 0)
         print('\n\nEntry add cancelled.\n')
         exit()
     shmfolder, shmentry = shmgen()
+    term('nano /dev/shm/' + shmfolder + '/' + shmentry + '-n')
+    notes = open('/dev/shm/' + shmfolder + '/' + shmentry + '-n', 'r').read()
     try:
-        if entryname.startswith('/'):
-            if entryname.replace('/', '', 1).__contains__('/'):
+        if entryname.startswith('/'):  # check if user input contains slashes
+            if entryname.replace('/', '', 1).__contains__('/'):  # create folder and entry if there are two slashes
                 folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
-                with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                    f.writelines('\n\n\n' + notes + '\n\n')
+                open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines('\n\n\n\n' + notes + '\n\n')
                 encryptfolder()
                 term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
-            else:
-                with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                    f.writelines('\n\n\n' + notes + '\n\n')
+            else:  # create entry if there is only one slash
+                open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines('\n\n\n\n' + notes + '\n\n')
                 encrypt()
                 term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
-        else:
-            with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                f.writelines('\n\n\n' + notes + '\n\n')
+        else:  # create entry if there are no slashes
+            open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines('\n\n\n\n' + notes + '\n\n')
             encrypt()
             term('gpg -d ' + directory + "'" + entryname + '.gpg' + "'")
     except FileNotFoundError:
@@ -301,28 +296,33 @@ if argument == 'add password' or argument == 'add -p':
         username = str(input('Username: '))
         password = str(input('Password: '))
         url = str(input('URL: '))
-        notes = str(input('Additional notes: '))
     except KeyboardInterrupt:
         entryname, username, password, url, notes = (0, 0, 0, 0, 0)
         print('\n\nEntry add cancelled.\n')
         exit()
     shmfolder, shmentry = shmgen()
+    add_note = input('Add a note to this entry? (y/N) ')
+    if add_note == 'y' or add_note == 'Y':
+        term('nano /dev/shm/' + shmfolder + '/' + shmentry + '-n')
+        notes = open('/dev/shm/' + shmfolder + '/' + shmentry + '-n', 'r').read()
+    else:
+        notes = ''
     try:
         if entryname.startswith('/'):
             if entryname.replace('/', '', 1).__contains__('/'):
                 folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
-                with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                    f.writelines(username + '\n' + password + '\n' + url + '\n' + notes + '\n\n')
+                open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(username + '\n' + password + '\n' + url
+                                                                               + '\n\n' + notes + '\n\n')
                 encryptfolder()
                 term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
             else:
-                with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                    f.writelines(username + '\n' + password + '\n' + url + '\n' + notes + '\n\n')
+                open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(username + '\n' + password + '\n' + url
+                                                                               + '\n\n' + notes + '\n\n')
                 encrypt()
                 term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
         else:
-            with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                f.writelines(username + '\n' + password + '\n' + url + '\n' + notes + '\n\n')
+            open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(username + '\n' + password + '\n' + url
+                                                                           + '\n\n' + notes + '\n\n')
             encrypt()
             term('gpg -d ' + directory + "'" + entryname + '.gpg' + "'")
     except FileNotFoundError:
@@ -339,7 +339,7 @@ if argument == 'add folder' or argument == 'add -f':
 # edit
 
 if argument == 'edit':
-    print('\nUSAGE: rpass edit [FLAG]')
+    print('\nUSAGE: sshyp edit [FLAG]')
     print('Flags:')
     print('edit:')
     print(' rename/relocate/-r      rename or relocate an entry')
@@ -505,7 +505,6 @@ if argument == 'edit note' or argument == 'edit -n':
         term('cd ' + directory + '; ls -1 *')
         print()
         entryname = str(input('What file would you like to edit? '))
-        notes = str(input('New Note: '))
     except KeyboardInterrupt:
         entryname, notes = (0, 0)
         print('\n\nEdit cancelled.\n')
@@ -517,20 +516,20 @@ if argument == 'edit note' or argument == 'edit -n':
                 folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
                 term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
                      folder + '/' + folderentry + '.gpg')
-                replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n')
+                edit_note()
                 remove(directory + folder + '/' + folderentry + '.gpg')
                 encryptfolder()
                 term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
             else:
                 term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory +
                      entryname.replace('/', '', 1) + '.gpg')
-                replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n')
+                edit_note()
                 remove(directory + entryname.replace('/', '', 1) + '.gpg')
                 encrypt()
                 term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
         else:
             term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + entryname + '.gpg')
-            replace_line('/dev/shm/' + shmfolder + '/' + shmentry, 3, notes + '\n')
+            edit_note()
             remove(directory + entryname + '.gpg')
             encrypt()
             term('gpg -d ' + directory + "'" + entryname + '.gpg' + "'")
@@ -544,7 +543,7 @@ if argument == 'edit note' or argument == 'edit -n':
 # copy
 
 if argument == 'copy':
-    print('\nUSAGE: rpass copy [FLAG]')
+    print('\nUSAGE: sshyp copy [FLAG]')
     print('Flags:')
     print('copy:')
     print(' username/-u             copy the username of an entry to your clipboard')
@@ -593,9 +592,9 @@ if argument == 'copy password' or argument == 'copy -p':
         term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + readentry + '.gpg')
         copyline = open('/dev/shm/' + shmfolder + '/' + shmentry, 'r').readlines()
         if environ.get('WAYLAND_DISPLAY') == 'wayland-0':
-            term('wl-copy ' + "'" + copyline[1].replace('\n', '') + "'")
+            term('wl-copy ' + "'" + copyline[1].replace('\n', '').replace("'", "'\\''") + "'")
         else:
-            term('echo -n ' + "'" + copyline[1].replace('\n', '') + "'" + ' | xclip -sel c')
+            term('echo -n ' + "'" + copyline[1].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c')
         rmtree('/dev/shm/' + shmfolder)
     except FileNotFoundError:
         print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
@@ -645,9 +644,9 @@ if argument == 'copy note' or argument == 'copy -n':
         term('gpg -d --output /dev/shm/' + shmfolder + '/' + shmentry + ' ' + directory + readentry + '.gpg')
         copyline = open('/dev/shm/' + shmfolder + '/' + shmentry, 'r').readlines()
         if environ.get('WAYLAND_DISPLAY') == 'wayland-0':
-            term('wl-copy ' + "'" + copyline[3].replace('\n', '') + "'")
+            term('wl-copy ' + "'" + copyline[4].replace('\n', '') + "'")
         else:
-            term('echo -n ' + "'" + copyline[3].replace('\n', '') + "'" + ' | xclip -sel c')
+            term('echo -n ' + "'" + copyline[4].replace('\n', '') + "'" + ' | xclip -sel c')
         rmtree('/dev/shm/' + shmfolder)
     except FileNotFoundError:
         print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
@@ -681,18 +680,18 @@ if argument == 'gen':
         if entryname.startswith('/'):
             if entryname.replace('/', '', 1).__contains__('/'):
                 folder, sep, folderentry = entryname.replace('/', '', 1).partition('/')
-                with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                    f.writelines(username + '\n' + passgen + '\n' + url + '\n' + notes + '\n\n')
+                open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(username + '\n' + passgen + '\n' + url
+                                                                               + '\n' + notes + '\n\n')
                 encryptfolder()
                 term('gpg -d ' + directory + folder + '/' + "'" + folderentry + '.gpg' + "'")
             else:
-                with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                    f.writelines(username + '\n' + passgen + '\n' + url + '\n' + notes + '\n\n')
+                open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(username + '\n' + passgen + '\n' + url
+                                                                               + '\n' + notes + '\n\n')
                 encrypt()
                 term('gpg -d ' + directory + "'" + entryname.replace('/', '', 1) + '.gpg' + "'")
         else:
-            with open('/dev/shm/' + shmfolder + '/' + shmentry, 'w') as f:
-                f.writelines(username + '\n' + passgen + '\n' + url + '\n' + notes + '\n\n')
+            open('/dev/shm/' + shmfolder + '/' + shmentry, 'w').writelines(username + '\n' + passgen + '\n' + url
+                                                                           + '\n' + notes + '\n\n')
             encrypt()
             term('gpg -d ' + directory + "'" + entryname + '.gpg' + "'")
     except FileNotFoundError:
@@ -758,6 +757,13 @@ if argument == 'remove' or argument == '-rm':
     print()
     try:
         entryname = str(input('What would you like to delete? '))
+        try:
+            term('gpg -d --output /dev/shm/sshyp.lock /var/lib/sshyp/lock.gpg')
+            unlocker = open('/dev/shm/sshyp.lock', 'r').readlines()
+            remove('/dev/shm/sshyp.lock')
+        except FileNotFoundError:
+            print('\nAccess denied.\n')
+            exit()
         if entryname.startswith('/'):
             if entryname.replace('/', '', 1).__contains__('/'):
                 if devicetype == 'c':
@@ -783,12 +789,12 @@ if argument == 'remove' or argument == '-rm':
         print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n')
         exit()
 
-if argument.__contains__('add') or argument.__contains__('-rm') or argument.__contains__('remove') or argument.\
-        __contains__('edit') or argument.__contains__('gen') or argument.__contains__('version') or argument.\
-        __contains__('-v') or argument.__contains__('config') or argument.__contains__('copy') or argument.\
-        __contains__('show') or argument.__contains__('/') or argument == 'sync' or argument == '-s' or argument == '' \
-        or argument == 'help' or argument == '--help' or argument == '-h':
-    null = 'null'
+if argument.__contains__('-rm') or string_found('remove', argument) or string_found('add', argument) or \
+        string_found('edit', argument) or string_found('gen', argument) or string_found('copy', argument) or \
+        string_found('/', argument) or argument == 'sync' or argument == '-s' or argument == '' or argument == 'help' \
+        or argument == '--help' or argument == '-h' or argument == 'version' or argument == '-v' or argument == \
+        'config' or argument == 'show w' or argument == 'show c':
+    pass
 else:
     print('\n!!!!!!!!!!!!!!!')
     print('Argument error!')
@@ -802,10 +808,7 @@ term('find ' + directory + ' -type f -exec chmod -R 600 {} +')
 
 # rsync - ran at end of program to ensure all files are properly synced
 if devicetype == 'c':
-    if argument.__contains__('add') or argument.__contains__('-rm') or argument.__contains__('remove') or argument. \
-            __contains__('edit') or argument.__contains__('gen') or argument == 'sync' or argument == '-s':
+    if argument.__contains__('-rm') or string_found('remove', argument) or string_found('add', argument) or \
+            string_found('edit', argument) or string_found('gen', argument) or argument == 'sync' or argument == '-s':
         print('Syncing entries with other device(s)...\n')
-        term('rsync -v -H -r -l -t -p -e ' + '"ssh -i ~/.ssh/rpass -p ' + port + '" ' + directory + ' ' +
-             usernamessh + '@' + ip + ':' + directoryssh)
-        term('rsync -v -H -r -l -t -p --delete -e ' + '"ssh -i ~/.ssh/rpass -p ' + port + '" ' + usernamessh
-             + '@' + ip + ':' + directoryssh + ' ' + directory)
+        sshync.run_profile('/var/lib/sshyp/sshyp.sshync')

extra/changelog-total

@@ -1,5 +1,120 @@
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
+sshyp 2021.11.05.fr1
+
+First public release of sshyp.
+
+This release fixes major bugs from rpass and rebrands the project.
+
+New features:
+
+- an entirely new syncing back-end called sshync (custom Python wrapper around sftp)
+    ^ in thoery, all syncing-related data loss should now be fixed, however, this new
+    system has just been created and is still under testing. Maybe wait for a few patches
+    before trusting this system.
+
+Changes:
+
+- branding has been updated to reflect new project name and goals
+- custom directories, custom ssh keys, and offline only mode are removed (may be temporary)
+    ^ the configuration wizard is being re-written in the next major update
+
+Planned for next update (The Fluffy Update):
+
+- modularized and optimized code
+    ^ some older, bad code from "rpass" will be re-written.
+- new visual features
+    ^ this includes the new file list and thematic text art. sshyp will be
+    getting a retro computing theme.
+- packages for more environments
+    ^ "sshyp" will be officially packaged for Arch Linux, Alpine Linux, and Termux (Android).
+    Debian/Ubuntu and Fedora packaging will come later.
+
+Planned for next update (The Sheep w/Shears Update):
+
+- allow for copying entire notes (not just first line)
+- allow for multi-client deletion... somehow
+- ability to pass entries as arguments for more functions
+- detatch sshync and make it a separate package
+- manpage
+
+Planned, no timeline:
+
+- create separate gui frontend targetting mobile devices (Android + Linux phones)
+    ^ the gui will also function on desktop linux
+- package for more Linux distributions, such as Debian and Fedora)
+- auto-completion on tab (currently unsure of best way to make this work)
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+rpass 2021.11.01.mr5.1
+
+The Notetaker Update - Patch 1
+
+This is the FINAL release of "rpass".
+After this release, the project will be rebranded as "sshyp".
+
+rpass's syncing system is fundamentally broken, hence the need for "sshyp"
+and its new syncing system. I would highly advise against using this release.
+
+New features:
+
+- none
+
+Changes:
+
+- fixed an issue with copying notes (currently only copies first line, will be changed in the future)
+- rpass is validated to work with Python 3.10 (no changes were needed)
+
+Planned for next update (sshyp fr1)
+
+- full project rebrand ("sshyp")
+- new syncing back-end
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+rpass 2021.10.07.mr5
+
+The Notetaker Update - Fifth main release of rpass
+
+This release overhauls the note-taking system and provides general improvements
+to overall code quality, including optimizations, bug fixes, and security improvements.
+
+New features:
+
+- notes are now edited in nano and can be split across multiple lines
+- password confirmation has been added for entry deletion
+
+Changes:
+
+- fixed issues with copying passwords with certain special characters, e.g. '"()|
+- auto-generated ssh key now uses ed25519, rather than rsa-3072
+- entry format modified to include a blank line before the notes field (old format still mostly compatible)
+- rpass is now much better at catching bad arguments
+- some general code cleanup
+
+Planned for next update (The Housekeeping Update Pt. 2):
+
+- add new file list w/color and w/o extensions + proper displaying of nested folders
+- ability to pass entries as arguments for more functions
+- manpage
+- add more comments to code
+- validate for Python 3.10
+
+Planned for next update (The cryptpass Update):
+
+- initial implementation of a data store for other applications (libsecret alt.)
+- modularize code in preparation for GUI frontends 
+
+Planned, no timeline:
+
+- create separate gui frontend targetting mobile devices (first Linux phones, maybe Android at a later date - official iOS client not likely)
+    ^ the gui will also function on desktop linux
+- make platform agnostic (add Windows support and package for more Linux distributions, such as Alpine and Debian)
+- auto-completion on tab (currently unsure of best way to make this work)
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
 rpass 2021.09.15.mr4.2
 
 The Housekeeping Update (Pt. 1) - Hotfix 2

share/doc/sshyp/changelog

@@ -0,0 +1,49 @@
+sshyp 2021.11.05.fr1
+
+First public release of sshyp.
+
+This release fixes major bugs from rpass and rebrands the project.
+
+New features:
+
+- an entirely new syncing back-end called sshync (custom Python wrapper around sftp)
+    ^ in thoery, all syncing-related data loss should now be fixed, however, this new
+    system has just been created and is still under testing. Maybe wait for a few patches
+    before trusting this system.
+
+Changes:
+
+- branding has been updated to reflect new project name and goals
+- custom directories, custom ssh keys, and offline only mode are removed (may be temporary)
+    ^ the configuration wizard is being re-written in the next major update
+
+Planned for next update (The Fluffy Update):
+
+- modularized and optimized code
+    ^ some older, bad code from "rpass" will be re-written.
+- new visual features
+    ^ this includes the new file list and thematic text art. sshyp will be
+    getting a retro computing theme.
+- packages for more environments
+    ^ "sshyp" will be officially packaged for Arch Linux, Alpine Linux, and Termux (Android).
+    Debian/Ubuntu and Fedora packaging will come later.
+
+Planned for next update (The Sheep w/Shears Update):
+
+- allow for copying entire notes (not just first line)
+- allow for multi-client deletion... somehow
+- ability to pass entries as arguments for more functions
+- detatch sshync and make it a separate package
+- manpage
+
+Planned, no timeline:
+
+- create separate gui frontend targetting mobile devices (Android + Linux phones)
+    ^ the gui will also function on desktop linux
+- package for more Linux distributions, such as Debian and Fedora)
+- auto-completion on tab (currently unsure of best way to make this work)
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+The full history of changes to "sshyp" and "rpass" can be found on the following page:
+https://raw.githubusercontent.com/rwinkhart/sshyp/main/extra/changelog-total

share/licenses/sshyp/license

@@ -1,4 +1,4 @@
-    rpass is a FOSS password manager that takes advantage of rsync
+    sshyp is a FOSS password manager that takes advantage of rsync
     Copyright (C) 2021  Randall Winkhart  idgr@tutanota.com
 
     This program is free software: you can redistribute it and/or modify