Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move progress related apis permissions to standard permission file #51

Open
wants to merge 1 commit into
base: open-release/palm.nelp
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lms/djangoapps/course_home_api/course_metadata/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from common.djangoapps.student.models import CourseEnrollment
from lms.djangoapps.course_api.api import course_detail
from lms.djangoapps.course_goals.models import UserActivity
from lms.djangoapps.course_home_api import permissions
from lms.djangoapps.course_home_api.course_metadata.serializers import CourseHomeMetadataSerializer
from lms.djangoapps.courseware.access import has_access
from lms.djangoapps.courseware.context_processor import user_timezone_locale_prefs
Expand Down Expand Up @@ -76,25 +77,24 @@ def get(self, request, *args, **kwargs):
course_key = CourseKey.from_string(course_key_string)
original_user_is_global_staff = self.request.user.is_staff
original_user_is_staff = has_access(request.user, 'staff', course_key).has_access

user_can_masquarade = request.user.has_perm(permissions.CAN_MASQUARADE_LEARNER_PROGRESS, course_key)
course = course_detail(request, request.user.username, course_key)

# We must compute course load access *before* setting up masquerading,
# else course staff (who are not enrolled) will not be able view
# their course from the perspective of a learner.
load_access = check_course_access(
course,
request.user,
'load',
check_if_enrolled=True,
check_if_enrolled=(not user_can_masquarade),
check_if_authenticated=True,
apply_enterprise_checks=True,
)

_, request.user = setup_masquerade(
request,
course_key,
staff_access=original_user_is_staff,
staff_access=user_can_masquarade,
reset_masquerade_data=True,
)

Expand Down
10 changes: 10 additions & 0 deletions lms/djangoapps/course_home_api/permissions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"""
Permissions for the course home apis and associated actions
"""
from bridgekeeper import perms
from lms.djangoapps.courseware.rules import HasAccessRule


CAN_MASQUARADE_LEARNER_PROGRESS = 'course_home_api.can_masquarade_progress'

perms[CAN_MASQUARADE_LEARNER_PROGRESS] = HasAccessRule('staff')
6 changes: 4 additions & 2 deletions lms/djangoapps/course_home_api/progress/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

from xmodule.modulestore.django import modulestore
from common.djangoapps.student.models import CourseEnrollment
from lms.djangoapps.course_home_api import permissions
from lms.djangoapps.course_home_api.progress.serializers import ProgressTabSerializer
from lms.djangoapps.course_home_api.toggles import course_home_mfe_progress_tab_is_active
from lms.djangoapps.courseware.access import has_access, has_ccx_coach_role
Expand Down Expand Up @@ -186,8 +187,9 @@ def get(self, request, *args, **kwargs):
monitoring_utils.set_custom_attribute('user_id', request.user.id)
monitoring_utils.set_custom_attribute('is_staff', request.user.is_staff)
is_staff = bool(has_access(request.user, 'staff', course_key))
can_masquarade = request.user.has_perm(permissions.CAN_MASQUARADE_LEARNER_PROGRESS, course_key)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meanwhile @tehreem-sadat , please try to add a test that checks the flow when permissions.CAN_MASQUARADE_LEARNER_PROGRESS returns True and False


student = self._get_student_user(request, course_key, student_id, is_staff)
student = self._get_student_user(request, course_key, student_id, can_masquarade)
username = get_enterprise_learner_generic_name(request) or student.username

course = get_course_with_access(student, 'load', course_key, check_if_enrolled=False)
Expand All @@ -196,7 +198,7 @@ def get(self, request, *args, **kwargs):
enrollment = CourseEnrollment.get_enrollment(student, course_key)
enrollment_mode = getattr(enrollment, 'mode', None)

if not (enrollment and enrollment.is_active) and not is_staff:
if not (enrollment and enrollment.is_active) and not can_masquarade:
return Response('User not enrolled.', status=401)

# The block structure is used for both the course_grade and has_scheduled content fields
Expand Down
Loading