From: Philipp Spitzer <philipp@spitzer.priv.at>
Date: Wed, 1 Aug 2018 21:07:03 +0000 (+0200)
Subject: Implement handling of ill-formatted datetime values in URL.
X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/commitdiff_plain/dbae96a3ccf844c03b456556dc723946030b24ae

Implement handling of ill-formatted datetime values in URL.
---

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 4814d0f..03d5760 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -5,7 +5,7 @@ import configparser
 import os
 import sys
 from collections import defaultdict
-from flask import Flask, render_template, jsonify, request
+from flask import Flask, render_template, jsonify, request, abort, Response
 import flask.json
 from flask_sqlalchemy import SQLAlchemy, inspect
 
@@ -140,9 +140,23 @@ def convert_to_c3(result):
     return c3result
 
 
+def request_arg(key, type, default=None):
+    """Returns the key from the request if available, otherwise the default value.
+    In case type is provided and the key is present, the value is converted by calling type.
+    In other words: Reimplement request.args.get but don't return default value if
+    type raises a ValueError."""
+    if key in request.args:
+        try:
+            return type(request.args[key])
+        except ValueError as e:
+            abort(Response(str(e), 400))
+    else:
+        return default
+
+
 def sensordata(sensor_id=None, sensor_type=None):
-    begin = request.args.get('begin', None, parse_datetime)
-    end = request.args.get('end', None, parse_datetime)
+    begin = request_arg('begin', parse_datetime)
+    end = request_arg('end', parse_datetime)
     mode = request.args.get('mode', 'full')
     format = request.args.get('format', 'default')
 
@@ -154,8 +168,8 @@ def sensordata(sensor_id=None, sensor_type=None):
 
 
 def openweathermapdata(cityid):
-    begin = request.args.get('begin', None, parse_datetime)
-    end = request.args.get('end', None, parse_datetime)
+    begin = request_arg('begin', parse_datetime)
+    end = request_arg('end', parse_datetime)
     mode = request.args.get('mode', 'full')
     format = request.args.get('format', 'default')