diff --git a/CHANGELOG b/CHANGELOG index 5392e5119914d4c0afd3cad6401b4e5c96f32214..c64632da9fbba3db44dd87c7a35cd057d42427e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ django-ucamwebauth changelog ============================= +1.4.1 - 03/07/2017 +------------------ + +- Raise TypeError if the request is not in the proper format for UcamWebAuth, so that django tries other authentication backends + + 1.4 - 03/07/2017 ------------------ diff --git a/debian/changelog b/debian/changelog index 96904941b89c09a3bbcecf031df6dc7328c78faf..f5273d9c1be78d0a730663795f37e3321cc45c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +django-ucamwebauth (1.4.1) unstable; urgency=low + + * Raise TypeError if the request is not in the proper format for UcamWebAuth, so that django tries other authentication backends + + -- Abraham Martin <amc203@cam.ac.uk> Mon, 3 Jul 2017 16:55:14 +0100 + django-ucamwebauth (1.4) unstable; urgency=low * Dropped support for old versions of Python and Django and added support for new versions of them. diff --git a/django-ucamwebauth.spec b/django-ucamwebauth.spec index 9f41b4d204fda322cfef78000e304b48b32db649..82ee568c6946ae9688b301562bc7ff056e010687 100644 --- a/django-ucamwebauth.spec +++ b/django-ucamwebauth.spec @@ -1,5 +1,5 @@ Name: django-ucamwebauth -Version: 1.4 +Version: 1.4.1 Release: 1 Summary: University of Cambridge Web Authentication module for Django Source: %{name}-%{version}.tar.gz diff --git a/setup.py b/setup.py index 94e9bb0ced88299d2164fe53225881d3050c8441..8561d49d48da78746aa157491e077a5f490ef01d 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( url='https://git.csx.cam.ac.uk/x/ucs/raven/django-ucamwebauth.git', # When changing this version number, remember to update # django-ucamwebauth.spec and debian/changelog. - version='1.4', + version='1.4.1', license='MIT', author='Information Systems Group, University Information Services, University of Cambridge', author_email='raven-support@cam.ac.uk', diff --git a/ucamwebauth/__init__.py b/ucamwebauth/__init__.py index 1ba5b27cfacde13534dffb6369ab9839fab1c792..c2d8038ac618fab92336d936a9e762630f062a22 100644 --- a/ucamwebauth/__init__.py +++ b/ucamwebauth/__init__.py @@ -34,11 +34,11 @@ class RavenResponse(object): """ if response_req is None: - raise MalformedResponseError("no request supplied") + raise TypeError("no request supplied") try: response_str = response_req.GET['WLS-Response'] except KeyError: - raise MalformedResponseError("no WLS-Response") + raise TypeError("no WLS-Response") # The WLS sends an authentication response message as follows: First a 'encoded response string' is formed by # concatenating the values of the response fields below, in the order shown, using '!' as a separator character.