From 0814e45c94aee17236846d82b55c3e2f44a85db2 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Mon, 30 Aug 2021 19:08:41 +0200 Subject: [PATCH] add del user --- server.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server.py b/server.py index 3c2b261..42c2f6c 100755 --- a/server.py +++ b/server.py @@ -22,6 +22,8 @@ HTTP_FORBIDDEN = 401 HTTP_NOT_FOUND = 404 HTTP_UNPROCESSABLE = 422 HTTP_INTERNAL_ERR = 500 +HTTP_EMPTY = 204 +EMPTY = "" # unix useradd requires exactly this salt, do not change PAM_PASSWD_SALT = "22" @@ -37,8 +39,12 @@ def createUser(): @app.route('/delete-user', methods=["POST"]) def deleteUser(): - deleteUser(user=flask.request.get('user')) - return ("Success", 200) + userToDelete = flask.request.form['username'] + user = db.session.query(FTPUser).filter(FTPUser.username == userToDelete).first() + if not user: + return ("User doesn't exist.", 405) + print(userToDelete) + return (EMPTY, HTTP_EMPTY) @app.route('/list-users') def listUsers(): @@ -49,13 +55,12 @@ def createUser(webform): # command line useradd requires a pre-encrypted password cryptPass = crypt.crypt(webform['password'], PAM_PASSWD_SALT) - subprocess.run(["./scripts/create_user.sh", cryptPass, webform['username']]) + #subprocess.run(["./scripts/create_user.sh", cryptPass, webform['username']]) # track added users to prevent deletion of other users and listing # - db.session.add(FTPUser(webform.username)) + db.session.add(FTPUser(username=webform['username'])) db.session.commit() - def executeScript(scriptName): path = os.path.expanduser(scriptName) subprocess.Popen(path)