Skip to content

feat: include authz course + org role grants in Meilisearch access filter - #39073

Open
wgu-taylor-payne wants to merge 2 commits into
openedx:masterfrom
WGU-Open-edX:tpayne/fix-meilisearch-access-ids-authz
Open

feat: include authz course + org role grants in Meilisearch access filter#39073
wgu-taylor-payne wants to merge 2 commits into
openedx:masterfrom
WGU-Open-edX:tpayne/fix-meilisearch-access-ids-authz

Conversation

@wgu-taylor-payne

@wgu-taylor-payne wgu-taylor-payne commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

Description

Studio search is powered by Meilisearch. On each request to the Studio search token endpoint (GET /api/content_search/v2/studio/), get_access_ids_for_request / _get_meili_access_filter build the per-user tenant-token filter that Meilisearch enforces server-side. The filter has two clauses: org IN [<org short_names>] OR access_id IN [<SearchAccess ids>]. Until now both clauses were built from legacy roles only — CourseStaffRole / CourseInstructorRole for the access_id (per-course) clause, and OrgStaffRole / OrgInstructorRole for the org clause.

Users who hold an authz-only course role — course_editor or course_auditor granted through openedx-authz, with no corresponding legacy CourseAccessRole row — were therefore invisible to the filter, and their courses returned zero results in the global Studio search modal (search icon / Cmd+K) and the "Review Content Updates" tab on the Library Updates page (/course/{id}/libraries), which uses Meilisearch to look up component details.

This change fixes both clauses:

Per-course grants (access_id clause): a new _get_authz_course_keys helper unions the user's per-course authz role assignments (CourseOverviewData scope) into the access_id filter when AUTHZ_COURSE_AUTHORING_FLAG is enabled. The flag is a CourseWaffleFlag, so the check is applied per course — a deployment running the flag globally-off with per-course or per-org overrides still resolves correctly.

Org-wide (glob) grants (org clause): an authz course role can also be granted at an org-wide scope, e.g. course-v1:Org+*, which surfaces as an OrgCourseOverviewGlobData scope rather than a per-course CourseOverviewData scope. That grant means "all courses in this org", so it was missed by both clauses — the per-course helper only looks at CourseOverviewData, and the legacy org clause only knows legacy org roles. A new get_authz_org_keys helper resolves these glob grants to org short_names and unions them into _get_user_orgs, so they land in the org IN [...] clause — one entry per org, mirroring how legacy org staff roles are handled and avoiding a per-course access_id fan-out that would burn slots against the JWT size cap (MAX_ACCESS_IDS_IN_FILTER). Because an org-wide grant is not tied to a single course, its flag gate is resolved at the org tier via a new public CourseWaffleFlag.is_enabled_for_org(org) method (added in this PR): an org override (force-on/force-off) takes precedence, otherwise the global switch — a per-course override cannot gate an org-wide grant.

Note that the authz→legacy compat layer already bridges course_staffstaff and course_admininstructor (roles with a legacy twin), so those grants were already reaching the filter; the load-bearing cases here are course_editor / course_auditor, which have no legacy twin and are dropped by compat. Both helpers query purely by scope type and are role-agnostic — inclusion is pure widening into an OR filter (you can only gain search on a course/org you already hold a role on), the same safety posture as the fail-open behavior below.

Both lookups fail open: a DatabaseError from the authz/Casbin backend is logged and degrades to legacy-role access rather than returning a 500, while any unexpected exception propagates so real bugs surface. A non-course scope key (e.g. a library scope) appearing in the per-course query is skipped via InvalidKeyError.

Both helpers read a single per-request-cached fetch of the user's assignment set (_get_cached_authz_assignments, @request_cached), so the enforcer is queried once per request rather than once per helper. Authz course keys are normalized to strings so a course held via both a legacy and an authz role de-duplicates into one entry in the unioned set.

Commit structure. This PR is two commits: (1) feat: add org-tier resolution to CourseWaffleFlag adds the reusable public is_enabled_for_org method to waffle_utils (extracting the shared org-override resolution is_enabled already used internally); (2) feat: include authz course + org role grants in Meilisearch access filter is the search-filter change that consumes it. The first is a small, self-contained platform addition reviewable on its own.

Impacted user roles: Course Author (editors/auditors who rely on authz roles, at course or org scope), Operator (behavior is gated behind AUTHZ_COURSE_AUTHORING_FLAG).

Supporting information

Testing instructions

  1. Enable AUTHZ_COURSE_AUTHORING_FLAG (globally, or as a per-course / per-org override for the course/org under test).
  2. Create a user with an authz course_editor (or course_auditor) role on a course, and no legacy CourseStaffRole/CourseInstructorRole on it.
  3. As that user, open the global Studio search modal and search for content in that course — the course's content now appears (previously: zero results).
  4. Repeat with an org-wide grant: assign an authz course_editor/course_auditor at an org-glob scope (e.g. course-v1:Org+*), enable the flag for that org, and confirm search returns that org's content via the org IN [...] clause (previously: zero results).
  5. Open the course's Library Updates page → "Review Content Updates" tab and confirm component details resolve.
  6. Automated: 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.pytest_init.py covers is_enabled_for_org (org override on/off/unset, and global-switch fallback with no override); StudioSearchAuthzAccessTest covers per-course (authz-only user sees courses with flag on, omit_orgs applies, flag-off excludes, DatabaseError swallowed, unexpected error propagates, unparseable scope skipped, legacy+authz de-duplicate); StudioSearchAuthzOrgAccessTest covers org-glob (org grant lands in the org clause, org-override forces on when the flag is globally off).

Deadline

None.

Other information

  • Feature-flagged. Behavior only changes when AUTHZ_COURSE_AUTHORING_FLAG resolves enabled for a given course or org; with the flag off everywhere and no overrides, the filter is unchanged from today.
  • Performance / follow-up (not blocking): the authz assignments are fetched and then flag-filtered. get_user_role_assignments_per_scope_type eagerly expands each role's implicit permissions, but these helpers only read scope.external_key / scope.org and discard the permissions — wasted work for users with many assignments. The computation runs once per token fetch (not per keystroke — the frontend reuses the minted tenant token for subsequent queries). A scopes-only authz API, and/or caching the computed access set with an explicit invalidation contract on role/flag change, would be the clean optimization; both are intentionally left out of this correctness fix.
  • Org-tier flag resolution: CourseWaffleFlag.is_enabled only accepts a course key and has no public org-only entry point, so this PR adds CourseWaffleFlag.is_enabled_for_org(org) (org override → global switch) and get_authz_org_keys calls it. The org-override read that was inline in is_enabled's course resolution is extracted into a shared helper so both entry points resolve identically and share one cache entry per org.
  • Also touches openedx/core/djangoapps/waffle_utils/ for the new is_enabled_for_org method and its tests (see Commit structure above).
  • No database migrations.

@openedx-webhooks openedx-webhooks added open-source-contribution PR author is not from Axim or 2U core contributor PR author is a Core Contributor (who may or may not have write access to this repo). labels Sep 2, 2026
@openedx-webhooks

openedx-webhooks commented Sep 2, 2026

Copy link
Copy Markdown

Thanks for the pull request, @wgu-taylor-payne!

This repository is currently maintained by @openedx/wg-maintenance-openedx-platform-oncall.

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 approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.
🔘 Provide context

To 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:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads
🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

Details
Where 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:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

@github-project-automation github-project-automation Bot moved this to Needs Triage in Contributions Sep 2, 2026
@wgu-taylor-payne
wgu-taylor-payne force-pushed the tpayne/fix-meilisearch-access-ids-authz branch 2 times, most recently from 5d245c8 to a65995b Compare September 8, 2026 22:40
@wgu-taylor-payne wgu-taylor-payne changed the title feat: include authz course role assignments in Meilisearch access_ids feat: include authz course + org role grants in Meilisearch access filter Sep 8, 2026
@mphilbrick211 mphilbrick211 added the mao-onboarding Reviewing this will help onboard devs from an Axim mission-aligned organization (MAO). label Sep 9, 2026
@mphilbrick211 mphilbrick211 moved this from Needs Triage to Waiting on Author in Contributions Sep 9, 2026
@wgu-taylor-payne
wgu-taylor-payne force-pushed the tpayne/fix-meilisearch-access-ids-authz branch from a65995b to c898c71 Compare September 10, 2026 15:49
@wgu-taylor-payne
wgu-taylor-payne marked this pull request as ready for review September 10, 2026 18:21
@wgu-taylor-payne
wgu-taylor-payne requested review from BryanttV, mariajgrimaldi and rodmgwgu and a lite review from Copilot September 10, 2026 18:21

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🔵 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_id filtering to union in authz CourseOverviewData scope assignments (flag-gated per course, fail-open on DatabaseError).
  • 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.

Comment thread openedx/core/djangoapps/content/search/models.py
@wgu-taylor-payne
wgu-taylor-payne marked this pull request as draft September 10, 2026 19:33
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.
…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
@wgu-taylor-payne
wgu-taylor-payne force-pushed the tpayne/fix-meilisearch-access-ids-authz branch from c898c71 to aef74ef Compare September 11, 2026 18:52
@wgu-taylor-payne
wgu-taylor-payne marked this pull request as ready for review September 11, 2026 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core contributor PR author is a Core Contributor (who may or may not have write access to this repo). mao-onboarding Reviewing this will help onboard devs from an Axim mission-aligned organization (MAO). open-source-contribution PR author is not from Axim or 2U

Projects

Status: Waiting on Author

Development

Successfully merging this pull request may close these issues.

Studio search (Meilisearch) does not include courses for authz-only users

4 participants