Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
ced3f67a
Commit
ced3f67a
authored
May 02, 2014
by
Adam Palay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix authentication check in auth
parent
9d2b85d3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
common/djangoapps/student/auth.py
+1
-1
common/djangoapps/student/tests/test_authz.py
+10
-6
No files found.
common/djangoapps/student/auth.py
View file @
ced3f67a
...
...
@@ -72,7 +72,7 @@ def _check_caller_authority(caller, role):
:param caller: a user
:param role: an AccessRole
"""
if
not
(
caller
.
is_authenticated
and
caller
.
is_active
):
if
not
(
caller
.
is_authenticated
()
and
caller
.
is_active
):
raise
PermissionDenied
# superuser
if
GlobalStaff
()
.
has_user
(
caller
):
...
...
common/djangoapps/student/tests/test_authz.py
View file @
ced3f67a
...
...
@@ -76,8 +76,10 @@ class CreatorGroupTest(TestCase):
"""
Tests that adding to creator group fails if user is not authenticated
"""
with
mock
.
patch
.
dict
(
'django.conf.settings.FEATURES'
,
{
'DISABLE_COURSE_CREATION'
:
False
,
"ENABLE_CREATOR_GROUP"
:
True
}):
with
mock
.
patch
.
dict
(
'django.conf.settings.FEATURES'
,
{
'DISABLE_COURSE_CREATION'
:
False
,
"ENABLE_CREATOR_GROUP"
:
True
}
):
anonymous_user
=
AnonymousUser
()
role
=
CourseCreatorRole
()
add_users
(
self
.
admin
,
role
,
anonymous_user
)
...
...
@@ -87,8 +89,10 @@ class CreatorGroupTest(TestCase):
"""
Tests that adding to creator group fails if user is not active
"""
with
mock
.
patch
.
dict
(
'django.conf.settings.FEATURES'
,
{
'DISABLE_COURSE_CREATION'
:
False
,
"ENABLE_CREATOR_GROUP"
:
True
}):
with
mock
.
patch
.
dict
(
'django.conf.settings.FEATURES'
,
{
'DISABLE_COURSE_CREATION'
:
False
,
"ENABLE_CREATOR_GROUP"
:
True
}
):
self
.
user
.
is_active
=
False
add_users
(
self
.
admin
,
CourseCreatorRole
(),
self
.
user
)
self
.
assertFalse
(
has_access
(
self
.
user
,
CourseCreatorRole
()))
...
...
@@ -108,7 +112,7 @@ class CreatorGroupTest(TestCase):
def
test_add_user_to_group_requires_authenticated
(
self
):
with
self
.
assertRaises
(
PermissionDenied
):
self
.
admin
.
is_authenticated
=
False
self
.
admin
.
is_authenticated
=
mock
.
Mock
(
return_value
=
False
)
add_users
(
self
.
admin
,
CourseCreatorRole
(),
self
.
user
)
def
test_remove_user_from_group_requires_staff_access
(
self
):
...
...
@@ -123,7 +127,7 @@ class CreatorGroupTest(TestCase):
def
test_remove_user_from_group_requires_authenticated
(
self
):
with
self
.
assertRaises
(
PermissionDenied
):
self
.
admin
.
is_authenticated
=
False
self
.
admin
.
is_authenticated
=
mock
.
Mock
(
return_value
=
False
)
remove_users
(
self
.
admin
,
CourseCreatorRole
(),
self
.
user
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment