save old config.ini during .deb instalation

.gitignore

@@ -0,0 +1,3 @@
+__pycache__
+luser.deb
+build-deb/luser/var/

build-deb/luser/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Architecture: all
 Essential: no
 Installed-Size: 2000
-Depends: python3-flask, python3-ldap3
+Depends: python3-flask, python3-ldap3, gunicorn
 Homepage: https://gitea.dmz.rs/fram3d/luser
 Maintainer: fram3d <fram3d@dmz.rs>
 Description: Web app that allows users to add,remove and change passwords in LDAP system

build-deb/luser/DEBIAN/postinst

@@ -0,0 +1,5 @@
+#!/bin/sh
+/usr/bin/systemctl enable luser.service
+/sbin/service luser start
+cp /tmp/oldluserconfig.ini /var/luser/luser/config.ini
+rm /tmp/oldluserconfig.ini

build-deb/luser/DEBIAN/preinst

@@ -0,0 +1,2 @@
+#!/bin/sh
+cp /var/luser/luser/config.ini /tmp/oldluserconfig.ini

build-deb/luser/DEBIAN/prerm

@@ -0,0 +1,4 @@
+#!/bin/sh
+/sbin/service luser stop
+/usr/bin/systemdctl disable luser.service
+cp /var/luser/luser/config.ini /tmp/oldluserconfig.ini

luser/routes.py

@@ -91,6 +91,7 @@ def register():
     elif request.method == 'POST':
         username = request.form['username']
         password = request.form['password']
+        confirmpassword = request.form['confirmpassword']
         captcha_answer = request.form['captchaa']
         captcha_filename = request.form['captchaq']
         captcha_path = CAPTCHA_PATH + captcha_filename
@@ -117,6 +118,14 @@ def register():
         if len(password) < 8:
             return 'Error: password is too short'
 
+        # Check lenght of password
+        if password != confirmpassword:
+            return 'Error: passwords do not match'
+
+        # Check if username has uppercase
+        if username.islower() == False:
+            return 'Error: uppercase characters in username are not allowed'
+
         # Create a LUSER connection
         luser = LUSER(LDAPHOST,LDAPADMINNAME,LDAPPASS,USERBASE,ALTUSERBASE)
         # Try to add user

luser/templates/changepassword.html

@@ -1,21 +1,13 @@
 <!DOCTYPE html>
-<html lang="sr">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/styles/reset.css">
+    <link rel="stylesheet" href="/styles/style.css">
+    <link rel="stylesheet" href="/styles/account.css">
+    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
     <title>User password change in LDAP system</title>
-    <style>
-        .container {
-            max-width:900px;
-            margin: 0 auto;
-            font-family: Arial, Helvetica, sans-serif;
-            color: #3d3d3d;
-        }
-
-        body {
-            background-color: #e6e6e6;
-        }
-    </style>
 </head>
 <body>
    <main class="container">

luser/templates/register.html

@@ -1,21 +1,13 @@
 <!DOCTYPE html>
-<html lang="sr">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/styles/reset.css">
+    <link rel="stylesheet" href="/styles/style.css">
+    <link rel="stylesheet" href="/styles/account.css">
+    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
     <title>User registration to LDAP system</title>
-    <style>
-        .container {
-            max-width:900px;
-            margin: 0 auto;
-            font-family: Arial, Helvetica, sans-serif;
-            color: #3d3d3d;
-        }
-
-        body {
-            background-color: #e6e6e6;
-        }
-    </style>
 </head>
 <body>
    <main class="container">
@@ -25,9 +17,11 @@
             <input type="text" name="username" id="username" placeholder="username" required>
             <label for="password">password</label>
             <input type="password" name="password" id="password" placeholder="password" required>
+            <label for="confirmpassword">password</label>
+            <input type="confirmpassword" name="confirmpassword" id="confirmpassword" placeholder="confirmpassword" required>
             <p>password must be at least 8 characters long<p>
             <br>
-            <img src=/account/register/captcha_img/{{ imgsrc }} alt="{{ captchahash }}" style="width:200">
+            <img src=/account/register/captcha_img/{{ imgsrc }} alt="{{ captchahash }}" style="width:200;margin:auto;">
             <p>
             <label for="captcha answer">captcha answer</label>
             <input type="text" name="captchaa" id="captchaa" placeholder="captcha answer" required>

luser/templates/unregister.html

@@ -1,21 +1,13 @@
 <!DOCTYPE html>
-<html lang="sr">
+<html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/styles/reset.css">
+    <link rel="stylesheet" href="/styles/style.css">
+    <link rel="stylesheet" href="/styles/account.css">
+    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
     <title>User unregistration to LDAP system</title>
-    <style>
-        .container {
-            max-width:900px;
-            margin: 0 auto;
-            font-family: Arial, Helvetica, sans-serif;
-            color: #3d3d3d;
-        }
-
-        body {
-            background-color: #e6e6e6;
-        }
-    </style>
 </head>
 <body>
    <main class="container">