Skip to content

fix(deps): backport security fixes to 1.2 for 1.2.1 - #1507

Merged
reitblatt merged 9 commits into
release/1.2from
reitblatt/backport-1.2.1-security
Oct 31, 2026
Merged

reitblatt merged 9 commits into
release/1.2from
reitblatt/backport-1.2.1-security

Conversation

@reitblatt

@reitblatt reitblatt commented Oct 31, 2026 •

Copy link
Copy Markdown
Contributor

Context & Requests for Reviewers

Instead of cutting the patch release directly from main, I'm creating a patch branch off of the 1.2.0 release tag, and cherry-picking just the security PRs. This is more work up front, but it makes the patch release a true patch release (lot of changes in main this week!), and when we move to regular security releases, this is the 'right' way (please, debate me!).

Each commit is a cherry-pick of a merged PR from main, except where noted:

Every package version this changes from 1.2.0 is the version main has. The only lockfile conflict was express's dependency list in be861dbf, which was resolved to keep 1.2.0's express 5.2.1 with body-parser 2.4.0. pnpm install leaves the result unchanged. The @storybook/react bumps in #1463 aren't included; the storybook fix is in #1458.

Not backported: the @tiptap/core 2.x advisory. There's no patched 2.x release, and main fixed it with the TipTap v3 migration (#1400), which is more than I'm comfortable pulling into a patch release ATM.

Tests

  • pnpm install --frozen-lockfile && pnpm run prettier: pass
  • pnpm run generate leaves the tree clean: pass
  • server typecheck, lint, build: pass
  • client lint, build: pass
  • pnpm --filter client test: 307 passed, 2 skipped
  • docker compose run --rm --build test: 129 files, 1294 tests passed, 7 skipped, 1 todo
  • docker build hma/ pulls the pinned digest and builds
  • pnpm audit: no advisories that main has fixed remain, apart from tiptap as explained above

(Optional) Rollout Plan

After merge, tag 1.2.1 from release/1.2 and publish the release. Then forward-port the ## [1.2.1] changelog section to main.

Checklist

Only check items that apply to this PR; leave the rest unchecked.

  • If you changed anything user-facing (i.e. user interface or APIs):
    Did you update related docs?

  • If the change is notable (refer to Keep a Changelog conventions):
    Did you update CHANGELOG.md?

  • If you changed db/src/scripts/** and used CREATE TABLE, ADD COLUMN, or ALTER COLUMN:
    Are as many columns marked NOT NULL as possible? If some columns can sometimes be null depending on other columns, are there CHECK constraints capturing those relationships, and are these also reflected using unions in the associated Kysely types?

  • If you added a new signal in server/services/signalsService/signals/**:
    Did you classify every error case as a permanent error (SignalPermanentError, no retry) or a normal error (retryable)? Any case where the signal can't determine a score should be a SignalPermanentError.

dependabot Bot and others added 9 commits October 31, 2026 01:21
Bumps the docker-images group with 1 update in the /hma directory: facebook/threatexchange/hma.

Updates `facebook/threatexchange/hma` from 1.2.0 to 1.2.1

---
updated-dependencies:
- dependency-name: facebook/threatexchange/hma
  dependency-version: 1.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: docker-images
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit ac8e913)
Bumps [storybook](https://github.com/storybookjs/storybook/tree/HEAD/code/core) from 9.1.20 to 9.1.21.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v9.1.21/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v9.1.21/code/core)

---
updated-dependencies:
- dependency-name: storybook
  dependency-version: 9.1.21
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 524de27)
Bumps the npm-prod-security group with 1 update in the / directory: [markdown-it](https://github.com/markdown-it/markdown-it).

Updates `markdown-it` from 14.3.2 to 14.3.3
- [Changelog](https://github.com/markdown-it/markdown-it/blob/14.3.3/CHANGELOG.md)
- [Commits](markdown-it/markdown-it@14.3.2...14.3.3)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-version: 14.3.3
  dependency-type: indirect
  dependency-group: npm-prod-security
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 7fee15a)
…1457)

Lockfile-only refresh:
- follow-redirects 1.16.0 -> 1.16.1 (GHSA-8r9p-f939-6h3c, GHSA-q3jh-wrc6-jgq8)
- markdown-it 14.3.2 -> 14.3.3 (GHSA-gfr2-rv44-r23c, GHSA-vfgh-jcmw-g37q)

Co-authored-by: claude-agent <claude-agent@devserver.reitblatt.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit a0f504f)
* [HMA] Update image reference due to org name change

* rename other references in docs

(cherry picked from commit d972d45)
Co-authored-by: Claude <noreply@anthropic.com>
(cherry picked from commit be861db)
…1503)

* docs: point create-react-app link at react org and log HMA image fix

create-react-app moved from facebook/ to react/, not meta/, so the link
rewritten in #1498 404s. Also add the missing CHANGELOG entry for the HMA
base image move, since 1.2.0 ships the dead ghcr.io/facebook path.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* build(hma): pin base image by digest

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: claude-agent <claude-agent@devserver.reitblatt.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 547fcdc)
Takes the undici update from #1464 (the npm-prod group) without the
group's other, non-security updates. Same specifier and version as main.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@reitblatt
reitblatt force-pushed the reitblatt/backport-1.2.1-security branch from f4c6102 to 71375c1 Compare October 31, 2026 01:28
@reitblatt
reitblatt marked this pull request as ready for review October 31, 2026 01:34
@reitblatt
reitblatt requested review from a team as code owners October 31, 2026 01:34

@cubic-dev-ai cubic-dev-ai Bot 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.

No issues found across 9 files

View guided diff | Turn on auto-fix | Re-trigger cubic

@reitblatt
reitblatt merged commit aa4dfb7 into release/1.2 Oct 31, 2026
13 checks passed
@reitblatt
reitblatt deleted the reitblatt/backport-1.2.1-security branch October 31, 2026 01:36
@reitblatt
reitblatt restored the reitblatt/backport-1.2.1-security branch October 31, 2026 01:38
@reitblatt
reitblatt deleted the reitblatt/backport-1.2.1-security branch October 31, 2026 01:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants