Skip to content

Secures content-app headers consistently. - #8325

Merged
ggainey merged 1 commit into
pulp:3.73from
ggainey:patchback/backports/3.73/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322
Nov 6, 2026
Merged

ggainey merged 1 commit into
pulp:3.73from
ggainey:patchback/backports/3.73/de2c0a4cb7c1197372cff16fb0e924a17f52bb10/pr-8322

Conversation

@ggainey

@ggainey ggainey commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Addresses CVE-2026-84232.

Note: test removed due to relying on features not available in 3.73

(cherry picked from commit d8b8db3) (cherry picked from commit de2c0a4)

Addresses CVE-2026-84232.

Note: test removed due to relying on features not available in 3.73

(cherry picked from commit d8b8db3)
(cherry picked from commit de2c0a4)
@ggainey
ggainey enabled auto-merge (rebase) November 6, 2026 20:40
@ggainey
ggainey merged commit b75a9bb into pulp:3.73 Nov 6, 2026
25 of 27 checks passed
@patchback

patchback Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Backport to 3.63: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.63/b75a9bb7e0da166d759b4b300abadd281265e4b2/pr-8325

Backported as #8326

🤖 @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 b75a9bb on top of patchback/backports/3.49/b75a9bb7e0da166d759b4b300abadd281265e4b2/pr-8325

Backporting merged PR #8325 into 3.73

  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/b75a9bb7e0da166d759b4b300abadd281265e4b2/pr-8325 upstream/3.49
    
  4. Now, cherry-pick PR Secures content-app headers consistently. #8325 contents into that branch:
    git cherry-pick -x b75a9bb7e0da166d759b4b300abadd281265e4b2
    
    If it'll yell at you with something like fatal: Commit b75a9bb7e0da166d759b4b300abadd281265e4b2 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x b75a9bb7e0da166d759b4b300abadd281265e4b2
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Secures content-app headers consistently. #8325 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/b75a9bb7e0da166d759b4b300abadd281265e4b2/pr-8325
    
  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.

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