fnp
/
django-cas-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarified validation logging.
[django-cas-provider.git]
/
cas_provider
/
views.py
diff --git
a/cas_provider/views.py
b/cas_provider/views.py
index
ba7b0a2
..
b67635d
100644
(file)
--- a/
cas_provider/views.py
+++ b/
cas_provider/views.py
@@
-1,3
+1,5
@@
+import logging
+logger = logging.getLogger('cas_provider.views')
import urllib
from django.http import HttpResponse, HttpResponseRedirect
import urllib
from django.http import HttpResponse, HttpResponseRedirect
@@
-12,10
+14,14
@@
from models import ServiceTicket
from utils import create_service_ticket
from exceptions import SameEmailMismatchedPasswords
from utils import create_service_ticket
from exceptions import SameEmailMismatchedPasswords
+from . import signals
+
__all__ = ['login', 'validate', 'logout']
def login(request, template_name='cas/login.html', success_redirect='/account/', merge=False):
__all__ = ['login', 'validate', 'logout']
def login(request, template_name='cas/login.html', success_redirect='/account/', merge=False):
+ logging.debug('CAS Provider Login view. Method is %s, merge is %s, template is %s.',
+ request.method, merge, template_name)
service = request.GET.get('service', None)
if service is not None:
request.session['service'] = service
service = request.GET.get('service', None)
if service is not None:
request.session['service'] = service
@@
-23,10
+29,15
@@
def login(request, template_name='cas/login.html', success_redirect='/account/',
if service is not None:
ticket = create_service_ticket(request.user, service)
if service.find('?') == -1:
if service is not None:
ticket = create_service_ticket(request.user, service)
if service.find('?') == -1:
- return HttpResponseRedirect(service + '?ticket=' + ticket.ticket)
+ url = service + '?ticket=' + ticket.ticket
+ logging.debug('Redirecting to %s', url)
+ return HttpResponseRedirect(url)
else:
else:
- return HttpResponseRedirect(service + '&ticket=' + ticket.ticket)
+ url = service + '&ticket=' + ticket.ticket
+ logging.debug('Redirecting to %s', url)
+ return HttpResponseRedirect()
else:
else:
+ logging.debug('Redirecting to %s', success_redirect)
return HttpResponseRedirect(success_redirect)
errors = []
if request.method == 'POST':
return HttpResponseRedirect(success_redirect)
errors = []
if request.method == 'POST':
@@
-36,6
+47,7
@@
def login(request, template_name='cas/login.html', success_redirect='/account/',
form = LoginForm(request.POST, request=request)
if form.is_valid():
form = LoginForm(request.POST, request=request)
if form.is_valid():
+ service = form.cleaned_data.get('service', None)
try:
auth_args = dict(username=form.cleaned_data['email'],
password=form.cleaned_data['password'])
try:
auth_args = dict(username=form.cleaned_data['email'],
password=form.cleaned_data['password'])
@@
-60,14
+72,20
@@
def login(request, template_name='cas/login.html', success_redirect='/account/',
args['service'] = service
args = urllib.urlencode(args)
args['service'] = service
args = urllib.urlencode(args)
- return HttpResponseRedirect('%s?%s' % (base_url, args))
+ url = '%s?%s' % (base_url, args)
+ logging.debug('Redirecting to %s', url)
+ return HttpResponseRedirect(url)
+
if user is not None:
if user.is_active:
auth_login(request, user)
if service is not None:
ticket = create_service_ticket(user, service)
if user is not None:
if user.is_active:
auth_login(request, user)
if service is not None:
ticket = create_service_ticket(user, service)
- return HttpResponseRedirect(service + '?ticket=' + ticket.ticket)
+ url = service + '?ticket=' + ticket.ticket
+ logging.debug('Redirecting to %s', url)
+ return HttpResponseRedirect(url)
else:
else:
+ logging.debug('Redirecting to %s', success_redirect)
return HttpResponseRedirect(success_redirect)
else:
errors.append('This account is disabled.')
return HttpResponseRedirect(success_redirect)
else:
errors.append('This account is disabled.')
@@
-75,11
+93,13
@@
def login(request, template_name='cas/login.html', success_redirect='/account/',
errors.append('Incorrect username and/or password.')
else:
if merge:
errors.append('Incorrect username and/or password.')
else:
if merge:
- form = MergeLoginForm(
request.GET, request=request
)
+ form = MergeLoginForm(
initial={'service': service, 'email': request.GET.get('email')}
)
else:
else:
- form = LoginForm(request.GET, request=request)
+ form = LoginForm(initial={'service': service})
+ logging.debug('Rendering response on %s, merge is %s', template_name, merge)
return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
+
def socialauth_login(request, template_name='cas/login.html', success_redirect='/account/'):
""" Similiar to login but user has been authenticated already through social auth.
This step authenticates the login and generates a service ticket.
def socialauth_login(request, template_name='cas/login.html', success_redirect='/account/'):
""" Similiar to login but user has been authenticated already through social auth.
This step authenticates the login and generates a service ticket.
@@
-110,14
+130,21
@@
def socialauth_login(request, template_name='cas/login.html', success_redirect='
def validate(request):
service = request.GET.get('service', None)
ticket_string = request.GET.get('ticket', None)
def validate(request):
service = request.GET.get('service', None)
ticket_string = request.GET.get('ticket', None)
+ logger.info('Validating ticket %s for %s', ticket_string, service)
if service is not None and ticket_string is not None:
try:
ticket = ServiceTicket.objects.get(ticket=ticket_string)
if service is not None and ticket_string is not None:
try:
ticket = ServiceTicket.objects.get(ticket=ticket_string)
+ except ServiceTicket.DoesNotExist:
+ logger.exception("Tried to validate with an invalid ticket %s for %s", ticket_string, service)
+ else:
username = ticket.user.username
ticket.delete()
username = ticket.user.username
ticket.delete()
- return HttpResponse("yes\n%s\n" % username)
- except:
- pass
+
+ results = signals.on_cas_collect_histories.send(sender=validate, for_email=ticket.user.email)
+ histories = '\n'.join('\n'.join(rs) for rc, rs in results)
+
+ return HttpResponse("yes\n%s\n%s" % (username, histories))
+
return HttpResponse("no\n\n")
return HttpResponse("no\n\n")