improve form

stacosys/interface/form.py

@@ -13,54 +13,41 @@ logger = logging.getLogger(__name__)
 
 @app.route("/newcomment", methods=["POST"])
 def new_form_comment():
-    try:
+
-        data = request.form
+    data = request.form
-        logger.info("form data " + str(data))
+    logger.info("form data " + str(data))
-
+
-        # validate token: retrieve site entity
+    # honeypot for spammers
-        token = data.get("token", "")
+    captcha = data.get("remarque", "")
-        if token != app.config.get("SITE_TOKEN"):
+    if captcha:
-            abort(401)
+        logger.warning("discard spam: data %s" % data)
-
-        # honeypot for spammers
-        captcha = data.get("remarque", "")
-        if captcha:
-            logger.warning("discard spam: data %s" % data)
-            abort(400)
-
-        url = data.get("url", "")
-        author_name = data.get("author", "").strip()
-        author_gravatar = data.get("email", "").strip()
-        author_site = data.get("site", "").lower().strip()
-        if author_site and author_site[:4] != "http":
-            author_site = "http://" + author_site
-        message = data.get("message", "")
-
-        # anti-spam again
-        if not url or not author_name or not message:
-            logger.warning("empty field: data %s" % data)
-            abort(400)
-        if not check_form_data(data.to_dict()):
-            logger.warning("additional field: data %s" % data)
-            abort(400)
-
-        # add a row to Comment table
-        dao.create_comment(url, author_name, author_site, author_gravatar, message)
-
-    except Exception:
-        logger.exception("new comment failure")
         abort(400)
 
+    url = data.get("url", "")
+    author_name = data.get("author", "").strip()
+    author_gravatar = data.get("email", "").strip()
+    author_site = data.get("site", "").lower().strip()
+    if author_site and author_site[:4] != "http":
+        author_site = "http://" + author_site
+    message = data.get("message", "")
+
+    # anti-spam again
+    if not url or not author_name or not message:
+        logger.warning("empty field: data %s" % data)
+        abort(400)
+    if not check_form_data(data.to_dict()):
+        logger.warning("additional field: data %s" % data)
+        abort(400)
+
+    # add a row to Comment table
+    dao.create_comment(url, author_name, author_site, author_gravatar, message)
+
     return redirect("/redirect/", code=302)
 
 
 def check_form_data(d):
     fields = ["url", "message", "site", "remarque", "author", "token", "email"]
-    for field in fields:
+    filtered = dict(filter(lambda x: x[0] not in fields, d.items()))
-        if field in d:
+    return not filtered
-            del d[field]
-
-#    filtered = dict(filter(lambda x: x[0] not in fields, data.to_dict().items()))
-    return not d