haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 06:11:16 +00:00
Code Issues Releases Wiki Activity

[shib] Fix shib complete url bug

Browse Source
This commit is contained in:
zhengxie
2016-05-17 17:47:07 +08:00
parent 87c6b613c5
commit f12215ec5e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/seahub/thirdpart/shibboleth/test_middleware.py
View File

@@ -35,6 +35,9 @@ class ShibbolethRemoteUserMiddlewareTest(BaseTestCase):
self.request.META['givenname'] = 'test_gname' self.request.META['givenname'] = 'test_gname'
self.request.META['surname'] = 'test_sname' self.request.META['surname'] = 'test_sname'
# default settings
assert getattr(settings, 'SHIB_ACTIVATE_AFTER_CREATION', True) is True
def test_can_process(self): def test_can_process(self):
assert len(Profile.objects.all()) == 0 assert len(Profile.objects.all()) == 0
@@ -52,7 +55,7 @@ class ShibbolethRemoteUserMiddlewareTest(BaseTestCase):
reload(backends) reload(backends)
resp = self.middleware.process_request(self.request) resp = self.middleware.process_request(self.request)
assert resp.url == 'shib-complete' assert resp.url == '/shib-complete/'
assert len(Profile.objects.all()) == 0 assert len(Profile.objects.all()) == 0
# now reload again, so it reverts to original settings # now reload again, so it reverts to original settings

2
thirdpart/shibboleth/middleware.py
View File

@@ -67,7 +67,7 @@ class ShibbolethRemoteUserMiddleware(RemoteUserMiddleware):
user = auth.authenticate(remote_user=username, shib_meta=shib_meta) user = auth.authenticate(remote_user=username, shib_meta=shib_meta)
if user: if user:
if not user.is_active: if not user.is_active:
return HttpResponseRedirect('shib-complete') return HttpResponseRedirect(reverse('shib_complete'))
# User is valid. Set request.user and persist user in the session # User is valid. Set request.user and persist user in the session
# by logging the user in. # by logging the user in.