X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/7ac783b3d7c4c673db943f364252f5b1e0fea53f..04ad2cfdd10bcecf7e49a0736df86d6ab7f53bd1:/cas_provider/views.py?ds=sidebyside

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 108bc38..2979d1b 100644
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -35,7 +35,7 @@ def login(request, template_name='cas/login.html', success_redirect='/account/',
             else:
                 url = service + '&ticket=' + ticket.ticket
                 logging.debug('Redirecting to %s', url)
-                return HttpResponseRedirect()
+                return HttpResponseRedirect(url)
         else:
             logging.debug('Redirecting to %s', success_redirect)
             return HttpResponseRedirect(success_redirect)
@@ -130,22 +130,24 @@ 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)
-    logger.debug("service: %s"% service)
-    logger.debug("ticket_string: %s"% ticket_string)
+    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)
+        except ServiceTicket.DoesNotExist:
+            logger.exception("Tried to validate with an invalid ticket %s for %s", ticket_string, service)
+        except Exception as e:
+            logger.exception('Got an exception: %s', e)
+        else:
             username = ticket.user.username
             ticket.delete()
 
             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)
-
+            logger.info('Validated %s %s', username, "(also %s)" % histories if histories else '')
             return HttpResponse("yes\n%s\n%s" % (username, histories))
 
-        except Exception as e:
-            logger.exception("Got an exception!: %s"% e)
-
+    logger.info('Validation failed.')
     return HttpResponse("no\n\n")