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

magento/magento2#38933: Putting csp_whitelist.xml in theme does not work and creates intermittent issue #38933 #39672

Open
wants to merge 3 commits into
base: 2.4-develop
Choose a base branch
from

Conversation

NitrogenUA
Copy link
Contributor

@NitrogenUA NitrogenUA commented Feb 28, 2025

Description (*)

  • Implemented caching of CSP whitelist per website area.

Fixed Issues (if relevant)

  1. Fixes Putting csp_whitelist.xml in theme does not work and creates intermittent issue #38933

Manual testing scenarios (*)

  • Put csp_whitelist.xml under your frontend theme's etc/ directory. (You can put this in Luma theme too. Just any theme will work).
  • Clear Magento 2 cache.
  • Open Magento 2 admin area page. Using browser DevTools take note of CSP definitions response header.
  • Open Magento 2 storefront, for instance in separate browser tab. Using browser DevTools take note of CSP definitions response header.
  • Verify that theme's CSP whitelist is in effect on Magento 2 storefront by comparing CSP definition headers from each request.

Expected result

Magento 2 storefront CSP whitelist is applied even if admin area was accessed first after the cache reset.

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
  • All automated tests passed successfully (all builds are green)

…reates intermittent issue

- Implemented caching of CSP whitelist per website area.
Copy link

m2-assistant bot commented Feb 28, 2025

Hi @NitrogenUA. Thank you for your contribution!
Here are some useful tips on how you can test your changes using Magento test environment.
❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names.

Allowed build names are:
  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests
  13. Semantic Version Checker

You can find more information about the builds here
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.


For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.

@m2-github-services m2-github-services added Partner: Perspective partners-contribution Pull Request is created by Magento Partner labels Feb 28, 2025
@NitrogenUA
Copy link
Contributor Author

@magento run all tests

…reates intermittent issue

- Updated copyright notice.
@NitrogenUA
Copy link
Contributor Author

@magento run all tests

@NitrogenUA
Copy link
Contributor Author

@magento run Functional Tests B2B, Integration Tests

@Priyakshic Priyakshic added the Project: Community Picked PRs upvoted by the community label Mar 13, 2025
@NitrogenUA
Copy link
Contributor Author

@magento run Functional Tests B2B, Integration Tests

@engcom-Hotel
Copy link
Contributor

As the PR shows as draft in status, hence moving it to hold bucket.

@NitrogenUA Please let us know when the PR is ready for review.

@NitrogenUA NitrogenUA marked this pull request as ready for review March 21, 2025 13:14
@NitrogenUA
Copy link
Contributor Author

@engcom-Hotel PR is ready for review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Partner: Perspective partners-contribution Pull Request is created by Magento Partner Progress: on hold Project: Community Picked PRs upvoted by the community
Projects
Status: On Hold
Development

Successfully merging this pull request may close these issues.

Putting csp_whitelist.xml in theme does not work and creates intermittent issue
4 participants