add CSRF protection

app/db.py

@@ -416,7 +416,7 @@ class Token:
 
 
     def get_user(db_path: str, token: str) -> int:
-        if not Token.exists(db_path, userid):
+        if not Token.exists(db_path, token):
             raise ValueError("Token does not exist")
 
         with sqlite3.connect(db_path) as connection:
@@ -429,4 +429,4 @@ class Token:
                 WHERE tkhash = ?
             ''', (tkhash, ))
 
-            return cursor.fetcone()[0]
+            return cursor.fetchone()[0]

app/main.py

@@ -3,7 +3,10 @@ import auth
 import db
 import re
 from os import environ, urandom
-
+from flask_wtf import FlaskForm
+from wtforms import StringField, PasswordField, BooleanField, EmailField, HiddenField
+from wtforms.validators import DataRequired
+from flask_wtf.csrf import CSRFProtect
 
 HOSTS_PATH = ( environ["HOSTS"] if "HOSTS" in environ else"/app/data/hosts.d/" ) + "/izbi"
 DB_PATH = environ["DB_PATH"] if "DB_PATH" in environ else "/app/data/sqlite.db"
@@ -14,8 +17,9 @@ app.config["SESSION_TYPE"] = "memcached"
 app.config["PERMANENT_SESSION_LIFETIME"] = 3600
 app.config["SECRET_KEY"] = environ["SECRET_KEY"] if "SECRET_KEY" in environ else urandom(32).hex()
 
-hosts = {}
+csrf = CSRFProtect(app)
 
+hosts = {}
 
 # Update hosts file
 def update_hosts(path: str, hosts: dict = {}) -> bool:
@@ -38,18 +42,23 @@ def validate_ip(ip: str) -> bool:
     return re.search(exp, ip)
 
 
+class LoginForm(FlaskForm):
+    username = StringField('username', validators=[DataRequired()])
+    password = PasswordField('password', validators=[DataRequired()])
+
 # Serve homepage
-@app.route('/', methods=["GET"])
+@app.route('/', methods=["GET", "POST"])
-def homepage():
+def index():
     if session.get("USERID") is not None:
         return redirect("/dashboard")
-    return render_template("index.html")
 
+    login_form = LoginForm()
 
-# Handle login
+    if login_form.validate_on_submit():
-@app.route('/login', methods=["POST"])
+        username = login_form.username.data
-def login():
+        password = login_form.password.data
-    userid = auth.user_login(DB_PATH, request.form.get("user"), request.form.get("pass"))
+
+        userid = auth.user_login(DB_PATH, username, password)
 
         if userid is None:
             flash("Invalid user or password")
@@ -59,13 +68,35 @@ def login():
 
         return redirect("/dashboard")
 
+    return render_template("index.html", login_form=login_form)
 
-# Log out by clearing session data
-@app.route('/logout', methods=["GET"])
-def logout():
-    session.clear()
-    return redirect("/")
 
+class LogoutForm(FlaskForm):
+    pass
+
+class GenerateTokenForm(FlaskForm):
+    token_name = StringField('token-name', validators=[DataRequired()])
+
+class RevokeTokenForm(FlaskForm):
+    token_name = StringField('token-name', validators=[DataRequired()])
+
+class ChangePasswordForm(FlaskForm):
+    password = PasswordField('password', validators=[DataRequired()])
+    new_password = PasswordField('new-password', validators=[DataRequired()])
+    repeat_password = PasswordField('repeat-password', validators=[DataRequired()])
+
+class CreateUserForm(FlaskForm):
+    username = StringField('username', validators=[DataRequired()])
+    domains = StringField('domains')
+    password = PasswordField('password', validators=[DataRequired()])
+    is_admin = BooleanField('is-admin')
+    email = EmailField('email')
+
+class UpdateUserForm(FlaskForm): #TODO
+    pass
+
+class DeleteUserForm(FlaskForm):
+    userid = HiddenField('userid', validators=[DataRequired()])
 
 # Display dashboard for logged in users
 @app.route('/dashboard', methods=["GET"])
@@ -73,6 +104,11 @@ def dashboard():
     if session.get("USERID") is None:
         return redirect("/")
 
+    logout_form = LogoutForm()
+    generate_token_form = GenerateTokenForm()
+    revoke_token_form = RevokeTokenForm()
+    change_password_form = ChangePasswordForm()
+
     userid = session.get("USERID")
 
     username = db.User.get_username(DB_PATH, userid)
@@ -81,10 +117,32 @@ def dashboard():
 
     # If user is admin, display additional options
     if db.User.is_admin(DB_PATH, userid):
-        users = db.list_users(DB_PATH)
+        create_user_form = CreateUserForm()
-        return render_template("dashboard.html", username=username, domains=domains, tokens=tokens, is_admin=True, users=users)
+        update_user_form = UpdateUserForm()
+        delete_user_form = DeleteUserForm()
 
-    return render_template("dashboard.html", username=username, domains=domains, tokens=tokens, is_admin=False)
+        users = db.list_users(DB_PATH)
+
+        return render_template("dashboard.html",
+            logout_form=logout_form, generate_token_form=generate_token_form, revoke_token_form=revoke_token_form, change_password_form=change_password_form, create_user_form=create_user_form, update_user_form=update_user_form, delete_user_form=delete_user_form,
+            username=username, domains=domains, tokens=tokens, is_admin=True, users=users
+        )
+
+    return render_template("dashboard.html",
+        logout_form=logout_form, generate_token_form=generate_token_form, revoke_token_form=revoke_token_form, change_password_form=change_password_form,
+        username=username, domains=domains, tokens=tokens, is_admin=False
+    )
+
+
+# Log out by clearing session data
+@app.route('/logout', methods=["POST"])
+def logout():
+    logout_form = LogoutForm()
+
+    if logout_form.validate_on_submit():
+        session.clear()
+
+    return redirect("/")
 
 
 # Generate new access token with a name
@@ -93,12 +151,12 @@ def generate_token():
     if session.get("USERID") is None:
         return redirect("/")
 
-    if "token" not in request.form:
+    generate_token_form = GenerateTokenForm()
-        flash("Token name not supplied")
-        return redirect("/dashboard")
 
+    if generate_token_form.validate_on_submit():
+        token_name = generate_token_form.token_name.data
         try:
-        token = db.User.generate_token(DB_PATH, session.get("USERID"), request.form["token"])
+            token = db.User.generate_token(DB_PATH, session.get("USERID"), token_name)
         except ValueError as e:
             flash(str(e))
             token = None
@@ -115,14 +173,42 @@ def revoke_token():
     if session.get("USERID") is None:
         return redirect("/")
 
-    if "token" not in request.form:
+    revoke_token_form = RevokeTokenForm()
-        flash("Token name not supplied")
+
+    if revoke_token_form.validate_on_submit():
+        token_name = revoke_token_form.token_name.data
+        try:
+            db.User.revoke_token(DB_PATH, session.get("USERID"), token_name)
+        except ValueError as e:
+            flash(str(e))
+
+    return redirect("/dashboard")
+
+
+# Change password (by user)
+@app.route('/change-password', methods=["POST"])
+def change_password():
+    if session.get("USERID") is None:
+        return redirect("/")
+
+    change_password_form = ChangePasswordForm()
+
+    if change_password_form.validate_on_submit():
+        password = change_password_form.password.data
+        new_password = change_password_form.new_password.data
+        repeat_password = change_password_form.repeat_password.data
+
+        if new_password != repeat_password:
+            flash("Passwords do not match")
             return redirect("/dashboard")
 
         try:
-        db.User.revoke_token(DB_PATH, session.get("USERID"), request.form["token"])
+            auth.change_user_password(DB_PATH, session.get("USERID"), password, new_password)
         except ValueError as e:
             flash(str(e))
+            return redirect("/dashboard")
+
+        flash("Password changed successfully")
 
     return redirect("/dashboard")
 
@@ -135,14 +221,13 @@ def create_user():
     if not db.User.is_admin(DB_PATH, session.get("USERID")):
         return redirect("/dashboard")
 
-    if 'username' not in request.form or 'password' not in request.form:
+    create_user_form = CreateUserForm()
-        flash('Required fields not supplied')
-        return redirect("/dashboard")
 
-    username = request.form.get("username").strip()
+    if create_user_form.validate_on_submit():
-    password = request.form.get("password")
+        username = create_user_form.username.data.strip()
+        password = create_user_form.password.data
 
-    domains = request.form.get('domains')
+        domains = create_user_form.domains.data
         if domains is None:
             domains = []
         else:
@@ -151,13 +236,9 @@ def create_user():
             domains = collapse_exp.sub(' ', domains.strip())
             domains = domains.split(" ")
 
-    is_admin = request.form.get("is_admin")
+        is_admin = create_user_form.is_admin.data
-    if is_admin is not None:
-        is_admin = is_admin == "true"
-    else:
-        is_admin = False
 
-    email = request.form.get("email")
+        email = create_user_form.email.data
         if email is not None:
             if email == "":
                 email = None
@@ -178,6 +259,11 @@ def update_user():
     if not db.User.is_admin(DB_PATH, session.get("USERID")):
         return redirect("/dashboard")
 
+    update_user_form = UpdateUserForm()
+
+    if not update_user_form.validate_on_submit():
+        return redirect("/dashboard")
+
     userid = request.form.get("userid")
     if userid is None:
         flash("UserID not supplied")
@@ -226,11 +312,12 @@ def delete_user():
     if not db.User.is_admin(DB_PATH, session.get("USERID")):
         return redirect("/dashboard")
 
-    userid = request.form.get("userid")
+    delete_user_form = DeleteUserForm()
-    if userid is None:
-        return redirect("/dashboard")
 
-    if db.User.exists(DB_PATH, userid):
+    if delete_user_form.validate_on_submit():
+        userid = delete_user_form.userid.data
+
+        if not db.User.exists(DB_PATH, userid):
             flash("User does not exst")
             return redirect("/dashboard")
 
@@ -239,33 +326,6 @@ def delete_user():
     return redirect("/dashboard")
 
 
-# Change password (by user)
-@app.route('/change-password', methods=["POST"])
-def change_password():
-    if session.get("USERID") is None:
-        return redirect("/")
-
-    if "pass" not in request.form or "pass-new" not in request.form or "pass-rep" not in request.form:
-        flash("Required values not supplied")
-        return redirect("/dashboard")
-
-    oldpass = request.form["pass"]
-    newpass = request.form["pass-new"]
-    reppass = request.form["pass-rep"]
-
-    if newpass != reppass:
-        flash("Passwords do not match")
-        return redirect("/dashboard")
-
-    try:
-        auth.change_user_password(DB_PATH, session.get("USERID"), oldpass, newpass)
-    except ValueError as e:
-        flash(str(e))
-        return redirect("/dashboard")
-
-    flash("Password changed successfully")
-    return redirect("/dashboard")
-
 
 # API health endpoint ???
 @app.route('/health', methods=["GET"])
@@ -276,7 +336,8 @@ def health():
 # API for updating domain's IP
 @app.route('/update', methods=["GET"])
 def update_addr():
-    try:
+#    try:
+    if True:
         if 'domain' not in request.args:
             return jsonify({"status": "400", "code": "domain-error", "comment": "Missing or invalid domain"}), 400
         domain = request.args['domain']
@@ -307,9 +368,9 @@ def update_addr():
             return jsonify({"status": "500", "code": "internal-server-error", "comment": "An error occurred while processing request"}), 500
 
         return jsonify({"status": "200", "code": "ok", "comment": "Updated successfully"})
-    except Exception as e:
+#    except Exception as e:
-        print(e, flush=True)
+#        print(e, flush=True)
-        return jsonify({"status": "500", "code": "internal-server-error", "comment": "An error occurred while processing request"}), 500
+#        return jsonify({"status": "500", "code": "internal-server-error", "comment": "An error occurred while processing request"}), 500
 
 
 if __name__ == '__main__':

app/templates/admin.html

@@ -7,11 +7,12 @@
 			<tr><th>Username</th><th>Domains</th><th>Password</th><th>Admin</th><th>Email</th><th>Delete</th></tr>
 			
 			<form method="POST" action="/create-user"><tr>
-				<td><input type="text" name="username" placeholder="*user name" required /></td>
+				{{ create_user_form.hidden_tag() }}
-				<td><input type="text" name="domains" placeholder="space separated domains" /></td>
+				<td>{{ create_user_form.username(placeholder="*Username") }}</td>
-				<td><input type="password" name="password" placeholder="*password" required /></td>
+				<td>{{ create_user_form.domains(placeholder="Space separated domains") }}</td>
-				<td><input type="checkbox" name="is_admin" /></td>
+				<td>{{ create_user_form.password(placeholder="*Password") }}</td>
-				<td><input type="email" name="email" placeholder="email" /></td>
+				<td>{{ create_user_form.is_admin() }}</td>
+				<td>{{ create_user_form.email(placeholder="Email") }}</td>
 				<td><button type="submit">Add</button></td>
 			</tr></form>
 
@@ -19,28 +20,33 @@
 			<tr>
 				<td>{{ user["username"] }}</td>
 				<td><form method="POST" action="/update-user">
+					{{ update_user_form.hidden_tag() }}
 					<input type="hidden" name="userid" value="{{ user["userid"] }}" />
 					<input type="text" name="domains" placeholder="space separated domains" value="{{ user["domains"] | join(' ') }}" />
 					<button type="submit">update domains</button>
 				</form></td>
 				<td><form method="POST" action="/update-user">
+					{{ update_user_form.hidden_tag() }}
 					<input type="hidden" name="userid" value="{{ user["userid"] }}" />
 					<input type="password" name="password" placeholder="*password" required />
 					<button type="submit">update password</button>
 				</form></td>
 				<td><form method="POST" action="/update-user">
+					{{ update_user_form.hidden_tag() }}
 					<input type="hidden" name="userid" value="{{ user["userid"] }}" />
 					<input type="hidden" name="is_admin" value="{% if user["is_admin"] %}false{% else %}true{% endif %}" />
 					<input type="checkbox" disabled {% if user["is_admin"] %}checked{% endif %} />
 					<button type="submit">toggle admin</button>
 				</form></td>
 				<td><form method="POST" action="/update-user">
+					{{ update_user_form.hidden_tag() }}
 					<input type="hidden" name="userid" value="{{ user["userid"] }}" />
 					<input type="email" name="email" placeholder="email" value="{{ user["email"] if user["email"] }}"/>
 					<button type="submit">update email</button>
 				</form></td>
 				<td><form method="POST" action="/delete-user">
-					<input type="hidden" name="userid" value="{{ user["userid"] }}" />
+					{{ delete_user_form.csrf_token }}
+					{{ delete_user_form.userid(value=user["userid"]) }}
 					<button type="submit">Delete</button>
 				</form></td>
 			</tr>

app/templates/dashboard.html

@@ -4,7 +4,11 @@
 	<title>Dashboard - IZBI DNS</title>
 </head>
 <body>
-	<h2>Hello {{ username }} <a href="/logout">log&nbsp;out</a></h2>
+	<h2>Hello {{ username }}</h2>
+	<form method="POST" action="/logout">
+		{{ logout_form.hidden_tag() }}
+		<button type="submit">Log&nbsp;Out</button>
+	</form>
 
 {% with messages = get_flashed_messages()%}
 {% if messages%}
@@ -23,14 +27,16 @@
 
 	<p>Your tokens: 
 		<form method="POST" action="/generate-token">
-			<input type="text" name="token" placeholder="token name" />
+			{{ generate_token_form.hidden_tag() }}
-			<button type="submit">new&nbsp;token</button>
+			{{ generate_token_form.token_name(placeholder="Token Name") }}
+			<button type="submit">New&nbsp;Token</button>
 		</form>
 		<ul>{% for token in tokens %}
 			<li>
 				<form method="POST" action="/revoke-token">
-					<input type="text" name="token" readonly value="{{ token }}" />
+					{{ revoke_token_form.hidden_tag() }}
-					<button type="submit">revoke</button>
+					{{ revoke_token_form.token_name(placeholder="Token Name", readonly=True, value=token) }}
+					<button type="submit">Revoke</button>
 				</form>
 			</li>
 {% endfor %}
@@ -39,10 +45,11 @@
 
 	<p>Password change
 		<form method="POST" action="/change-password">
-			<input type="password" name="pass" placeholder="old password" /><br />
+			{{ change_password_form.hidden_tag() }}
-			<input type="password" name="pass-new" placeholder="new password" /><br />
+			{{ change_password_form.password(placeholder="Old Password") }}<br />
-			<input type="password" name="pass-rep" placeholder="repeat password" /><br />
+			{{ change_password_form.new_password(placeholder="New Password") }}<br />
-			<button type="submit">change password</button>
+			{{ change_password_form.repeat_password(placeholder="Repeat Password") }}<br />
+			<button type="submit">Change Password</button>
 		</form>
 	</p>{% if is_admin %}{% include 'admin.html' %}{% endif %}
 </body>

app/templates/index.html

@@ -14,9 +14,10 @@
 {%endif%}
 {%endwith%}
 
-	<form method="POST" action="/login">
+	<form method="POST" action="/">
-		<input type="text" name="user" placeholder="username" required autofocus /><br />
+		{{ login_form.hidden_tag() }}
-		<input type="password" name="pass" placeholder="password" required /><br />
+		{{ login_form.username(placeholder="Username", autofocus=True) }}<br />
+		{{ login_form.password(placeholder="Password") }}<br />
 		<button type="submit">log in</button>
 	</form>
 </body>

requirements.txt

@@ -1 +1,2 @@
 flask
+Flask-WTF