feat: include authz role grants in Meilisearch access filter - #39073
wgu-taylor-payne wants to merge 2 commits into
Conversation
|
Thanks for the pull request, @wgu-taylor-payne! This repository is currently maintained by Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review. 🔘 Get product approvalIf you haven't already, check this list to see if your contribution needs to go through the product review process.
🔘 Provide contextTo help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:
🔘 Get a green buildIf one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green. DetailsWhere can I find more information?If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources: When can I expect my changes to be merged?Our goal is to get community contributions seen and reviewed as efficiently as possible. However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:
💡 As a result it may take up to several weeks or months to complete a review and merge your PR. |
5d245c8 to
a65995b
Compare
a65995b to
c898c71
Compare
There was a problem hiding this comment.
🔵 Needs a closer look
It changes authorization-sensitive filtering logic (who can search what) and should receive final human review despite strong test coverage.
Pull request overview
This PR updates Studio’s Meilisearch tenant-token access filter generation to include authorization grants coming from openedx-authz (including authz-only course roles like course_editor/course_auditor) so that users granted access via authz can see the appropriate course/org content in Studio search when AUTHZ_COURSE_AUTHORING_FLAG is enabled.
Changes:
- Expand per-course
access_idfiltering to union in authzCourseOverviewDatascope assignments (flag-gated per course, fail-open onDatabaseError). - Expand org
org IN [...]filtering to union in authz org-glob (OrgCourseOverviewGlobData) assignments resolved to org short_names (flag-gated per org via org override/global switch). - Add/extend CMS test coverage for both per-course authz access and org-glob authz access paths.
File summaries
| File | Description |
|---|---|
| openedx/core/djangoapps/content/search/models.py | Adds authz assignment caching and helpers to include authz-derived course/org access in search access computation. |
| openedx/core/djangoapps/content/search/api.py | Unions authz org-glob grants into _get_user_orgs to populate the Meilisearch org clause. |
| openedx/core/djangoapps/content/search/tests/test_models.py | Adds tests for authz-only per-course and org-glob access behavior, including flag gating and fail-open error handling. |
| openedx/core/djangoapps/content/search/tests/test_views.py | Adds a Studio token endpoint test to verify authz org-glob access lands in the org filter clause. |
Review details
- Files reviewed: 4/4 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
CourseWaffleFlag could only resolve a flag for a course key (is_enabled), which walks course override -> org override -> global switch. There was no public way to ask whether a flag is enabled for an entire org, independent of any single course. Add a public is_enabled_for_org(org) that resolves the flag at the org tier only: an org override (force-on / force-off) takes precedence, otherwise the global switch. Per-course overrides are not consulted -- a setting made for one course cannot answer whether the flag is on for the whole org. Extract the org-override read that was inline in _get_course_override_value into a shared _get_org_override_value(org) helper so both entry points resolve org overrides identically and share one cached_flags() entry per org.
c898c71 to
aef74ef
Compare
BryanttV
left a comment
There was a problem hiding this comment.
Thanks @wgu-taylor-payne! I have a few comments
5e9355a to
093e93d
Compare
…lter get_access_ids_for_request built the Meilisearch tenant-token filter from legacy CourseStaffRole/CourseInstructorRole only, so users holding an authz-only course role (course_editor / course_auditor with no legacy twin) were excluded from the search access filter. Their courses returned zero results in the global Studio search modal and the Library Updates "Review Content Updates" tab. This is openedx-authz#417. Add _get_authz_course_keys to union the user's per-course authz role assignments (CourseOverviewData scope) into the access_id filter clause, gated per-course on AUTHZ_COURSE_AUTHORING_FLAG so global-off deployments with per-course/org overrides still resolve correctly. Also handle org-wide (glob) authz grants, e.g. course-v1:Org+*, which surface as an OrgCourseOverviewGlobData scope rather than a per-course scope and so were missed by both filter clauses -- the same openedx#417 gap for the org case. Add get_authz_org_keys to resolve org-glob grants to org short_names and union them into _get_user_orgs, landing them in the org IN [...] clause (one entry per org, mirroring legacy org staff roles and avoiding per-course access_id fan-out against the JWT size cap). Each org is gated via CourseWaffleFlag.is_enabled_for_org, since a per-course override cannot gate an org-wide grant. A single per-request-cached fetch (_get_cached_authz_assignments) backs both helpers so the enforcer is queried once per request rather than twice. The authz lookups fail open on a DatabaseError (logged, empty set) so search degrades to legacy access rather than 500-ing; any other error propagates. Scope parsing is narrowed to InvalidKeyError so a non-course authz scope (e.g. a library) is skipped rather than mishandled. Closes: openedx/openedx-authz#417
093e93d to
a0c7099
Compare
BryanttV
left a comment
There was a problem hiding this comment.
LGTM! Thanks for addressing my comments!
Description
Studio search is powered by Meilisearch. On each request to the Studio search token endpoint (
GET /api/content_search/v2/studio/),_get_meili_access_filterbuilds the per-user tenant-token filter that Meilisearch enforces server-side:org IN [<org short_names>] OR access_id IN [<SearchAccess ids>]. Both clauses were built from legacy roles only (CourseStaff/CourseInstructorforaccess_id,OrgStaff/OrgInstructorfororg).Users holding an authz-only course role (
course_editor/course_auditorgranted through openedx-authz, with no legacyCourseAccessRoletwin) were invisible to the filter, so their courses returned zero results in the global Studio search modal and the "Review Content Updates" tab on the Library Updates page.This change widens both clauses to include authz role grants at all three scope levels, gated behind
AUTHZ_COURSE_AUTHORING_FLAG:CourseOverviewData) →access_idclause, gated per course.course-v1:Org+*,OrgCourseOverviewGlobData) →orgclause (one entry per org, avoiding anaccess_idfan-out against the JWT size cap). Gated at the org tier via a new publicCourseWaffleFlag.is_enabled_for_org(org)(org override → global switch).course-v1:*,PlatformCourseOverviewGlobData) → the authz analogue of global staff. When the flag is globally on, this short-circuits to a see-everything ({}) filter. When globally off, the grant is expanded per-scope to only the orgs/courses where the flag resolves on — a global-off flag can still be force-on per org/course, so it must not silently hide everything.The load-bearing cases are
course_editor/course_auditor, which have no legacy twin (the authz→legacy compat layer already bridgescourse_staff→staffandcourse_admin→instructor). Helpers query purely by scope type and are role-agnostic; inclusion is pure widening into anORfilter, so a user can only gain search on scopes they already hold a role on. All lookups fail open: aDatabaseErrordegrades to legacy access rather than a 500, while unexpected exceptions propagate. The user's assignment set is fetched once per request (@request_cached) and shared across helpers; authz course keys are normalized to strings to de-duplicate against legacy grants.Commit structure. Two commits: (1)
feat: add org-tier resolution to CourseWaffleFlagadds the reusable publicis_enabled_for_orgtowaffle_utils; (2)feat: include authz course + org role grants in Meilisearch access filterconsumes it.Impacted user roles: Course Author (authz editors/auditors at course, org, or platform scope), Operator (behavior gated behind
AUTHZ_COURSE_AUTHORING_FLAG).Supporting information
view_library_updateswork in Addcourses.view_library_updatesenforcement in openedx-platform openedx-authz#398 and PR feat: split read vs write authz checks for library updates #39009.Testing instructions
AUTHZ_COURSE_AUTHORING_FLAG(globally, or per-course/per-org override).course_editor/course_auditorrole and no legacy course role.course-v1:Org+*) and a platform-wide grant (course-v1:*); confirm search returns the org's / all content.pytest openedx/core/djangoapps/waffle_utils/tests/test_init.py openedx/core/djangoapps/content/search/tests/test_models.py openedx/core/djangoapps/content/search/tests/test_views.py— coversis_enabled_for_orgresolution, and per-course / org-glob / platform-glob grants (including fail-open, flag-off exclusion, override force-on, and legacy de-duplication) against both mocked and real seeded authz policy.Deadline
None.
Other information
scope.external_key/scope.orgfromget_user_role_assignments_per_scope_type, which eagerly expands each role's implicit permissions (discarded here). It runs once per token fetch, not per keystroke. A scopes-only authz API and/or a cached access set with an invalidation contract would be the clean optimization, intentionally left out of this correctness fix.AI Usage
Kiro was used to aid in development and testing.