From 48e87d03a5d26cc6f204f3e040038478ff43e566 Mon Sep 17 00:00:00 2001
From: Marco Ciotola <848222@stud.unive.it>
Date: Tue, 19 Feb 2019 02:56:36 +0100
Subject: [PATCH] A bit more homogeneous redirect creation
---
helios/views.py | 10 +++++-----
helios_auth/views.py | 33 +++++++++++++++------------------
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/helios/views.py b/helios/views.py
index 381c302..eec88a7 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -535,14 +535,14 @@ def one_election_cast(request, election):
on a GET, this is a cancellation, on a POST it's a cast
"""
if request.method == "GET":
- return HttpResponseRedirect("%s%s" % (settings.SECURE_URL_HOST, reverse(one_election_view, args = [election.uuid])))
+ return HttpResponseRedirect(settings.SECURE_URL_HOST + reverse(one_election_view, args = [election.uuid]))
user = get_user(request)
encrypted_vote = request.POST['encrypted_vote']
save_in_session_across_logouts(request, 'encrypted_vote', encrypted_vote)
- return HttpResponseRedirect("%s%s" % (settings.SECURE_URL_HOST, reverse(one_election_cast_confirm, args=[election.uuid])))
+ return HttpResponseRedirect(settings.SECURE_URL_HOST + reverse(one_election_cast_confirm, args=[election.uuid]))
@election_view(allow_logins=True)
def password_voter_login(request, election):
@@ -747,7 +747,7 @@ def one_election_cast_confirm(request, election):
# remove the vote from the store
del request.session['encrypted_vote']
- return HttpResponseRedirect("%s%s" % (settings.URL_HOST, reverse(one_election_cast_done, args=[election.uuid])))
+ return HttpResponseRedirect(settings.SECURE_URL_HOST + reverse(one_election_cast_done, args=[election.uuid]))
@election_view()
def one_election_cast_done(request, election):
@@ -1136,7 +1136,7 @@ def release_result(request, election):
if request.POST.get('send_email', ''):
return HttpResponseRedirect("%s?%s" % (settings.SECURE_URL_HOST + reverse(voters_email, args=[election.uuid]),urllib.urlencode({'template': 'result'})))
else:
- return HttpResponseRedirect("%s" % (settings.SECURE_URL_HOST + reverse(one_election_view, args=[election.uuid])))
+ return HttpResponseRedirect(settings.SECURE_URL_HOST + reverse(one_election_view, args=[election.uuid]))
# if just viewing the form or the form is not valid
return render_template(request, 'release_result', {'election': election})
@@ -1155,7 +1155,7 @@ def combine_decryptions(request, election):
election.combine_decryptions()
election.save()
- return HttpResponseRedirect("%s" % (settings.SECURE_URL_HOST + reverse(one_election_view, args=[election.uuid])))
+ return HttpResponseRedirect(settings.SECURE_URL_HOST + reverse(one_election_view, args=[election.uuid]))
# if just viewing the form or the form is not valid
return render_template(request, 'combine_decryptions', {'election': election})
diff --git a/helios_auth/views.py b/helios_auth/views.py
index b85f82e..8d28089 100644
--- a/helios_auth/views.py
+++ b/helios_auth/views.py
@@ -5,22 +5,19 @@ Ben Adida
2009-07-05
"""
-from django.http import *
+import urllib
from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect, HttpResponse
-from view_utils import *
-from helios_auth.security import get_user
-
-import auth_systems
+import helios_auth
+import settings
from auth_systems import AUTH_SYSTEMS
from auth_systems import password
-import helios_auth
-
-import copy, urllib
-
+from helios_auth.security import get_user
from models import User
-
from security import FIELDS_TO_SAVE
+from view_utils import render_template, render_template_raw
+
def index(request):
"""
@@ -42,10 +39,10 @@ def index(request):
#form = password.LoginForm()
- return render_template(request,'index', {'return_url' : request.GET.get('return_url', '/'),
- 'enabled_auth_systems' : helios_auth.ENABLED_AUTH_SYSTEMS,
- 'default_auth_system': helios_auth.DEFAULT_AUTH_SYSTEM,
- 'default_auth_system_obj': default_auth_system_obj})
+ return render_template(request, 'index', {'return_url' : request.GET.get('return_url', '/'),
+ 'enabled_auth_systems' : helios_auth.ENABLED_AUTH_SYSTEMS,
+ 'default_auth_system': helios_auth.DEFAULT_AUTH_SYSTEM,
+ 'default_auth_system_obj': default_auth_system_obj})
def login_box_raw(request, return_url='/', auth_systems = None):
"""
@@ -56,7 +53,7 @@ def login_box_raw(request, return_url='/', auth_systems = None):
default_auth_system_obj = AUTH_SYSTEMS[helios_auth.DEFAULT_AUTH_SYSTEM]
# make sure that auth_systems includes only available and enabled auth systems
- if auth_systems != None:
+ if auth_systems is not None:
enabled_auth_systems = set(auth_systems).intersection(set(helios_auth.ENABLED_AUTH_SYSTEMS)).intersection(set(AUTH_SYSTEMS.keys()))
else:
enabled_auth_systems = set(helios_auth.ENABLED_AUTH_SYSTEMS).intersection(set(AUTH_SYSTEMS.keys()))
@@ -87,7 +84,7 @@ def do_local_logout(request):
# let's clean up the self-referential issue:
field_names_to_save = set(field_names_to_save)
- field_names_to_save = field_names_to_save - set([FIELDS_TO_SAVE])
+ field_names_to_save = field_names_to_save - {FIELDS_TO_SAVE}
field_names_to_save = list(field_names_to_save)
fields_to_save = dict([(name, request.session.get(name, None)) for name in field_names_to_save])
@@ -144,7 +141,7 @@ def _do_auth(request):
system = AUTH_SYSTEMS[system_name]
# where to send the user to?
- redirect_url = "%s%s" % (settings.SECURE_URL_HOST,reverse(after))
+ redirect_url = settings.SECURE_URL_HOST + reverse(after)
auth_url = system.get_auth_url(request, redirect_url=redirect_url)
if auth_url:
@@ -208,5 +205,5 @@ def after_intervention(request):
if request.session.has_key('auth_return_url'):
return_url = request.session['auth_return_url']
del request.session['auth_return_url']
- return HttpResponseRedirect("%s%s" % (settings.URL_HOST, return_url))
+ return HttpResponseRedirect(settings.URL_HOST + return_url)
--
GitLab