From 87548030cbeaeff301afd297e052ceb5bc438ca7 Mon Sep 17 00:00:00 2001 From: Boris Bobrov Date: Wed, 11 Jul 2018 17:30:09 +0200 Subject: [PATCH] fix auth error and simplify url and email checks --- mediagoblin/auth/views.py | 3 ++- mediagoblin/tools/validator.py | 26 +++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index fb8e7265..593d588d 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -109,7 +109,8 @@ def login(request): return redirect(request, "index") login_failed = True - remote_addr = request.access_route[-1] or request.remote_addr + remote_addr = (request.access_route and request.access_route[-1] + or request.remote_addr) _log.warn("Failed login attempt from %r", remote_addr) return render_to_response( diff --git a/mediagoblin/tools/validator.py b/mediagoblin/tools/validator.py index 03598f9c..e8031a44 100644 --- a/mediagoblin/tools/validator.py +++ b/mediagoblin/tools/validator.py @@ -14,21 +14,15 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from wtforms.validators import Email, URL +import six def validate_email(email): - """ - Validates an email - - Returns True if valid and False if invalid """ + Validates an email - email_re = Email().regex - result = email_re.match(email) - if result is None: - return False - else: - return result.string + Returns True if valid and False if invalid + """ + return '@' in email def validate_url(url): """ @@ -36,11 +30,9 @@ def validate_url(url): Returns True if valid and False if invalid """ - - url_re = URL().regex - result = url_re.match(url) - if result is None: + try: + six.moves.urlparse(url) + return True + except Except as e: return False - else: - return result.string -- 2.25.1