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

Merge pull request #23622 from edx/ziafazal/ENT-2710

Browse Source 
ENT-2710: Improved enterprise target regex
This commit is contained in:
Zia Fazal
2020-04-06 18:36:18 +05:00
committed by GitHub
parent c94beec16b f56235248a
commit 3a73def603
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/user_authn/views/logout.py
View File

@@ -106,7 +106,7 @@ class LogoutView(TemplateView):
Args: url(str): url path
"""
unquoted_url = parse.unquote_plus(parse.quote(url))
return bool(re.match(r'^/enterprise/[a-z0-9\-]+/course', unquoted_url))
return bool(re.match(r'^/enterprise(/handle_consent_enrollment)?/[a-z0-9\-]+/course', unquoted_url))
def _show_tpa_logout_link(self, target, referrer):
"""

2
openedx/features/enterprise_support/tests/test_logout.py
View File

@@ -46,6 +46,8 @@ class EnterpriseLogoutTests(EnterpriseServiceMockMixin, CacheIsolationTestCase,
('invalid-url', False),
('/enterprise/c5dad9a7-741c-4841-868f-850aca3ff848/course/Microsoft+DAT206x/enroll/', True),
('%2Fenterprise%2Fc5dad9a7-741c-4841-868f-850aca3ff848%2Fcourse%2FMicrosoft%2BDAT206x%2Fenroll%2F', True),
('/enterprise/handle_consent_enrollment/efd91463-dc40-4882-aeb9-38202131e7b2/course', True),
('%2Fenterprise%2Fhandle_consent_enrollment%2Fefd91463-dc40-4882-aeb9-38202131e7b2%2Fcourse', True),
)
@ddt.unpack
def test_logout_enterprise_target(self, redirect_url, enterprise_target):