Skip to content

[3.118] Secures content-app headers consistently. - #8322

Merged
dralley merged 1 commit into
pulp:3.118from
ggainey:patchback/backports/3.118/d8b8db317fa6592b8a5a888822fe46c8a82bd5f2/pr-8036
Nov 6, 2026
Merged

dralley merged 1 commit into
pulp:3.118from
ggainey:patchback/backports/3.118/d8b8db317fa6592b8a5a888822fe46c8a82bd5f2/pr-8036

Conversation

@ggainey

@ggainey ggainey commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Addresses CVE-2026-84232.

(cherry picked from commit d8b8db3)

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

Addresses CVE-2026-84232.

(cherry picked from commit d8b8db3)
@ggainey ggainey changed the title Secures content-app headers consistently. [3.118] Secures content-app headers consistently. Nov 6, 2026
@dralley
dralley merged commit de2c0a4 into pulp:3.118 Nov 6, 2026
14 checks passed
@patchback

patchback Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Backport to 3.105: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.105/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322

Backported as #8323

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Backport to 3.49: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply de2c0a4 on top of patchback/backports/3.49/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322

Backporting merged PR #8322 into 3.118

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulpcore.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/3.49/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322 upstream/3.49
    
  4. Now, cherry-pick PR [3.118] Secures content-app headers consistently. #8322 contents into that branch:
    git cherry-pick -x de2c0a4cb7c1197372cff16fb0e924a17f52bb10
    
    If it'll yell at you with something like fatal: Commit de2c0a4cb7c1197372cff16fb0e924a17f52bb10 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x de2c0a4cb7c1197372cff16fb0e924a17f52bb10
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR [3.118] Secures content-app headers consistently. #8322 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/3.49/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Backport to 3.63: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply de2c0a4 on top of patchback/backports/3.63/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322

Backporting merged PR #8322 into 3.118

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulpcore.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/3.63/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322 upstream/3.63
    
  4. Now, cherry-pick PR [3.118] Secures content-app headers consistently. #8322 contents into that branch:
    git cherry-pick -x de2c0a4cb7c1197372cff16fb0e924a17f52bb10
    
    If it'll yell at you with something like fatal: Commit de2c0a4cb7c1197372cff16fb0e924a17f52bb10 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x de2c0a4cb7c1197372cff16fb0e924a17f52bb10
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR [3.118] Secures content-app headers consistently. #8322 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/3.63/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Backport to 3.73: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply de2c0a4 on top of patchback/backports/3.73/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322

Backporting merged PR #8322 into 3.118

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulpcore.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/3.73/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322 upstream/3.73
    
  4. Now, cherry-pick PR [3.118] Secures content-app headers consistently. #8322 contents into that branch:
    git cherry-pick -x de2c0a4cb7c1197372cff16fb0e924a17f52bb10
    
    If it'll yell at you with something like fatal: Commit de2c0a4cb7c1197372cff16fb0e924a17f52bb10 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x de2c0a4cb7c1197372cff16fb0e924a17f52bb10
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR [3.118] Secures content-app headers consistently. #8322 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/3.73/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Backport to 3.85: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.85/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322

Backported as #8324

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants