Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Shib PR responses to @cpennington and @ormsbee comments

Browse Source 
* Changed unicode test cases to ascii encoding
* Removed 'stanford' hardcoding in TOS logic in lieu of
  'SHIB_DISABLE_TOS' MIT_FEATURES flag
* made 'external_auth' always an installed_app in lms
* log.exception changd to log.error where appropriate

But: did not change skipping tests to changing settings, for
reasons stated here:
https://github.com/edx/edx-platform/pull/67#issuecomment-19790330
This commit is contained in:
Jason Bau
2013-06-20 18:12:06 -07:00
parent 084160c1c9
commit aa4e27f775
5 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/djangoapps/external_auth/tests/test_shib.py
View File

@@ -1,4 +1,3 @@
# coding=utf-8
"""
Tests for Shibboleth Authentication
@jbau
@@ -36,8 +35,8 @@ from student.tests.factories import UserFactory
IDP = 'https://idp.stanford.edu/'
REMOTE_USER = 'test_user@stanford.edu'
MAILS = [None, '', 'test_user@stanford.edu']
GIVENNAMES = [None, '', 'Jason', 'jasön; John; bob'] # At Stanford, the givenNames can be a list delimited by ';'
SNS = [None, '', 'Bau', '包; smith'] # At Stanford, the sns can be a list delimited by ';'
GIVENNAMES = [None, '', 'Jason', 'jas\xc3\xb6n; John; bob'] # At Stanford, the givenNames can be a list delimited by ';'
SNS = [None, '', 'Bau', '\xe5\x8c\x85; smith'] # At Stanford, the sns can be a list delimited by ';'
def gen_all_identities():

10
common/djangoapps/external_auth/views.py
View File

@@ -245,8 +245,10 @@ def signup(request, eamap=None):
'ask_for_tos': True,
}
# Can't have terms of service for Stanford users, according to Stanford's Office of General Counsel
if settings.MITX_FEATURES['AUTH_USE_SHIB'] and ('stanford' in eamap.external_domain):
# Some openEdX instances can't have terms of service for shib users, like
# according to Stanford's Office of General Counsel
if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and settings.MITX_FEATURES.get('SHIB_DISABLE_TOS') and \
('shib' in eamap.external_domain):
context['ask_for_tos'] = False
# detect if full name is blank and ask for it from user
@@ -387,10 +389,10 @@ def shib_login(request):
"""))
if not request.META.get('REMOTE_USER'):
log.exception("SHIB: no REMOTE_USER found in request.META")
log.error("SHIB: no REMOTE_USER found in request.META")
return default_render_failure(request, shib_error_msg)
elif not request.META.get('Shib-Identity-Provider'):
log.exception("SHIB: no Shib-Identity-Provider in request.META")
log.error("SHIB: no Shib-Identity-Provider in request.META")
return default_render_failure(request, shib_error_msg)
else:
#if we get here, the user has authenticated properly