Merge pull request #70 from kstateome/develop

keithbauer · web-flow · commit df618e6fcd36 · 2017-05-01T10:28:35.000-05:00
1.3.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.3.0
+- Compatibility with Django 1.10 Middleware (https://github.com/kstateome/django-cas/pull/69)
+- Add support for protocol-rooted URL as "next_page" argument for _logout_url constructor (https://github.com/kstateome/django-cas/pull/67)
+- Fix typo (https://github.com/kstateome/django-cas/pull/65)
+
 ### 1.2.0
 
 - Allow opt out of time delay caused by fetching PGT tickets
@@ -8,4 +13,4 @@
 ### 1.1.1
 
 - Add a few logging statements
-- Add official change log.
+- Add official change log.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,4 +1,6 @@
 epicserve
 rlmv
 bryankaplan
-cordmata
+cordmata
+bltravis
+JordanReiter
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 CAS client for Django.  This library requires Django 1.5 or above, and Python 2.6, 2.7, 3.4
 
-Current version: 1.2.0
+Current version: 1.3.0
 
 This is [K-State&#39;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
 
@@ -14,7 +14,7 @@ This is [K-State&#39;s fork](https://github.com/kstateome/django-cas) of [the or
 
 This project is registered on PyPi as django-cas-client.  To install::
 
-    pip install django-cas-client==1.2.0
+    pip install django-cas-client==1.3.0
 
 
 ### Add to URLs
@@ -146,7 +146,7 @@ To force the service url to always target HTTPS, set ``CAS_FORCE_SSL_SERVICE_URL
 
 By default, a stub user record will be created on the first successful CAS authentication
 using the username in the response. If this behavior is not desired set
-``CAS_AUTO_CREATE_USER`` to ``Flase``.
+``CAS_AUTO_CREATE_USER`` to ``False``.
 
 ## Proxy Tickets
 
diff --git a/cas/__init__.py b/cas/__init__.py
@@ -1,4 +1,4 @@
-"""Django CAS 1.0/2.0 authentication backend"""
+default_app_config = 'cas.apps.CASConfig'
 
 from django.conf import settings
 
diff --git a/cas/apps.py b/cas/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+class CASConfig(AppConfig):
+    name = 'cas'
+    verbose_name = "cas"
diff --git a/cas/middleware.py b/cas/middleware.py
@@ -12,14 +12,18 @@
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.core.exceptions import ImproperlyConfigured
+try:
+    from django.utils.deprecation import MiddlewareMixin
+except ImportError:
+    MiddlewareMixin = object
 
 from cas.exceptions import CasTicketException
 from cas.views import login as cas_login, logout as cas_logout
 
 __all__ = ['CASMiddleware']
 
 
-class CASMiddleware(object):
+class CASMiddleware(MiddlewareMixin):
     """
     Middleware that allows CAS authentication on admin pages
     """
@@ -81,7 +85,7 @@ def process_exception(self, request, exception):
             return None
 
 
-class ProxyMiddleware(object):
+class ProxyMiddleware(MiddlewareMixin):
 
     # Middleware used to "fake" the django app that it lives at the Proxy Domain
     def process_request(self, request):
diff --git a/cas/views.py b/cas/views.py
@@ -141,9 +141,13 @@ def _logout_url(request, next_page=None):
     url = urlparse.urljoin(settings.CAS_SERVER_URL, 'logout')
 
     if next_page and getattr(settings, 'CAS_PROVIDE_URL_TO_LOGOUT', True):
-        protocol = ('http://', 'https://')[request.is_secure()]
-        host = request.get_host()
-        url += '?' + urlencode({'url': protocol + host + next_page})
+        parsed_url = urlparse.urlparse(next_page)
+        if parsed_url.scheme: #If next_page is a protocol-rooted url, skip redirect url construction
+            url += '?' + urlencode({'service': next_page})
+        else:
+            protocol = ('http://', 'https://')[request.is_secure()]
+            host = request.get_host()
+            url += '?' + urlencode({'service': protocol + host + next_page})
 
     return url
 
@@ -254,4 +258,3 @@ def proxy_callback(request):
         ))
         return HttpResponse('PGT storage failed for {request}'.format(request=str(request.GET)),
                             content_type="text/plain")
-
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,7 +1,14 @@
 Changelog
 =========
 
-1.2.0 (Unreleased)
+1.3.0
+------------------
+
+- Compatibility with Django 1.10 Middleware (https://github.com/kstateome/django-cas/pull/69)
+- Add support for protocol-rooted URL as "next_page" argument for _logout_url constructor (https://github.com/kstateome/django-cas/pull/67)
+- Fix typo (https://github.com/kstateome/django-cas/pull/65)
+
+1.2.0
 ------------------
 
 - Allow opt out of time delay caused by fetching PGT tickets
@@ -18,4 +25,4 @@ Changelog
 - Add official change log.
 
 
-Releases before 1.1.1 were tracked on GitHub https://github.com/kstateome/django-cas/releases
+Releases before 1.1.1 were tracked on GitHub https://github.com/kstateome/django-cas/releases
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.0'
+version = '1.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = '1.2.0'
+version = '1.3.0'
 
 
 def read(fname):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-"""Django CAS 1.0/2.0 authentication backend"""`
	`1`	`+default_app_config = 'cas.apps.CASConfig'`
`2`	`2`
`3`	`3`	`from django.conf import settings`
`4`	`4`