Merge pull request #24 from kstateome/develop

Release 1.0

Author: dstegelman

CONTRIBUTORS

@@ -0,0 +1,3 @@
+epicserve
+rlmv
+bryankaplan

MANIFEST.in

@@ -0,0 +1,3 @@
+include LICENSE.mit
+include README.md
+recursive-exclude * *.pyc

README.md

@@ -2,7 +2,7 @@
 
 CAS client for Django.
 
-Current version: 0.9.1
+Current version: 1.0.0
 
 This is [K-State's fork](https://github.com/kstateome/django-cas) of [the original](https://bitbucket.org/cpcc/django-cas/overview) and includes [several additional features](https://github.com/kstateome/django-cas/#additional-features) as well as features merged from
 
@@ -12,7 +12,7 @@ This is [K-State's fork](https://github.com/kstateome/django-cas) of [the or
 
 ## Install
 
-``pip install git+ssh://git@github.com/kstateome/django-cas.git@0.9.1#egg=cas``
+``pip install git+ssh://git@github.com/kstateome/django-cas.git@1.0.0#egg=cas``
 
 See the document at Bitbucket
 

cas/backends.py

@@ -6,15 +6,16 @@
 from xml.dom import minidom
 
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth import get_user_model
 from cas.exceptions import CasTicketException
-from cas.models import User, Tgt, PgtIOU
+from cas.models import Tgt, PgtIOU
 from cas.utils import cas_response_callbacks
 
 __all__ = ['CASBackend']
 
 logger = logging.getLogger(__name__)
 
+
 def _verify_cas1(ticket, service):
     """Verifies CAS 1.0 authentication ticket.
 
@@ -93,7 +94,7 @@ def _verify_cas2(ticket, service):
                             failure[0].firstChild.nodeValue)
 
     except Exception as e:
-        logger.error('Failed to verify CAS authentication', e)
+        logger.error('Failed to verify CAS authentication: %s', e)
 
     finally:
         page.close()
@@ -172,7 +173,7 @@ def authenticate(self, ticket, service):
         """Verifies CAS ticket and gets or creates User object
             NB: Use of PT to identify proxy
         """
-
+        User = get_user_model()
         username = _verify(ticket, service)
         if not username:
             return None
@@ -187,6 +188,8 @@ def authenticate(self, ticket, service):
     def get_user(self, user_id):
         """Retrieve the user's entry in the User model if it exists"""
 
+        User = get_user_model()
+        
         try:
             return User.objects.get(pk=user_id)
         except User.DoesNotExist:

cas/decorators.py

@@ -10,9 +10,12 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.utils.http import urlquote
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 
 __all__ = ['login_required', 'permission_required', 'user_passes_test']
 
+
 def user_passes_test(test_func, login_url=None,
                      redirect_field_name=REDIRECT_FIELD_NAME):
     """Replacement for django.contrib.auth.decorators.user_passes_test that
@@ -46,9 +49,6 @@ def permission_required(perm, login_url=None):
     return user_passes_test(lambda u: u.has_perm(perm), login_url=login_url)
 
 
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
 def gateway():
     """Authenticates single sign on session if ticket is available,
     but doesn't redirect to sign in url otherwise.

cas/middleware.py

@@ -15,6 +15,7 @@
 
 __all__ = ['CASMiddleware']
 
+
 class CASMiddleware(object):
     """Middleware that allows CAS authentication on admin pages"""
 
@@ -64,6 +65,7 @@ def process_exception(self, request, exception):
         else:
             return None
 
+
 class ProxyMiddleware(object):
 
     # Middleware used to "fake" the django app that it lives at the Proxy Domain

cas/models.py

@@ -1,14 +1,15 @@
 from urlparse import urljoin
 from urllib import urlencode, urlopen
+
 from django.db import models
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from cas.exceptions import CasTicketException, CasConfigException
 # Ed Crewe - add in signals to delete old tickets
 from django.db.models.signals import post_save
 from datetime import datetime
 
+
 class Tgt(models.Model):
     username = models.CharField(max_length = 255, unique = True)
     tgt = models.CharField(max_length = 255)
@@ -44,12 +45,14 @@ def get_proxy_ticket_for(self, service):
         finally:
             page.close()
 
+
 class PgtIOU(models.Model):
     """ Proxy granting ticket and IOU """
     pgtIou = models.CharField(max_length = 255, unique = True)
     tgt = models.CharField(max_length = 255)
     created = models.DateTimeField(auto_now = True)
 
+
 def get_tgt_for(user):
     if not settings.CAS_PROXY_CALLBACK:
         raise CasConfigException("No proxy callback set in settings")
@@ -59,8 +62,9 @@ def get_tgt_for(user):
     except ObjectDoesNotExist:
         raise CasTicketException("no ticket found for user " + user.username)
 
+
 def delete_old_tickets(**kwargs):
-    """ Delete tickets if they are over 2 days old 
+    """ Delete tickets if they are over 2 days old
         kwargs = ['raw', 'signal', 'instance', 'sender', 'created']
     """
     sender = kwargs.get('sender', None)
@@ -69,4 +73,3 @@ def delete_old_tickets(**kwargs):
     sender.objects.filter(created__lt=expire).delete()
 
 post_save.connect(delete_old_tickets, sender=PgtIOU)
-#post_save.connect(delete_old_tickets, sender=Tgt)

cas/utils.py

@@ -1,3 +1,8 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
 def cas_response_callbacks(tree):
     from django.conf import settings
     callbacks = []
@@ -8,9 +13,11 @@ def cas_response_callbacks(tree):
         try:
             mod = __import__(module, fromlist=[''])
         except ImportError as e:
-            print "Import Error: %s" % e
+            logger.error("Import Error: %s" % e)
+            raise e
         try:
             func = getattr(mod, callback)
         except AttributeError, e:
-            print "Attribute Error: %s" % e
-        func(tree)
+            logger.error( "Attribute Error: %s" % e)
+            raise e
+        func(tree)

cas/views.py

@@ -85,6 +85,7 @@ def _login_url(service, ticket='ST', gateway=False):
 
     return urlparse.urljoin(settings.CAS_SERVER_URL, login) + '?' + urlencode(params)
 
+
 def _logout_url(request, next_page=None):
     """Generates CAS logout URL"""
 
@@ -154,6 +155,7 @@ def logout(request, next_page=None):
     else:
         return HttpResponseRedirect(next_page)
 
+
 def proxy_callback(request):
     """Handles CAS 2.0+ XML-based proxy callback call.
     Stores the proxy granting ticket in the database for 
@@ -166,13 +168,11 @@ def proxy_callback(request):
     tgt = request.GET.get('pgtId')
 
     if not (pgtIou and tgt):
-        return HttpResponse('No pgtIOO', mimetype="text/plain")
+        return HttpResponse('No pgtIOO', content_type="text/plain")
     try:
         PgtIOU.objects.create(tgt=tgt, pgtIou=pgtIou, created=datetime.now())
         request.session['pgt-TICKET'] = ticket
-        return HttpResponse('PGT ticket is: %s' % str(ticket, mimetype="text/plain"))
+        return HttpResponse('PGT ticket is: %s' % str(ticket, content_type="text/plain"))
     except:
-        return HttpResponse('PGT storage failed for %s' % str(request.GET), mimetype="text/plain")
-
-    return HttpResponse('Success', mimetype="text/plain")
+        return HttpResponse('PGT storage failed for %s' % str(request.GET), content_type="text/plain")
 

setup.py

@@ -1,11 +1,18 @@
+import os
+
 from setuptools import setup, find_packages
 
-version = '0.9.1'
+version = '1.0.0'
+
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
 
 setup(name='django-cas',
       version=version,
       description="Django Cas Client",
-      long_description=open("./README.md", "r").read(),
+      long_description=read('README.md'),
       classifiers=[
           "Development Status :: Development",
           "Environment :: Console",