From eb6f3da3d790fc520b15b5000073123da8b58323 Mon Sep 17 00:00:00 2001
From: Darksider3 <github@darksider3.de>
Date: Mon, 21 Oct 2019 18:33:14 +0200
Subject: [PATCH] System: Account for userdel returning 6 on success...

just because it couldnt delete the users mail.
---
 private/editUsers.py  | 98 -------------------------------------------
 private/lib/System.py |  2 +-
 2 files changed, 1 insertion(+), 99 deletions(-)
 delete mode 100644 private/editUsers.py

diff --git a/private/editUsers.py b/private/editUsers.py
deleted file mode 100644
index 4bb1970..0000000
--- a/private/editUsers.py
+++ /dev/null
@@ -1,98 +0,0 @@
-import configparser
-import lib.uis.config_ui  # only follow -c flag
-import lib.validator
-import lib.sqlitedb
-import lib.System
-import lib.UserExceptions
-import sqlite3
-
-lib.uis.config_ui.argparser.description += " - Edit Tilde Users"
-ArgParser = lib.uis.config_ui.argparser
-ArgParser.add_argument('--user', type=str,
-                       help='Tilde users name to edit', required=True)
-
-Mutually = ArgParser.add_mutually_exclusive_group()
-Mutually.add_argument('-r', '--remove', default=False, action="store_true",
-                      help='Remove an approved/unapproved User from the system. Effectively purges him.',
-                      required=False)
-Mutually.add_argument('-a', '--approve', default=False, action="store_true",
-                      help="Approve the given user", required=False)
-Mutually.add_argument("--verify", default=True, action="store_false",
-                      help="Turns off value checks",
-                      required=False)
-
-ArgParser.add_argument('--sshpubkey', type=str, default=None,
-                       help="Stores the new given SSH-Key in given user", required=False)
-ArgParser.add_argument('--name', type=str, default=None,
-                       help="Sets the stored name of the given user")
-ArgParser.add_argument('--username', type=str, default=None,
-                       help="Rename given User")
-ArgParser.add_argument('--email', type=str, default=None,
-                       help="Set new email address for given user")
-ArgParser.add_argument('--status', type=int, default=None,
-                       help="Set status of given user")
-args = ArgParser.parse_args()
-config = configparser.ConfigParser()
-config.read(args.config)
-
-
-if __name__ == "__main__":
-    try:
-        db = config['DEFAULT']['applications_db']
-        if not args.sshpubkey and not args.name and not args.username and not args.email and not args.status \
-                and not args.approve and not args.remove:
-            print(f"Well, SOMETHING must be done with {args.user} ;-)")
-            exit(1)
-        if not lib.validator.checkUserInDB(args.user, db):
-            print(f"User {args.user} doesn't exist in the database.")
-            exit(1)
-        DB = lib.sqlitedb.SQLitedb(db)
-        Sysctl = lib.System.System()
-        if not DB:
-            print("Couldn't establish connection to database")
-            exit(1)
-        if args.sshpubkey:
-            if not lib.validator.checkSSHKey(args.sshpubkey):
-                print(f"Pubkey {args.sshpubkey} isn't valid.")
-                exit(1)
-            try:
-                DB.safequery("UPDATE `applications` SET `pubkey`=? WHERE `username`=?",
-                             tuple([args.sshpubkey, args.user]))
-            except sqlite3.Error as e:
-                print(f"Something unexpected happened! {e}")
-                exit(1)
-            fetch = DB.safequery("SELECT * FROM `applications` WHERE `username` = ? ", tuple([args.user]))
-            if int(fetch[0]["status"]) == 1:
-                try:
-                    Sysctl.make_ssh_usable(args.user, args.sshpubkey)
-                except lib.UserExceptions.ModifyFilesystem as e:
-                    print(f"One action failed during writing the ssh key back to the authorization file. {e}")
-            print(f"{args.user} updated successfully.")
-
-        if args.name:
-            if not lib.validator.checkName(args.name):
-                print(f"{args.name} is not a valid Name.")
-                exit(1)
-            try:
-                DB.safequery("UPDATE `applications` SET `name` =? WHERE `username` =?", tuple([args.name, args.user]))
-            except sqlite3.Error as e:
-                print(f"Couldn't write {args.name} to database: {e}")
-        if args.email:
-            if not lib.validator.checkEmail(args.email):
-                print(f"{args.email} is not a valid Mail address!")
-                exit(1)
-            try:
-                DB.safequery("UPDATE `applications` SET `email` =? WHERE `username` =?", tuple([args.email]))
-            except sqlite3.Error as e:
-                print(f"Couldn't write {args.email} to the database. {e}")
-        if args.status:
-            if args.status != 0 and args.status != 1:
-                print("Only 0 and 1 are valid status, where 1 is activated and 0 is unapproved.")
-                exit(0)
-            # @TODO: Get Users current status and purge him from the disk if neccessary
-            # @TODO: When the User had 0 and got 1 he should be created as well
-        if args.username:
-            print(f"{args.username}")
-        exit(0)
-    except KeyboardInterrupt as e:
-        pass
diff --git a/private/lib/System.py b/private/lib/System.py
index 39ec9f7..2cf660f 100644
--- a/private/lib/System.py
+++ b/private/lib/System.py
@@ -181,7 +181,7 @@ class System:
             return True
         else:
             ret = subprocess.call(cc)
-            if ret != 0:
+            if ret != 0 or ret != 6:
                 raise lib.UserExceptions.UnknownReturnCode(
                     f"Could not delete user with command {cc}. Return code: {ret}")
             return True