Updated PKGBUILD

PKGBUILD

@@ -1,18 +1,16 @@
 # Maintainer: Randall Winkhart <idgr at tutanota dot com>
 
 pkgname=sshyp
-pkgver=2021.12.01.fr2
+pkgver=2022.01.10.fr2.3
 pkgrel=1
-pkgdesc='A self-hosted, synchronized password manager'
+pkgdesc='A light-weight, self-hosted, synchronized password manager'
 url='https://github.com/rwinkhart/sshyp'
-arch=('x86_64' 'aarch64')
+arch=('any')
 license=('GPL3')
 depends=( python gnupg openssh nano xclip wl-clipboard)
 
-source_x86_64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.12.01.fr2/sshyp-2021.12.01.fr2.tar.xz')
-source_aarch64=('https://github.com/rwinkhart/sshyp/releases/download/v2021.12.01.fr2/sshyp-2021.12.01.fr2.tar.xz')
-sha512sums_x86_64=('88b1db43a0234e00cc9b2b5aa6aff642a350109e101a1ebc95e06e7ebc294b09c8369eead06fd16bbffd1f6ce564fb1e8736685ee716f7806532710d7357a5cb')
-sha512sums_aarch64=('88b1db43a0234e00cc9b2b5aa6aff642a350109e101a1ebc95e06e7ebc294b09c8369eead06fd16bbffd1f6ce564fb1e8736685ee716f7806532710d7357a5cb')
+source=("https://github.com/rwinkhart/sshyp/releases/download/v$pkgver/sshyp-$pkgver.tar.xz")
+sha512sums=('be6695cc231f4414322f2c4b919caf0759f4111e50259b3a6bbcb6e90a0ceba5d094c8766c287e5443c61adfdf414c1a93bc70e505dfd4bf34097c713b6e7d2f')
 
 package() {
 

README.md

@@ -30,11 +30,9 @@ What sshyp definitely won't do:
 - Windows support (I don't use Windows and I have no interest in developing for it)
 
 # Installation
-Arch Linux (x86_64, aarch64)
+Arch Linux (all ISAs)
 
-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'.
+sshyp releases are available in the Arch User Repository as 'sshyp'.
 
 Install with your preferred AUR helper or use:
 
@@ -62,11 +60,16 @@ All available options can be found with:
 sshyp --help
 ```
 
+Or alternatively, in the new manpage:
+
+```
+man sshyp
+```
+
 # Roadmap
 Short-term Goals:
 
 - create new file list w/color and w/o file extensions
-- create a man page
 - overhaul argument system
 - fix lots of bugs!
 - make lots of optimizations!
@@ -81,10 +84,7 @@ Long-term Goals:
 - seize the thrones, shear the humans
 
 # Known Issues
-Broken Features in Latest Release:
 
-- the 'gen' function uses the older notetaking system
+Currently, files deleted from a client or server may re-appear if another client that had the same file reconnects and later re-uploads it to the server. This will be addressed.
 
-Broken Features in Source:
-
-- the 'gen' function uses the older notetaking system
+Currently, if a client is missing folders that exist on the server, the contents of the missing folders will fail to download. A temporary workaround is to manually create the folders on the client. This will be addressed.

bin/sshync.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# sshync 2021.12.01.unreleased6
+# sshync 2022.01.10.unreleased8
 
 # external modules
 
@@ -17,7 +17,10 @@ def get_titles_mods(_directory, _destination, _user_data):
     if _destination == 'l':
         if type(_user_data) == str:
             _user_data = str(_user_data).strip('(').strip(')').replace(' ', '').split(',')
-        remove(_user_data[6] + 'sshync_database')
+        try:
+            remove(_user_data[6] + 'sshync_database')
+        except FileNotFoundError:
+            pass
         for _root, _directories, _files in walk(_directory):
             for _filename in _files:
                 _title_list.append(join(_root.replace(_directory, '', 1), _filename))
@@ -89,18 +92,18 @@ def run_profile(_profile_dir):
             # compare mod times and sync
             if int(_index_l[1][_i]) > int(_index_r[1][_i]):
                 print(f"[{_title}] Local is newer, uploading...")
-                system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
-                       f"{_user_data[4]}{_title} <<< $'put {_user_data[3]}{_title}'")
+                system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
+                       f"{_user_data[4]}{'/'.join(_title.split('/')[:-1]) + '/'} <<< $'put {_user_data[3]}{_title}'")
             elif int(_index_l[1][_i]) < int(_index_r[1][_i]):
                 print(f"[{_title}] Remote is newer, downloading...")
-                system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
-                       f"{_user_data[4]}{_title} {_user_data[3]}{_title}")
+                system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
+                       f"'{_user_data[4]}'{_title} {_user_data[3]}{'/'.join(_title.split('/')[:-1]) + '/'}")
         else:
             print(f"[{_title}] Not on remote server, uploading...")
-            system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
-                   f"{_title} <<< $'put {_user_data[3]}{_title}'")
+            system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
+                   f"{'/'.join(_title.split('/')[:-1]) + '/'} <<< $'put {_user_data[3]}{_title}'")
     for _title in _index_r[0]:
         if _title not in _index_l[0]:
             print(f"[{_title}] Not in local directory, downloading...")
-            system(f"sftp -p -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:{_user_data[4]}"
-                   f"{_title} {_user_data[3]}{_title}")
+            system(f"sftp -p -q -i '{_user_data[5]}' -P {_user_data[2]} {_user_data[0]}@{_user_data[1]}:"
+                   f"'{_user_data[4]}{_title}' {_user_data[3]}{'/'.join(_title.split('/')[:-1]) + '/'}")

bin/sshyp

@@ -2,9 +2,10 @@
 
 # external modules
 
-from os import environ, remove, system
+from os import environ, mkdir, remove, system
 from shutil import copy, move, rmtree
 from sys import argv, exit as s_exit
+from pathlib import Path
 import random
 import sshync
 import string
@@ -12,16 +13,6 @@ import string
 
 # utility functions
 
-def argument_filter():  # filters arguments to usable text
-    _argument_list = argv
-    _i, _argument = 0, ''
-    for _ in _argument_list:
-        while _i < len(_argument_list) - 1:
-            _i += 1
-            _argument += _argument_list[_i] + ' '
-    return _argument[:-1]
-
-
 def replace_line(file_name, line_num, text):  # replaces text in a given line with different text
     _lines = open(file_name, 'r').readlines()
     _lines[line_num] = text
@@ -33,7 +24,7 @@ def shm_gen():  # generates random folder in /dev/shm for security and returns r
                               for _ in range(random.randint(10, 30)))
     _shm_entry_gen = ''.join(random.SystemRandom().choice(string.ascii_letters + string.digits)
                              for _ in range(random.randint(10, 30)))
-    system(f"mkdir -p /dev/shm/{_shm_folder_gen}")  # TODO generate with Python
+    mkdir(f"/dev/shm/{_shm_folder_gen}", 0o700)
     return _shm_folder_gen, _shm_entry_gen
 
 
@@ -57,14 +48,18 @@ def edit_note(_shm_folder, _shm_entry):
 
 def tweak():  # runs configuration wizard
     # storage directory creation
-    system(f"mkdir -p /home/{environ.get('USER')}/.password-pasture")
+    try:
+        mkdir(f"/home/{environ.get('USER')}/.password-pasture", 0o700)
+    except FileExistsError:
+        pass
 
     # device type configuration
     _device_type = input('\nIs this installation for a client or for a server? (C/s) ')
-    if _device_type == 'S' or _device_type == 's':
+    if _device_type.lower() == 's':
         open("/var/lib/sshyp/sshyp-device", 'w').write(_device_type)
         copy('/usr/bin/sshync.py', f"/home/{environ.get('USER')}/")
-        print('\nMake sure the ssh service is running and properly configured.\n\nConfiguration complete!')
+        print('\nMake sure the ssh service is running and properly configured.\n\nConfiguration complete!\n')
+        s_exit()
     else:
         # device type configuration
         _device_type = 'c'  # ensure device type flag is properly set
@@ -73,7 +68,7 @@ def tweak():  # runs configuration wizard
         # gpg configuration
         _gpg_id = input('\nsshyp requires the use of a unique gpg key. Do you already have one that you are '
                         'willing to use? (y/N)')
-        if _gpg_id != 'y' and _gpg_id != 'Y':
+        if _gpg_id.lower() != 'y':
             print('\nA unique gpg key has been generated for you.')
             system('gpg --full-generate-key')
         _gpg_id = str(input('\nPlease input the ID of your gpg key: '))
@@ -89,9 +84,9 @@ def tweak():  # runs configuration wizard
 
         # ssh key configuration
         _ssh_gen = (input('\nMake sure the ssh service on the remote server is running and properly configured.'
-                          '\n\nrsync support requires a unique ssh key. Would you like to have this automatically '
+                          '\n\nSync support requires a unique ssh key. Would you like to have this automatically '
                           'generated? (Y/n) '))
-        if _ssh_gen != 'n' and _ssh_gen != 'N':
+        if _ssh_gen.lower() != 'n':
             system('ssh-keygen -t ed25519 -f ~/.ssh/sshyp')
         else:
             print(f"\nEnsure that the key file you are using is located at /home/{environ.get('USER')}/.ssh/sshyp")
@@ -112,52 +107,82 @@ def tweak():  # runs configuration wizard
         print('\nConfiguration complete!\n')
 
 
-def helper():  # displays help menu
-    print('\nsshyp  Copyright (C) 2021  Randall Winkhart')
-    print("This is free software, and you are welcome to redistribute it under certain conditions;\nthis program comes "
-          "with ABSOLUTELY NO WARRANTY;\ntype `sshyp license' for details.")
-    print('\nUSAGE: sshyp [/<entry name>] [OPTION] [FLAG]\n')
-    print('Options: ')
-    print('help/--help/-h           bring up this menu')
-    print('version/-v               display sshyp version info')
-    print('tweak                    configure sshyp')
-    print('add                      add an entry')
-    print('gen                      generate a new password')
-    print('edit                     edit an existing entry')
-    print('copy                     copy details of an entry to your clipboard')
-    print('shear/-rm                delete an existing entry')
-    print('sync/-s                  manually sync the entry directory via sshync\n')
-    print('Flags:')
-    print('add:')
-    print(' password/-p             add a password entry')
-    print(' note/-n                 add a note entry')
-    print(' folder/-f               add a new folder for entries')
-    print('edit:')
-    print(' rename/relocate/-r      rename or relocate an entry')
-    print(' username/-u             change the username of an entry')
-    print(' password/-p             change the password of an entry')
-    print(' note/-n                 change the note attached to an entry')
-    print(' url/-l                  change the url attached to an entry')
-    print('copy:')
-    print(' username/-u             copy the username of an entry to your clipboard')
-    print(' password/-p             copy the password of an entry to your clipboard')
-    print(' url/-l                  copy the URL of an entry to your clipboard')
-    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 'sshyp /<entry name>'!")
-    print("When specifying entry names, do not include the file extension! '.gpg' is assumed!\n")
-
-
-def version():  # displays version information
-    print('\n////////////////////////////////////////////////////////')
-    print('/                                                      /')
-    print('/     sshyp  Copyright (C) 2021  Randall Winkhart      /')
-    print('/                                                      /')
-    print('/               Version 2021.12.01.fr2                 /')
-    print('/                 The Lighter Update                   /')
-    print('/                                                      /')
-    print('////////////////////////////////////////////////////////\n')
+def print_info():  # prints help text based on argument
+    if argument == 'help' or argument == '--help' or argument == '-h':
+        print('\nsshyp  Copyright (C) 2021  Randall Winkhart')
+        print("This is free software, and you are welcome to redistribute it under certain conditions;\nthis program "
+              "comes with ABSOLUTELY NO WARRANTY;\ntype `sshyp license' for details.")
+        print('\nUSAGE: sshyp [/<entry name>] [OPTION] [FLAG]\n')
+        print('Options: ')
+        print('help/--help/-h           bring up this menu')
+        print('version/-v               display sshyp version info')
+        print('tweak                    configure sshyp')
+        print('add                      add an entry')
+        print('gen                      generate a new password')
+        print('edit                     edit an existing entry')
+        print('copy                     copy details of an entry to your clipboard')
+        print('shear/-rm                delete an existing entry')
+        print('sync/-s                  manually sync the entry directory via sshync\n')
+        print('Flags:')
+        print('add:')
+        print(' password/-p             add a password entry')
+        print(' note/-n                 add a note entry')
+        print(' folder/-f               add a new folder for entries')
+        print('edit:')
+        print(' rename/relocate/-r      rename or relocate an entry')
+        print(' username/-u             change the username of an entry')
+        print(' password/-p             change the password of an entry')
+        print(' note/-n                 change the note attached to an entry')
+        print(' url/-l                  change the url attached to an entry')
+        print('copy:')
+        print(' username/-u             copy the username of an entry to your clipboard')
+        print(' password/-p             copy the password of an entry to your clipboard')
+        print(' url/-l                  copy the URL of an entry to your clipboard')
+        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 'sshyp /<entry name>'!")
+        print("When specifying entry names, do not include the file extension! '.gpg' is assumed!\n")
+    elif argument == 'version' or argument == '-v':
+        print('\n////////////////////////////////////////////////////////')
+        print('/                                                      /')
+        print('/     sshyp  Copyright (C) 2021  Randall Winkhart      /')
+        print('/                                                      /')
+        print('/              Version 2022.01.10.fr2.3                /')
+        print('/                 The Lighter Update                   /')
+        print('/                                                      /')
+        print('////////////////////////////////////////////////////////\n')
+    elif argument == 'license':
+        print('\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU '
+              'General\nPublic License as published by the Free Software Foundation, either version 3 of the License,'
+              '\nor (at your option) any later version.\n\nThis program is distributed in the hope that it will be '
+              'useful, but WITHOUT ANY WARRANTY;\nwithout even the implied warranty of MERCHANTABILITY or FITNESS FOR A'
+              ' PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.'
+              '\n\nhttps://opensource.org/licenses/GPL-3.0\n')
+    elif argument == 'add':
+        print('\nUSAGE: sshyp add [FLAG]')
+        print('Flags:')
+        print('add:')
+        print(' password/-p             add a password entry')
+        print(' note/-n                 add a note entry')
+        print(' folder/-f               add a new folder for entries\n')
+    elif argument == 'edit':
+        print('\nUSAGE: sshyp edit [FLAG]')
+        print('Flags:')
+        print('edit:')
+        print(' rename/relocate/-r      rename or relocate an entry')
+        print(' username/-u             change the username of an entry')
+        print(' password/-p             change the password of an entry')
+        print(' url/-l                  change the url attached to an entry')
+        print(' note/-n                 change the note attached to an entry\n')
+    elif argument == 'copy':
+        print('\nUSAGE: sshyp copy [FLAG]')
+        print('Flags:')
+        print('copy:')
+        print(' username/-u             copy the username of an entry to your clipboard')
+        print(' password/-p             copy the password of an entry to your clipboard')
+        print(' url/-l                  copy the URL of an entry to your clipboard')
+        print(' note/-n                 copy the note of an entry to your clipboard\n')
 
 
 def no_arg():  # displays a list of entries and gives an option to select one for viewing
@@ -168,15 +193,6 @@ def no_arg():  # displays a list of entries and gives an option to select one fo
     print()
 
 
-def show_license():  # displays licensing information
-    print('\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General'
-          '\nPublic License as published by the Free Software Foundation, either version 3 of the License,\nor '
-          '(at your option) any later version.\n'
-          '\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;\nwithout even '
-          'the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public '
-          'License for more details.\n\nhttps://opensource.org/licenses/GPL-3.0\n')
-
-
 def read_shortcut():  # shortcut to quickly read an entry
     system(f"gpg -d '{directory}{argument.replace('/', '', 1)}.gpg'")
 
@@ -189,30 +205,23 @@ def sync():  # calls sshync to sync changes to the user's server
     sshync.run_profile('/var/lib/sshyp/sshyp.sshync')
 
 
-def add_info():  # displays 'add' syntax
-    print('\nUSAGE: sshyp add [FLAG]')
-    print('Flags:')
-    print('add:')
-    print(' password/-p             add a password entry')
-    print(' note/-n                 add a note entry')
-    print(' folder/-f               add a new folder for entries\n')
-
-
 def add_entry():  # adds a new entry
+    _shm_folder, _shm_entry = None, None  # sets base-line values to avoid errors
     _entry_name = str(input('\nName of entry: '))
     if _entry_name.startswith('/'):
         _entry_name = _entry_name.replace('/', '', 1)
-    _shm_folder, _shm_entry = shm_gen()
     if argument == 'add note' or argument == 'add -n':
+        _shm_folder, _shm_entry = shm_gen()
         system(f"nano /dev/shm/{_shm_folder}/{_shm_entry}-n")
         _notes = open(f"/dev/shm/{_shm_folder}/{_shm_entry}-n", 'r').read()
         open(f"/dev/shm/{_shm_folder}/{_shm_entry}", 'w').writelines('\n\n\n\n' + _notes + '\n\n')
-    if argument == 'add password' or argument == 'add -p':
+    elif argument == 'add password' or argument == 'add -p':
         _username = str(input('Username: '))
         _password = str(input('Password: '))
         _url = str(input('URL: '))
         _add_note = input('Add a note to this entry? (y/N) ')
-        if _add_note == 'y' or _add_note == 'Y':
+        _shm_folder, _shm_entry = shm_gen()
+        if _add_note.lower() == 'y':
             system(f"nano /dev/shm/{_shm_folder}/{_shm_entry}-n")
             _notes = open(f"/dev/shm/{_shm_folder}/{_shm_entry}-n", 'r').read()
         else:
@@ -225,21 +234,10 @@ def add_entry():  # adds a new entry
 
 def add_folder():  # creates a new folder
     _folder_name = str(input('Name of new folder: '))
-    system(f"mkdir '{directory}{_folder_name}'")  # TODO create using Python
+    mkdir(directory + _folder_name, 0o700)
     system(f"ssh -p {port} {username_ssh}@{ip} \"mkdir -p '{directory_ssh}{_folder_name}'\"")
 
 
-def edit_info():  # displays 'edit' syntax
-    print('\nUSAGE: sshyp edit [FLAG]')
-    print('Flags:')
-    print('edit:')
-    print(' rename/relocate/-r      rename or relocate an entry')
-    print(' username/-u             change the username of an entry')
-    print(' password/-p             change the password of an entry')
-    print(' url/-l                  change the url attached to an entry')
-    print(' note/-n                 change the note attached to an entry\n')
-
-
 def rename():  # renames an entry or folder TODO delete original from server to prevent re-downloading
     print()
     system(f"cd {directory}; ls -1 *")  # TODO replace with new list
@@ -256,23 +254,33 @@ def rename():  # renames an entry or folder TODO delete original from server to
 
 
 def edit():  # edits the contents of an entry
+    _shm_folder, _shm_entry = None, None  # sets base-line values to avoid errors
     print()
     system(f"cd {directory}; ls -1 *")  # TODO replace with new list
     _entry_name = str(input('\nWhat file would you like to edit? '))
+    if not Path(f"{directory}{_entry_name}.gpg").is_file():
+        print("\nYou are trying to edit a file that does not exist!\n")
+        s_exit()
     if _entry_name.startswith('/'):
         _entry_name = _entry_name.replace('/', '', 1)
-    _shm_folder, _shm_entry = shm_gen()
-    system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
     if argument == 'edit username' or argument == 'edit -u':
         _detail = str(input('New Username: '))
+        _shm_folder, _shm_entry = shm_gen()
+        system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
         replace_line(f"/dev/shm/{_shm_folder}/{_shm_entry}", 0, _detail + '\n')
-    if argument == 'edit password' or argument == 'edit -p':
+    elif argument == 'edit password' or argument == 'edit -p':
         _detail = str(input('New Password: '))
+        _shm_folder, _shm_entry = shm_gen()
+        system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
         replace_line(f"/dev/shm/{_shm_folder}/{_shm_entry}", 1, _detail + '\n')
-    if argument == 'edit url' or argument == 'edit -l':
+    elif argument == 'edit url' or argument == 'edit -l':
         _detail = str(input('New URL: '))
+        _shm_folder, _shm_entry = shm_gen()
+        system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
         replace_line(f"/dev/shm/{_shm_folder}/{_shm_entry}", 2, _detail + '\n')
-    if argument == 'edit note' or argument == 'edit -n':
+    elif argument == 'edit note' or argument == 'edit -n':
+        _shm_folder, _shm_entry = shm_gen()
+        system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
         edit_note(_shm_folder, _shm_entry)
     remove(f"{directory}{_entry_name}.gpg")
     encrypt(_shm_folder, _shm_entry, _entry_name)
@@ -281,32 +289,40 @@ def edit():  # edits the contents of an entry
 
 def gen():  # generates a password for a new or an existing entry
     _username, _url, _notes = None, None, None  # sets base-line values to avoid errors
-    _shm_folder, _shm_entry = shm_gen()
     if argument == 'gen update' or argument == 'gen -u':
         print()
         system(f"cd {directory}; ls -1 *")  # TODO replace with new list
     _entry_name = str(input('\nName of service: '))
     if _entry_name.startswith('/'):
         _entry_name = _entry_name.replace('/', '', 1)
+    if argument == 'gen update' or argument == 'gen -u':
+        if not Path(f"{directory}{_entry_name}.gpg").is_file():
+            print("\nYou are trying to edit a file that does not exist!\n")
+            s_exit()
     if argument != 'gen update' and argument != 'gen -u':
         _username = str(input('Username: '))
     _pass_length = int(input('How many characters should be in the password? '))
     _pass_type = str(input('Should the password be simple (for compatibility) or complex (for security)? (s/C) '))
-    if _pass_type != 's':
-        _pass_type = string.ascii_letters + string.digits + string.punctuation
-    if _pass_type == 's':
+    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 argument != 'gen update' and argument != 'gen -u':
         _url = str(input('URL: '))
-        _notes = str(input('Additional notes: '))  # TODO update w/new notes system
-    if argument != 'gen update' and argument != 'gen -u':
-        open(f"/dev/shm/{_shm_folder}/{_shm_entry}", 'w').writelines(_username + '\n' + _pass_gen + '\n' + _url +
-                                                                     '\n\n' + _notes + '\n\n')
-    if argument != 'gen update' and argument != 'gen -u':
+        _add_note = input('Add a note to this entry? (y/N) ')
+        _shm_folder, _shm_entry = shm_gen()
+        if _add_note.lower() == 'y':
+            system(f"nano /dev/shm/{_shm_folder}/{_shm_entry}-n")
+            _notes = open(f"/dev/shm/{_shm_folder}/{_shm_entry}-n", 'r').read()
+        else:
+            _notes = ''
+        open(f"/dev/shm/{_shm_folder}/{_shm_entry}", 'w').writelines(_username + '\n' + _pass_gen + '\n' + _url + '\n\n'
+                                                                     + _notes + '\n\n')
         encrypt(_shm_folder, _shm_entry, _entry_name)
         system(f"gpg -d '{directory}{_entry_name}.gpg'")
     else:
+        _shm_folder, _shm_entry = shm_gen()
         system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_entry_name}.gpg'")
         replace_line(f"/dev/shm/{_shm_folder}/{_shm_entry}", 1, _pass_gen + '\n')
         remove(f"{directory}{_entry_name}.gpg")
@@ -314,20 +330,13 @@ def gen():  # generates a password for a new or an existing entry
         system(f"gpg -d '{directory}{_entry_name}.gpg'")
 
 
-def copy_info():  # displays 'copy' syntax
-    print('\nUSAGE: sshyp copy [FLAG]')
-    print('Flags:')
-    print('copy:')
-    print(' username/-u             copy the username of an entry to your clipboard')
-    print(' password/-p             copy the password of an entry to your clipboard')
-    print(' url/-l                  copy the URL of an entry to your clipboard')
-    print(' note/-n                 copy the note of an entry to your clipboard\n')
-
-
 def copy_data():  # copies a specified field of an entry to the clipboard
     print()
     system(f"cd {directory}; ls -1 *")  # TODO replace with new list
     _read_entry = str(input('\nEntry to copy: '))
+    if not Path(f"{directory}{_read_entry}.gpg").is_file():
+        print("\nThe file does not exist!\n")
+        s_exit()
     _shm_folder, _shm_entry = shm_gen()
     system(f"gpg -d --output /dev/shm/{_shm_folder}/{_shm_entry} '{directory}{_read_entry}.gpg'")
     _copy_line = open(f"/dev/shm/{_shm_folder}/{_shm_entry}", 'r').readlines()
@@ -372,27 +381,41 @@ def remove_data():  # deletes an entry or folder from both the client and the se
 
 # program start sequence
 
-# import saved userdata
-device_type = ''
-try:
-    device_type = open('/var/lib/sshyp/sshyp-device').read().strip()
-    if device_type == 'c':
-        gpg_id = open('/var/lib/sshyp/sshyp-gpg').read().strip()
-        ssh_info = sshync.get_profile('/var/lib/sshyp/sshyp.sshync')
-        username_ssh = ssh_info[0].replace('\n', '')
-        ip = ssh_info[1].replace('\n', '')
-        port = ssh_info[2].replace('\n', '')
-        directory = str(ssh_info[3].replace('\n', ''))
-        directory_ssh = '/home/' + username_ssh + '/.password-pasture/'
-except FileNotFoundError:
-    if device_type != 's' and device_type != 'S':
-        print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-        print("Not all necessary configuration files are present. Please run 'sshyp tweak'!")
-        print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n')
-    s_exit()
-
 # retrieve typed argument
-argument = argument_filter()
+argument_list = argv
+i, argument = 0, ''
+for _ in argument_list:
+    while i < len(argument_list) - 1:
+        i += 1
+        argument += argument_list[i] + ' '
+argument = argument[:-1]
+
+# import saved userdata
+if argument != 'tweak':
+    device_type = ''
+    try:
+        device_type = open('/var/lib/sshyp/sshyp-device').read().strip()
+        if device_type == 'c':
+            gpg_id = open('/var/lib/sshyp/sshyp-gpg').read().strip()
+            ssh_info = sshync.get_profile('/var/lib/sshyp/sshyp.sshync')
+            username_ssh = ssh_info[0].replace('\n', '')
+            ip = ssh_info[1].replace('\n', '')
+            port = ssh_info[2].replace('\n', '')
+            directory = str(ssh_info[3].replace('\n', ''))
+            directory_ssh = '/home/' + username_ssh + '/.password-pasture/'
+    except FileNotFoundError:
+        if device_type.lower() != 's':
+            print('\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
+            print("Not all necessary configuration files are present. Please run 'sshyp tweak'!")
+            print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n')
+        s_exit()
+else:
+    try:
+        tweak()
+        s_exit()
+    except KeyboardInterrupt:
+        print('\n')
+        s_exit()
 
 # run function based on argument
 error = 0  # create an error flag to determine if syncing should occur at end
@@ -404,20 +427,9 @@ elif argument == '':
     except KeyboardInterrupt:
         print('\n')
         s_exit()
-elif argument == 'tweak':
-    try:
-        tweak()
-    except KeyboardInterrupt:
-        print('\n')
-        s_exit()
-elif argument == 'help' or argument == '--help' or argument == '-h':
-    helper()
-elif argument == 'license':
-    show_license()
-elif argument == 'version' or argument == '-v':
-    version()
-elif argument == 'add':
-    add_info()
+elif argument == 'help' or argument == '--help' or argument == '-h' or argument == 'license' or argument == 'version' \
+        or argument == '-v' or argument == 'add' or argument == 'edit' or argument == 'copy':
+    print_info()
 elif argument == 'add note' or argument == 'add -n' or argument == 'add password' or argument == 'add -p':
     try:
         add_entry()
@@ -430,8 +442,6 @@ elif argument == 'add folder' or argument == 'add -f':
     except KeyboardInterrupt:
         print('\n')
         s_exit()
-elif argument == 'edit':
-    edit_info()
 elif argument == 'edit rename' or argument == 'edit relocate' or argument == 'edit -r':
     try:
         rename()
@@ -451,8 +461,6 @@ elif argument == 'gen' or argument == 'gen update' or argument == 'gen -u':
     except KeyboardInterrupt:
         print('\n')
         s_exit()
-elif argument == 'copy':
-    copy_info()
 elif argument == 'copy username' or argument == 'copy -u' or argument == 'copy password' or argument == 'copy -p' or \
         argument == 'copy url' or argument == 'copy -l' or argument == 'copy note' or argument == 'copy -n':
     try:
@@ -478,5 +486,6 @@ if argument != '' and argument != 'help' and argument != '--help' and argument !
         argument != 'add' and argument != 'sync' and argument != 'edit' and argument != 'copy username' and argument \
         != 'copy -u' and argument != 'copy password' and argument != 'copy -p' and argument != 'copy url' and argument \
         != 'copy -l' and argument != 'copy note' and argument != 'copy -n' and argument != 'copy' and argument != \
-        'tweak' and argument != 'shear' and argument != '-rm' and error == 0 and argument.startswith('/') is False:
+        'shear' and argument != '-rm' and argument != 'version' and argument != '-v' and error == 0 and \
+        argument.startswith('/') is False:
     sync()

extra/changelog-total

@@ -1,5 +1,156 @@
 <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
+sshyp 2022.01.10.fr2.3
+
+The Lighter Update - Patch 3
+
+This release is a hotfix for 2021.12.01.fr2.2. It features critical security fixes and quality-of-life improvements.
+
+New features:
+
+- a man page has been added
+
+Changes:
+
+- folders in /dev/shm are no longer created before input from the user (fixes critical security flaws)
+- fixed syncing of files (specifically downloading) with special characters, such as '('
+- fixed program still continuing after trying to edit an entry that doesn't exist
+- the gen command has been updated to use the newer notetaking system
+- printing functions in sshyp have been combined into one function (arguments determine section to print, fewer lines of code)
+- file not found exceptions have been re-implemented
+- .lower() is now used to remove casing when checking inputs
+- removed an old reference to "rsync" in the configuration dialog
+
+Planned for next major update (The Fluffier Update):
+
+- 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.
+- imporove password generator to guarantee more secure results
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
+
+Planned for next, next major update (The Shears Update Pt. 1):
+
+- enforce permissions on the server-side
+- allow for copying entire notes (not just first line)
+- allow for multi-client deletion... somehow (in sshync)
+- detatch sshync and make it a separate package
+
+Planned for next, next, next major update (The Shears Update Pt. 2):
+
+- ability to pass entries as arguments for more functions
+- auto-completion on tab (currently unsure of best way to make this work)
+
+Backlog:
+
+- package for more Linux distributions, such as Debian and Fedora
+- create separate gui frontend targetting mobile and desktop Linux
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+sshyp 2021.12.01.fr2.2
+
+The Lighter Update - Patch 2
+
+This release is a hotfix for 2021.12.01.fr2.1.
+
+Changes:
+
+- a major fix for "/var/lib/sshync_database" needing to already exist server-side
+- a major fix for syncing functionality  (it should actually work now)
+- silenced some sftp output
+
+An fr2.3 patch is planned for this version. It will include the following:
+
+- fixes for any new bugs that may be discovered in the new sshyp and sshync code
+- the gen command in sshyp will be updated to use the newer notetaking system
+- printing functions in sshyp will be combined into one function (arguments will determine section to print)
+- file not found exceptions will be re-implemented
+- when syncing, a check will be made to see if any folders are not on all devices and this will be corrected
+
+Planned for next major update (The Fluffier Update):
+
+- 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.
+- imporove password generator to guarantee more secure results
+
+Planned for next, next major update (The Shears Update Pt. 1):
+
+- enforce permissions on the server-side
+- allow for copying entire notes (not just first line)
+- allow for multi-client deletion... somehow
+- detatch sshync and make it a separate package
+- manpage
+
+Planned for next, next, next major update (The Shears Update Pt. 2):
+
+- ability to pass entries as arguments for more functions
+- auto-completion on tab (currently unsure of best way to make this work)
+
+Backlog:
+
+- package for more Linux distributions, such as Debian and Fedora
+- create separate gui frontend targetting mobile and desktop Linux
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+sshyp 2021.12.01.fr2.1
+
+The Lighter Update - Patch 1
+
+This release is a hotfix for 2021.12.01.fr2.
+
+Changes:
+
+- fixed a bug where "sshyp tweak" would not function on new installations
+- moved the argument parser to the global process
+- running "sshyp version" or "sshyp -v" no longer triggers syncing
+- folders are now created natively with Python, rather than through system commands
+
+An fr2.2 patch is planned for this version. It will include the following:
+
+- fixes for any new bugs that may be discovered in the new sshyp and sshync code
+- the gen command in sshyp will be updated to use the newer notetaking system
+- printing functions in sshyp will be combined into one function (arguments will determine section to print)
+- file not found exceptions will be re-implemented
+
+Planned for next major update (The Fluffier Update):
+
+- 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.
+- imporove password generator to guarantee more secure results
+
+Planned for next, next major update (The Shears Update Pt. 1):
+
+- enforce permissions on the server-side
+- allow for copying entire notes (not just first line)
+- allow for multi-client deletion... somehow
+- detatch sshync and make it a separate package
+- manpage
+
+Planned for next, next, next major update (The Shears Update Pt. 2):
+
+- ability to pass entries as arguments for more functions
+- auto-completion on tab (currently unsure of best way to make this work)
+
+Backlog:
+
+- package for more Linux distributions, such as Debian and Fedora
+- create separate gui frontend targetting mobile and desktop Linux
+
+<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
 sshyp 2021.12.01.fr2
 
 The Lighter Update

extra/manpage

@@ -0,0 +1,74 @@
+.TH sshyp 1 "10 January 2022" "2021.12.01.fr2.3" "sshyp man page"
+.SH NAME
+sshyp \- A very simple self-hosted, synchronized password manager. Alternative to GNU pass. 
+.SH SYNOPSIS
+sshyp [OPTION] [[FLAG]] [/<entry name>]
+.SH DESCRIPTION
+sshyp is a lightweight password and note management program written in Python. sshyp is used via CLI and is self-hosted with a client-server model. sshyp expects that you have access to a personal server with a properly configured ssh server, ideally accepting remote connections.
+.SH EXAMPLES
+Setting up sshyp for the first time or altering its configuration (also recommended after major updates):
+    sshyp tweak
+    *follow the prompts
+
+Reading an existing entry saved as ~/.password-pasture/development/github.gpg:
+    sshyp /development/github
+
+Copying the password of an existing entry saved as ~/.password-pasture/financial/bank.gpg:
+    sshyp copy -p
+    *answer the prompt with "/financial/bank"
+    *enter decryption password
+
+Editing the username of an existing entry saved as ~/.password-pasture/game.gpg:
+    sshyp edit -u
+    *answer the first prompt with "game"
+    *follow the prompts
+
+Making a new entry using the built-in password generator:
+    sshyp gen
+    *follow the prompts
+
+Creating a note-only entry:
+    sshyp add -n
+    *follow the prompts
+
+Syncing entries with the server:
+    sshyp sync
+
+.SH OPTIONS
+In order to quickly read an existing entry, just run "sshyp </entry name>".
+
+Options for other operations are as follows:
+
+ help/--help/-h           bring up the help menu
+ version/-v               display sshyp version info
+ tweak                    configure sshyp
+ add                      add an entry
+ gen                      generate a new password
+ edit                     edit an existing entry
+ copy                     copy details of an entry to your clipboard
+ shear/-rm                delete an existing entry
+ sync/-s                  manually sync the entry directory via sshync
+.SH FLAGS
+add:
+ password/-p             add a password entry
+ note/-n                 add a note entry
+ folder/-f               add a new folder for entries
+edit:
+ rename/relocate/-r      rename or relocate an entry
+ username/-u             change the username of an entry
+ password/-p             change the password of an entry
+ note/-n                 change the note attached to an entry
+ url/-l                  change the url attached to an entry
+copy:
+ username/-u             copy the username of an entry to your clipboard
+ password/-p             copy the password of an entry to your clipboard
+ url/-l                  copy the URL of an entry to your clipboard
+ note/-n                 copy the note of an entry to your clipboard
+gen:
+ update/-u               generate a password for an existing entry
+.SH BUGS
+This is more of a current limitation than a bug, but:
+
+Currently, if multiple clients are connected to a single server and a client deletes an entry, the entry is correctly deleted from the client and the server, but since the entry still exists on the other client, the next time it syncs the file will be re-uploaded. This will be fixed in an upcoming release of the syncing backend, sshync.
+.SH AUTHOR
+Randall Winkhart (https://github.com/rwinkhart)

share/doc/sshyp/changelog

@@ -1,32 +1,23 @@
-sshyp 2021.12.01.fr2
+sshyp 2022.01.10.fr2.3
 
-The Lighter Update
+The Lighter Update - Patch 3
 
-This release features a major re-write of old "rpass" code.
-sshyp is now more reliable and better documented.
+This release is a hotfix for 2021.12.01.fr2.2. It features critical security fixes and quality-of-life improvements.
 
 New features:
 
-- a full re-write of the old "rpass" code used in the last release
-    ^ includes more reliable argument parsing and various optimizations
-- a full re-write of "sshync", many issues fixed
-    ^fixed many instances where sshync would refuse to upload/download
-    ^fixed errors that were being thrown despite sshync working as intended
-- new folders are now also created on the server
+- a man page has been added
 
 Changes:
 
-- nested folders actually work now
-- multi-word entry and folder titles are fixed
-
-An fr2.1 patch is planned for this version. It will include the following:
-
-- fixes for any new bugs that may be discovered in the new sshyp and sshync code
-- the gen command in sshyp will be updated to use the newer notetaking system
-- printing functions in sshyp will be combined into one function (arguments will determine section to print)
-- file not found exceptions will be re-implemented
-- the argument parser will be moved to the global process (no need for it to be in a function)
-- folders will be created natively in python
+- folders in /dev/shm are no longer created before input from the user (fixes critical security flaws)
+- fixed syncing of files (specifically downloading) with special characters, such as '('
+- fixed program still continuing after trying to edit an entry that doesn't exist
+- the gen command has been updated to use the newer notetaking system
+- printing functions in sshyp have been combined into one function (arguments determine section to print, fewer lines of code)
+- file not found exceptions have been re-implemented
+- .lower() is now used to remove casing when checking inputs
+- removed an old reference to "rsync" in the configuration dialog
 
 Planned for next major update (The Fluffier Update):
 
@@ -37,13 +28,14 @@ Planned for next major update (The Fluffier Update):
     ^ "sshyp" will be officially packaged for Arch Linux, Alpine Linux, and Termux (Android).
     Debian/Ubuntu and Fedora packaging will come later.
 - imporove password generator to guarantee more secure results
+- when syncing, a check is made to see if any folders are not on all devices - if the check comes back true, it is corrected (in sshyp)
 
 Planned for next, next major update (The Shears Update Pt. 1):
 
+- enforce permissions on the server-side
 - allow for copying entire notes (not just first line)
-- allow for multi-client deletion... somehow
+- allow for multi-client deletion... somehow (in sshync)
 - detatch sshync and make it a separate package
-- manpage
 
 Planned for next, next, next major update (The Shears Update Pt. 2):