Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
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
course-discovery
Commits
855ef03a
Commit
855ef03a
authored
Sep 27, 2017
by
Asad Azam
Committed by
AsadAzam
Nov 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated people api create to use group authentication
parent
1cf3de6c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
2 deletions
+39
-2
course_discovery/apps/api/v1/tests/test_views/test_people.py
+21
-0
course_discovery/apps/api/v1/views/people.py
+2
-2
course_discovery/apps/publisher/permissions.py
+16
-0
No files found.
course_discovery/apps/api/v1/tests/test_views/test_people.py
View file @
855ef03a
# pylint: disable=redefined-builtin,no-member
import
ddt
from
django.contrib.auth
import
get_user_model
from
django.contrib.auth.models
import
Group
from
django.db
import
IntegrityError
from
mock
import
mock
from
rest_framework.reverse
import
reverse
...
...
@@ -15,6 +16,8 @@ from course_discovery.apps.course_metadata.models import Person
from
course_discovery.apps.course_metadata.people
import
MarketingSitePeople
from
course_discovery.apps.course_metadata.tests
import
toggle_switch
from
course_discovery.apps.course_metadata.tests.factories
import
OrganizationFactory
,
PersonFactory
,
PositionFactory
from
course_discovery.apps.publisher.constants
import
INTERNAL_USER_GROUP_NAME
from
course_discovery.apps.publisher.permissions
import
logger
as
permission_logger
User
=
get_user_model
()
...
...
@@ -27,6 +30,7 @@ class PersonViewSetTests(SerializationMixin, SiteMixin, APITestCase):
def
setUp
(
self
):
super
(
PersonViewSetTests
,
self
)
.
setUp
()
self
.
user
=
UserFactory
(
is_staff
=
True
,
is_superuser
=
True
)
self
.
user
.
groups
.
add
(
Group
.
objects
.
get
(
name
=
INTERNAL_USER_GROUP_NAME
))
self
.
client
.
force_authenticate
(
self
.
user
)
self
.
person
=
PersonFactory
(
partner
=
self
.
partner
)
self
.
organization
=
OrganizationFactory
(
partner
=
self
.
partner
)
...
...
@@ -111,6 +115,23 @@ class PersonViewSetTests(SerializationMixin, SiteMixin, APITestCase):
self
.
assertEqual
(
response
.
status_code
,
403
)
self
.
assertEqual
(
Person
.
objects
.
count
(),
0
)
def
test_create_without_group
(
self
):
""" Verify group is required when creating a person. """
self
.
user
.
groups
.
remove
(
Group
.
objects
.
get
(
name
=
INTERNAL_USER_GROUP_NAME
))
current_people_count
=
Person
.
objects
.
count
()
with
LogCapture
(
permission_logger
.
name
)
as
log_capture
:
response
=
self
.
client
.
post
(
self
.
people_list_url
,
{},
format
=
'json'
)
self
.
assertEqual
(
response
.
status_code
,
403
)
self
.
assertEqual
(
Person
.
objects
.
count
(),
current_people_count
)
log_capture
.
check
(
(
permission_logger
.
name
,
'INFO'
,
'Permission denied. User [{}] has no groups'
.
format
(
self
.
user
.
username
),
)
)
def
test_get
(
self
):
""" Verify the endpoint returns the details for a single person. """
url
=
reverse
(
'api:v1:person-detail'
,
kwargs
=
{
'uuid'
:
self
.
person
.
uuid
})
...
...
course_discovery/apps/api/v1/views/people.py
View file @
855ef03a
...
...
@@ -8,9 +8,9 @@ from rest_framework.response import Response
from
course_discovery.apps.api
import
filters
,
serializers
from
course_discovery.apps.api.pagination
import
PageNumberPagination
from
course_discovery.apps.course_metadata.exceptions
import
MarketingSiteAPIClientException
,
PersonToMarketingException
from
course_discovery.apps.course_metadata.people
import
MarketingSitePeople
from
course_discovery.apps.publisher.permissions
import
UserHasGroup
logger
=
logging
.
getLogger
(
__name__
)
...
...
@@ -23,7 +23,7 @@ class PersonViewSet(viewsets.ModelViewSet):
filter_class
=
filters
.
PersonFilter
lookup_field
=
'uuid'
lookup_value_regex
=
'[0-9a-f-]+'
permission_classes
=
(
IsAuthenticated
,)
permission_classes
=
(
IsAuthenticated
,
UserHasGroup
,
)
queryset
=
serializers
.
PersonSerializer
.
prefetch_queryset
()
serializer_class
=
serializers
.
PersonSerializer
pagination_class
=
PageNumberPagination
...
...
course_discovery/apps/publisher/permissions.py
0 → 100644
View file @
855ef03a
import
logging
from
rest_framework
import
permissions
logger
=
logging
.
getLogger
(
__name__
)
class
UserHasGroup
(
permissions
.
BasePermission
):
"""
Global permission to check if request.user has any group
"""
def
has_permission
(
self
,
request
,
view
):
if
request
.
user
.
groups
.
all
():
return
True
logger
.
info
(
'Permission denied. User [
%
s] has no groups'
,
request
.
user
.
username
)
return
False
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