Skip to content

Feature: Add is_super_admin() check in ms-files.php #7696

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.

Sign up for GitHub

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

Jump to bottom
Closed
Debarghya-Banerjee wants to merge 4 commits into from
Closed

Feature: Add is_super_admin() check in ms-files.php #7696

Debarghya-Banerjee wants to merge 4 commits into from

Conversation

@Debarghya-Banerjee
Copy link

@Debarghya-Banerjee Debarghya-Banerjee commented Oct 31, 2024

Trac Ticket: Core-36803

Description:

  • An issue was identified in the multisite installations where archived sites remain accessible to network administrators, but the associated files do not. This behavior originates from the logic in ms-files.php, particularly around line 21:
if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
    status_header( 404 );
    die( '404 — File not found.' );
}
  • The current implementation checks if the blog is archived, marked as spam, or deleted, and subsequently returns a 404 error for file requests. However, this does not account for network administrators who should retain access to these files.

Proposed Solution

  • An additional check using is_super_admin() has been implemented. This adjustment allows network administrators to access files even if the site is archived, spam, or deleted. The modified code snippet is as follows:
if ( ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) && ! is_super_admin() ) {
    status_header( 404 );
    die( '404 — File not found.' );
}

Benefits

  • Enhanced Access for Network Administrators: This change ensures that network admins can access necessary files for archived sites, improving usability and functionality.

  • Preservation of Current Logic: The existing restrictions remain in place for regular users, maintaining intended access controls.

@github-actions
Copy link

github-actions bot commented Oct 31, 2024 •
edited
Loading

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props debarghyabanerjee, audrasjb.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@github-actions
Copy link

github-actions bot commented Oct 31, 2024

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

  • The Plugin and Theme Directories cannot be accessed within Playground.
  • All changes will be lost when closing a tab with a Playground instance.
  • All changes will be lost when refreshing the page.
  • A fresh instance is created each time the link below is clicked.
  • Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
    it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

@audrasjb
Copy link
Contributor

audrasjb commented Jan 28, 2025

I tested this patch and I can confirm the resource doesn't return a 404 when logged in as a super-admin like role 👍

audrasjb
audrasjb requested changes Feb 3, 2025
View reviewed changes
@audrasjb
Copy link
Contributor

audrasjb commented Feb 3, 2025

I committed the change proposed by Clorith.

@audrasjb
Copy link
Contributor

audrasjb commented Mar 11, 2025

committed in https://core.trac.wordpress.org/changeset/59967

@audrasjb audrasjb closed this Mar 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@audrasjb audrasjb audrasjb approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Debarghya-Banerjee @audrasjb