Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/neverinfamous/d1-manager/compare/v2.6.5...HEAD)
## [Unreleased](https://github.com/neverinfamous/d1-manager/compare/v2.6.6...HEAD)

## [2.6.6](https://github.com/neverinfamous/d1-manager/releases/tag/v2.6.6) - 2026-04-06

### Security

- Added manual patching for `picomatch@4.0.4` in `Dockerfile` to remediate Docker Scout failure on `CVE-2026-33671` traversing from `npm` bundled `tinyglobby` tree.

## [2.6.5](https://github.com/neverinfamous/d1-manager/releases/tag/v2.6.5) - 2026-04-06

Expand Down
14 changes: 12 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@ WORKDIR /app
RUN npm install -g npm@latest

# Patch npm's own dependencies to fix CVE-2025-64756 (glob), CVE-2026-23745, CVE-2026-23950, CVE-2026-24842, CVE-2026-26960 (tar), GHSA-7h2j-956f-4vf2 (@isaacs/brace-expansion), CVE-2026-27903, CVE-2026-27904 (minimatch)
# npm@11.6.2 bundles vulnerable versions glob@11.0.3, glob@10.4.5 (in node-gyp), tar@7.5.1, @isaacs/brace-expansion@5.0.0, minimatch@10.2.2
# Recent npm versions bundle vulnerable versions glob@11.0.3, glob@10.4.5 (in node-gyp), tar@7.5.1, @isaacs/brace-expansion@5.0.0, minimatch@10.2.2, picomatch@4.0.3
# We download patched versions first, then replace all vulnerable ones
RUN cd /tmp && \
npm pack glob@11.1.0 && \
npm pack tar@7.5.13 && \
npm pack @isaacs/brace-expansion@5.0.1 && \
npm pack minimatch@10.2.5 && \
npm pack picomatch@4.0.4 && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/glob && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/tar && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/@isaacs/brace-expansion && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/node-gyp/node_modules/glob && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/minimatch && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/tinyglobby/node_modules/picomatch && \
tar -xzf glob-11.1.0.tgz && \
cp -r package /usr/local/lib/node_modules/npm/node_modules/glob && \
(mkdir -p /usr/local/lib/node_modules/npm/node_modules/node-gyp/node_modules && \
Expand All @@ -39,6 +41,9 @@ RUN cd /tmp && \
mv package /usr/local/lib/node_modules/npm/node_modules/@isaacs/brace-expansion && \
tar -xzf minimatch-10.2.5.tgz && \
mv package /usr/local/lib/node_modules/npm/node_modules/minimatch && \
tar -xzf picomatch-4.0.4.tgz && \
mkdir -p /usr/local/lib/node_modules/npm/node_modules/tinyglobby/node_modules && \
mv package /usr/local/lib/node_modules/npm/node_modules/tinyglobby/node_modules/picomatch && \
rm -rf /tmp/*

# Install build dependencies
Expand Down Expand Up @@ -70,18 +75,20 @@ WORKDIR /app
RUN npm install -g npm@latest

# Patch npm's own dependencies to fix CVE-2025-64756 (glob), CVE-2026-23745, CVE-2026-23950, CVE-2026-24842, CVE-2026-26960 (tar), GHSA-7h2j-956f-4vf2 (@isaacs/brace-expansion), CVE-2026-27903, CVE-2026-27904 (minimatch)
# npm@11.6.2 bundles vulnerable versions glob@11.0.3, glob@10.4.5 (in node-gyp), tar@7.5.1, @isaacs/brace-expansion@5.0.0, minimatch@10.2.2
# Recent npm versions bundle vulnerable versions glob@11.0.3, glob@10.4.5 (in node-gyp), tar@7.5.1, @isaacs/brace-expansion@5.0.0, minimatch@10.2.2, picomatch@4.0.3
# We download patched versions first, then replace all vulnerable ones
RUN cd /tmp && \
npm pack glob@11.1.0 && \
npm pack tar@7.5.13 && \
npm pack @isaacs/brace-expansion@5.0.1 && \
npm pack minimatch@10.2.5 && \
npm pack picomatch@4.0.4 && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/glob && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/tar && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/@isaacs/brace-expansion && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/node-gyp/node_modules/glob && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/minimatch && \
rm -rf /usr/local/lib/node_modules/npm/node_modules/tinyglobby/node_modules/picomatch && \
tar -xzf glob-11.1.0.tgz && \
cp -r package /usr/local/lib/node_modules/npm/node_modules/glob && \
(mkdir -p /usr/local/lib/node_modules/npm/node_modules/node-gyp/node_modules && \
Expand All @@ -93,6 +100,9 @@ RUN cd /tmp && \
mv package /usr/local/lib/node_modules/npm/node_modules/@isaacs/brace-expansion && \
tar -xzf minimatch-10.2.5.tgz && \
mv package /usr/local/lib/node_modules/npm/node_modules/minimatch && \
tar -xzf picomatch-4.0.4.tgz && \
mkdir -p /usr/local/lib/node_modules/npm/node_modules/tinyglobby/node_modules && \
mv package /usr/local/lib/node_modules/npm/node_modules/tinyglobby/node_modules/picomatch && \
rm -rf /tmp/*

# Install runtime dependencies and upgrade to fix CVEs
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "d1-manager",
"private": true,
"version": "2.6.5",
"version": "2.6.6",
"type": "module",
"engines": {
"node": ">=24.0.0"
Expand Down
19 changes: 19 additions & 0 deletions releases/v2.6.6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# D1-Manager v2.6.6

## Highlights

- **Security Patch (Docker Build)**: Remediated Docker Scout action failure related to CVE-2026-33671 (picomatch).

## Security

- **picomatch:** Bumped to `4.0.4` across Docker image layers by manually patching the npm CLI's bundled `tinyglobby` dependency to resolve inefficient regex complexity issues.

---

**Full Changelog**: [v2.6.5...v2.6.6](https://github.com/neverinfamous/d1-manager/compare/v2.6.5...v2.6.6)

To spin up this version:

```bash
docker pull neverinfamous/d1-manager:v2.6.6
```
Loading