From 316eb271efd58f7b034e65167b5abb9df011ca92 Mon Sep 17 00:00:00 2001 From: Klaus-Uwe Mitterer Date: Thu, 26 Oct 2017 22:55:09 +0200 Subject: [PATCH] How did nobody ever notice that the validator wasn't working? Also, escaping values before passing them to the HAFAS station endpoint. --- main.py | 4 ++-- workers/val.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index be9f9e5..d220b94 100644 --- a/main.py +++ b/main.py @@ -118,9 +118,9 @@ def application(env, re): elif rtype.lower() in ["val", "validate"]: try: try: - name = (cfrm or args["from"][0]).encode("latin-1").decode("utf-8") + name = (cfrm or args["name"][0]).encode("latin-1").decode("utf-8") except UnicodeDecodeError: - name = cfrm or args["from"][0] + name = cfrm or args["name"][0] if not name: raise ValueError() diff --git a/workers/val.py b/workers/val.py index 3d890f6..47e1ab0 100644 --- a/workers/val.py +++ b/workers/val.py @@ -4,7 +4,7 @@ import urllib.parse from classes import * def getValidator(name): - return requests.get("http://www.oebb.at/__ressources/system/stationsHafas.jsp?q=%s" % name).text + return requests.get("http://www.oebb.at/__ressources/system/stationsHafas.jsp?q=%s" % urllib.parse.quote(name)).text def validateName(name): stations = json.loads(getValidator(name))