@node-core/utils 5.2.1 → 5.3.1

package/components/git/security.js

@@ -39,6 +39,10 @@ const securityOptions = {
   'request-cve': {
     describe: 'Request CVEs for a security release',
     type: 'boolean'
+  },
+  'post-release': {
+    describe: 'Create the post-release announcement',
+    type: 'boolean'
   }
 };
 
@@ -49,7 +53,8 @@ export function builder(yargs) {
   return yargs.options(securityOptions)
     .example(
       'git node security --start',
-      'Prepare a security release of Node.js')
+      'Prepare a security release of Node.js'
+    )
     .example(
       'git node security --sync',
       'Synchronize an ongoing security release with HackerOne'
@@ -57,26 +62,25 @@ export function builder(yargs) {
     .example(
       'git node security --update-date=YYYY/MM/DD',
       'Updates the target date of the security release'
-    )
-    .example(
+    ).example(
       'git node security --add-report=H1-ID',
       'Fetches HackerOne report based on ID provided and adds it into vulnerabilities.json'
-    )
-    .example(
+    ).example(
       'git node security --remove-report=H1-ID',
       'Removes the Hackerone report based on ID provided from vulnerabilities.json'
-    )
-    .example(
-      'git node security --pre-release' +
+    ).example(
+      'git node security --pre-release',
       'Create the pre-release announcement on the Nodejs.org repo'
     ).example(
-      'git node security --notify-pre-release' +
+      'git node security --notify-pre-release',
       'Notifies the community about the security release'
-    )
-    .example(
+    ).example(
       'git node security --request-cve',
       'Request CVEs for a security release of Node.js based on' +
       ' the next-security-release/vulnerabilities.json'
+    ).example(
+      'git node security --post-release',
+      'Create the post-release announcement on the Nodejs.org repo'
     );
 }
 
@@ -105,6 +109,9 @@ export function handler(argv) {
   if (argv['request-cve']) {
     return requestCVEs(argv);
   }
+  if (argv['post-release']) {
+    return createPostRelease(argv);
+  }
   yargsInstance.showHelp();
 }
 
@@ -146,7 +153,14 @@ async function requestCVEs() {
   return hackerOneCve.requestCVEs();
 }
 
-async function startSecurityRelease(argv) {
+async function createPostRelease() {
+  const logStream = process.stdout.isTTY ? process.stdout : process.stderr;
+  const cli = new CLI(logStream);
+  const blog = new SecurityBlog(cli);
+  return blog.createPostRelease();
+}
+
+async function startSecurityRelease() {
   const logStream = process.stdout.isTTY ? process.stdout : process.stderr;
   const cli = new CLI(logStream);
   const release = new PrepareSecurityRelease(cli);

package/lib/github/templates/security-post-release.md

@@ -0,0 +1,18 @@
+---
+date: %ANNOUNCEMENT_DATE%
+category: vulnerability
+title: %RELEASE_DATE% Security Releases
+slug: %SLUG%
+layout: blog-post
+author: %AUTHOR%
+---
+
+## Security releases available
+
+Updates are now available for the %AFFECTED_VERSIONS% Node.js release lines for the
+following issues.
+%DEPENDENCY_UPDATES%
+%REPORTS%
+## Downloads and release details
+
+%DOWNLOADS%

package/lib/github/templates/security-pre-release.md

@@ -13,7 +13,7 @@ The Node.js project will release new versions of the %AFFECTED_VERSIONS%
 releases lines on or shortly after, %RELEASE_DATE% in order to address:
 
 %VULNERABILITIES%
-%OPENSSL_UPDATES%
+
 ## Impact
 
 %IMPACT%
@@ -28,7 +28,7 @@ Releases will be available on, or shortly after, %RELEASE_DATE%.
 
 ## Contact and future updates
 
-The current Node.js security policy can be found at https://nodejs.org/en/security/.
-Please follow the process outlined in https://github.com/nodejs/node/blob/master/SECURITY.md if you wish to report a vulnerability in Node.js.
+The current Node.js security policy can be found at <https://nodejs.org/en/security/>.
+Please follow the process outlined in <https://github.com/nodejs/node/blob/master/SECURITY.md> if you wish to report a vulnerability in Node.js.
 
-Subscribe to the low-volume announcement-only nodejs-sec mailing list at https://groups.google.com/forum/#!forum/nodejs-sec to stay up to date on security vulnerabilities and security-related releases of Node.js and the projects maintained in the nodejs GitHub organization.
+Subscribe to the low-volume announcement-only nodejs-sec mailing list at <https://groups.google.com/forum/#!forum/nodejs-sec> to stay up to date on security vulnerabilities and security-related releases of Node.js and the projects maintained in the nodejs GitHub organization.

package/lib/prepare_release.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { promises as fs } from 'node:fs';
 
 import semver from 'semver';
-import replace from 'replace-in-file';
+import { replaceInFile } from 'replace-in-file';
 
 import { getMergedConfig } from './config.js';
 import { runAsync, runSync } from './run.js';
@@ -427,7 +427,7 @@ export default class ReleasePreparation {
   async updateREPLACEMEs() {
     const { newVersion } = this;
 
-    await replace({
+    await replaceInFile({
       files: 'doc/api/*.md',
       from: /REPLACEME/g,
       to: `v${newVersion}`

package/lib/security-announcement.js

@@ -53,7 +53,7 @@ export default class SecurityAnnouncement {
     };
 
     const { title, content } = this.createPreleaseAnnouncementIssue(releaseDate, 'build');
-    await this.createIssue(title, content, repository);
+    await createIssue(title, content, repository, { cli: this.cli, req: this.req });
   }
 
   createPreleaseAnnouncementIssue(releaseDate, team) {
@@ -71,6 +71,6 @@ export default class SecurityAnnouncement {
     };
 
     const { title, content } = this.createPreleaseAnnouncementIssue(releaseDate, 'docker');
-    await createIssue(title, content, repository, { cli: this.cli, repository: this.repository });
+    await createIssue(title, content, repository, { cli: this.cli, req: this.req });
   }
 }

package/lib/security-release/security-release.js

@@ -20,9 +20,12 @@ export const PLACEHOLDERS = {
   annoucementDate: '%ANNOUNCEMENT_DATE%',
   slug: '%SLUG%',
   affectedVersions: '%AFFECTED_VERSIONS%',
-  openSSLUpdate: '%OPENSSL_UPDATES%',
   impact: '%IMPACT%',
-  vulnerabilities: '%VULNERABILITIES%'
+  vulnerabilities: '%VULNERABILITIES%',
+  reports: '%REPORTS%',
+  author: '%AUTHOR%',
+  dependencyUpdates: '%DEPENDENCY_UPDATES%',
+  downloads: '%DOWNLOADS%'
 };
 
 export function checkRemote(cli, repository) {

package/lib/security_blog.js

@@ -1,16 +1,24 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import _ from 'lodash';
+import nv from '@pkgjs/nv';
 import {
   PLACEHOLDERS,
   getVulnerabilitiesJSON,
   checkoutOnSecurityReleaseBranch,
   NEXT_SECURITY_RELEASE_REPOSITORY,
-  validateDate
+  validateDate,
+  commitAndPushVulnerabilitiesJSON,
+  NEXT_SECURITY_RELEASE_FOLDER
 } from './security-release/security-release.js';
+import auth from './auth.js';
+import Request from './request.js';
+
+const kChanged = Symbol('changed');
 
 export default class SecurityBlog {
   repository = NEXT_SECURITY_RELEASE_REPOSITORY;
+  req;
   constructor(cli) {
     this.cli = cli;
   }
@@ -40,8 +48,7 @@ export default class SecurityBlog {
       affectedVersions: this.getAffectedVersions(content),
       vulnerabilities: this.getVulnerabilities(content),
       slug: this.getSlug(releaseDate),
-      impact: this.getImpact(content),
-      openSSLUpdate: await this.promptOpenSSLUpdate(cli)
+      impact: this.getImpact(content)
     };
     const month = releaseDate.toLocaleString('en-US', { month: 'long' }).toLowerCase();
     const year = releaseDate.getFullYear();
@@ -52,9 +59,94 @@ export default class SecurityBlog {
     cli.ok(`Pre-release announcement file created at ${file}`);
   }
 
-  promptOpenSSLUpdate(cli) {
-    return cli.prompt('Does this security release containt OpenSSL updates?', {
-      defaultAnswer: true
+  async createPostRelease() {
+    const { cli } = this;
+    const credentials = await auth({
+      github: true,
+      h1: true
+    });
+
+    this.req = new Request(credentials);
+
+    // checkout on security release branch
+    checkoutOnSecurityReleaseBranch(cli, this.repository);
+
+    // read vulnerabilities JSON file
+    const content = getVulnerabilitiesJSON(cli);
+    if (!content.releaseDate) {
+      cli.error('Release date is not set in vulnerabilities.json,' +
+        ' run `git node security --update-date=YYYY/MM/DD` to set the release date.');
+      process.exit(1);
+    }
+
+    validateDate(content.releaseDate);
+    const releaseDate = new Date(content.releaseDate);
+    const template = this.getSecurityPostReleaseTemplate();
+    const data = {
+      // TODO: read from pre-sec-release
+      annoucementDate: await this.getAnnouncementDate(cli),
+      releaseDate: this.formatReleaseDate(releaseDate),
+      affectedVersions: this.getAffectedVersions(content),
+      vulnerabilities: this.getVulnerabilities(content),
+      slug: this.getSlug(releaseDate),
+      author: await this.promptAuthor(cli),
+      dependencyUpdates: content.dependencies
+    };
+    const postReleaseContent = await this.buildPostRelease(template, data, content);
+
+    const pathPreRelease = await this.promptExistingPreRelease(cli);
+    // read the existing pre-release announcement
+    let preReleaseContent = fs.readFileSync(pathPreRelease, 'utf-8');
+    // cut the part before summary
+    const preSummary = preReleaseContent.indexOf('# Summary');
+    if (preSummary !== -1) {
+      preReleaseContent = preReleaseContent.substring(preSummary);
+    }
+
+    const updatedContent = postReleaseContent + preReleaseContent;
+
+    fs.writeFileSync(pathPreRelease, updatedContent);
+    cli.ok(`Post-release announcement file updated at ${pathPreRelease}`);
+
+    // if the vulnerabilities.json has been changed, update the file
+    if (!content[kChanged]) return;
+    this.updateVulnerabilitiesJSON(content);
+  }
+
+  updateVulnerabilitiesJSON(content) {
+    try {
+      this.cli.info('Updating vulnerabilities.json');
+      const vulnerabilitiesJSONPath = path.join(process.cwd(),
+        NEXT_SECURITY_RELEASE_FOLDER, 'vulnerabilities.json');
+      fs.writeFileSync(vulnerabilitiesJSONPath, JSON.stringify(content, null, 2));
+      const commitMessage = 'chore: updated vulnerabilities.json';
+      commitAndPushVulnerabilitiesJSON(vulnerabilitiesJSONPath,
+        commitMessage,
+        { cli: this.cli, repository: this.repository });
+    } catch (error) {
+      this.cli.error('Error updating vulnerabilities.json');
+      this.cli.error(error);
+    }
+  }
+
+  async promptExistingPreRelease(cli) {
+    const pathPreRelease = await cli.prompt(
+      'Please provide the path of the existing pre-release announcement:', {
+        questionType: 'input',
+        defaultAnswer: ''
+      });
+
+    if (!pathPreRelease || !fs.existsSync(path.resolve(pathPreRelease))) {
+      return this.promptExistingPreRelease(cli);
+    }
+    return pathPreRelease;
+  }
+
+  promptAuthor(cli) {
+    return cli.prompt('Who is the author of this security release? If multiple' +
+      ' use & as separator', {
+      questionType: 'input',
+      defaultAnswer: PLACEHOLDERS.author
     });
   }
 
@@ -69,6 +161,23 @@ export default class SecurityBlog {
   }
 
   buildPreRelease(template, data) {
+    const {
+      annoucementDate,
+      releaseDate,
+      affectedVersions,
+      vulnerabilities,
+      slug,
+      impact
+    } = data;
+    return template.replaceAll(PLACEHOLDERS.annoucementDate, annoucementDate)
+      .replaceAll(PLACEHOLDERS.slug, slug)
+      .replaceAll(PLACEHOLDERS.affectedVersions, affectedVersions)
+      .replaceAll(PLACEHOLDERS.vulnerabilities, vulnerabilities)
+      .replaceAll(PLACEHOLDERS.releaseDate, releaseDate)
+      .replaceAll(PLACEHOLDERS.impact, impact);
+  }
+
+  async buildPostRelease(template, data, content) {
     const {
       annoucementDate,
       releaseDate,
@@ -76,7 +185,8 @@ export default class SecurityBlog {
       vulnerabilities,
       slug,
       impact,
-      openSSLUpdate
+      author,
+      dependencyUpdates
     } = data;
     return template.replaceAll(PLACEHOLDERS.annoucementDate, annoucementDate)
       .replaceAll(PLACEHOLDERS.slug, slug)
@@ -84,15 +194,68 @@ export default class SecurityBlog {
       .replaceAll(PLACEHOLDERS.vulnerabilities, vulnerabilities)
       .replaceAll(PLACEHOLDERS.releaseDate, releaseDate)
       .replaceAll(PLACEHOLDERS.impact, impact)
-      .replaceAll(PLACEHOLDERS.openSSLUpdate, this.getOpenSSLUpdateTemplate(openSSLUpdate));
+      .replaceAll(PLACEHOLDERS.author, author)
+      .replaceAll(PLACEHOLDERS.reports, await this.getReportsTemplate(content))
+      .replaceAll(PLACEHOLDERS.dependencyUpdates,
+        this.getDependencyUpdatesTemplate(dependencyUpdates))
+      .replaceAll(PLACEHOLDERS.downloads, await this.getDownloadsTemplate(affectedVersions));
+  }
+
+  async getReportsTemplate(content) {
+    const reports = content.reports;
+    let template = '';
+    for (const report of reports) {
+      const cveId = report.cveIds?.join(', ');
+      if (!cveId) {
+        this.cli.error(`CVE ID for vulnerability ${report.link} ${report.title} not found`);
+        process.exit(1);
+      }
+      template += `## ${report.title} (${cveId}) - (${report.severity.rating})\n\n`;
+      if (!report.summary) {
+        this.cli.error(`Summary missing for vulnerability ${report.link} ` +
+        `${report.title}. Please create it before continuing.`);
+        process.exit(1);
+      }
+
+      template += `${report.summary}\n\n`;
+      const releaseLines = report.affectedVersions.join(', ');
+      template += `Impact:\n\n- This vulnerability affects all users\
+ in active release lines: ${releaseLines}\n\n`;
+      if (!report.patchAuthors) {
+        this.cli.error(`Missing patch author for vulnerability ${report.link} ${report.title}`);
+        process.exit(1);
+      }
+      template += `Thank you, to ${report.reporter} for reporting this vulnerability\
+ and thank you ${report.patchAuthors.join(' and ')} for fixing it.\n\n`;
+    }
+    return template;
   }
 
-  getOpenSSLUpdateTemplate(openSSLUpdate) {
-    if (openSSLUpdate) {
-      return '\n## OpenSSL Security updates\n\n' +
-        'This security release includes OpenSSL security updates\n';
+  getDependencyUpdatesTemplate(dependencyUpdates) {
+    if (!dependencyUpdates) return '';
+    let template = 'This security release includes the following dependency' +
+      ' updates to address public vulnerabilities:\n\n';
+    for (const dependencyUpdate of Object.values(dependencyUpdates)) {
+      for (const dependency of dependencyUpdate) {
+        const title = dependency.title.substring(dependency.title.indexOf(':') + ':'.length).trim();
+        template += `- ${title}\
+ on ${dependency.affectedVersions.join(', ')}\n`;
+      }
     }
-    return '';
+    return template;
+  }
+
+  async getDownloadsTemplate(affectedVersions) {
+    let template = '';
+    const versionsToBeReleased = (await nv('supported')).filter(
+      (v) => affectedVersions.split(', ').includes(`${v.major}.x`)
+    );
+    for (const version of versionsToBeReleased) {
+      const v = `v${version.major}.${version.minor}.${Number(version.patch) + 1}`;
+      template += `- [Node.js ${v}](/blog/release/${v}/)\n`;
+    }
+
+    return template;
   }
 
   getSlug(releaseDate) {
@@ -179,4 +342,14 @@ export default class SecurityBlog {
       'utf-8'
     );
   }
+
+  getSecurityPostReleaseTemplate() {
+    return fs.readFileSync(
+      new URL(
+        './github/templates/security-post-release.md',
+        import.meta.url
+      ),
+      'utf-8'
+    );
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-core/utils",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "Utilities for Node.js core collaborators",
   "type": "module",
   "engines": {
@@ -34,8 +34,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@listr2/prompt-adapter-enquirer": "^2.0.8",
-    "@node-core/caritat": "^1.3.1",
+    "@listr2/prompt-adapter-enquirer": "^2.0.10",
+    "@node-core/caritat": "^1.6.0",
     "@pkgjs/nv": "^0.2.2",
     "branch-diff": "^3.0.4",
     "chalk": "^5.3.0",
@@ -44,26 +44,26 @@
     "clipboardy": "^4.0.0",
     "core-validate-commit": "^4.0.0",
     "figures": "^6.1.0",
-    "ghauth": "^6.0.4",
-    "inquirer": "^9.2.22",
+    "ghauth": "^6.0.5",
+    "inquirer": "^9.3.2",
     "js-yaml": "^4.1.0",
-    "listr2": "^8.2.1",
+    "listr2": "^8.2.3",
     "lodash": "^4.17.21",
     "log-symbols": "^6.0.0",
     "ora": "^8.0.1",
-    "replace-in-file": "^7.1.0",
-    "undici": "^6.18.0",
+    "replace-in-file": "^8.0.2",
+    "undici": "^6.19.2",
     "which": "^4.0.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
     "@reporters/github": "^1.7.0",
-    "c8": "^9.1.0",
+    "c8": "^10.1.2",
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-promise": "^6.4.0",
     "sinon": "^18.0.0"
   }
 }