Prep for v2.0.0 release (#25)

This fixes a high-severity security vulnerability in the `braces` library.

.github/workflows/ci.yml

@@ -6,10 +6,16 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Create npm configuration
-      - uses: actions/setup-node@v3
+        run: echo "//npm.pkg.github.com/:_authToken=${token}" >> ~/.npmrc
+        env:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version-file: '.nvmrc'
+          cache: 'npm'
       - run: npm ci
 # octokit types problem ?
 #      - run: npm run lint

.npmrc

@@ -1 +1 @@
-@actions-rs:registry=https://npm.pkg.github.com
+@clechasseur:registry=https://npm.pkg.github.com

.nvmrc

@@ -1 +1 @@
-v16
+v20

CHANGELOG.md

@@ -5,6 +5,18 @@ 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.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2023-04-04
+
+### Fixed
+
+- Corrected reporting on `unsound` and `notice` informationals
+
+## [1.4.0] - 2023-04-04
+
+### Fixed
+
+- Reflect change to enable warning on `unsound` and `notice` informationals
+
 ## [1.3.2] - 2023-03-13
 
 ### Changed

README.md

@@ -26,8 +26,8 @@ jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: rustsec/audit-check@v1
+      - uses: rustsec/audit-check@v1.4.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 ```
@@ -86,8 +86,8 @@ jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions-rs/audit-check@v1
+      - uses: rustsec/audit-check@v1.4.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 ```
@@ -104,5 +104,6 @@ For each new advisory (including informal) an issue will be created:
 | ------------| -------- | ---------------------------------------------------------------------------| ------ | --------|
 | `token`     | ✓        | [GitHub token], usually a `${{ secrets.GITHUB_TOKEN }}`                    | string |         |
 | `ignore`    |          | Comma-separated list of advisory ids to ignore                             | string |         |
+| `working-directory`|   | The directory of the Cargo.toml / Cargo.lock files to scan.                | string | `.`     |
 
 [GitHub token]: https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token

action.yml

@@ -11,7 +11,11 @@ inputs:
   ignore:
     description: Comma-separated list of advisory ids to ignore
     required: false
+  working-directory:
+    description: The directory of the Cargo.toml / Cargo.lock files to scan.
+    required: false
+    default: .
 
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'

package.json

@@ -1,6 +1,6 @@
 {
     "name": "rust-audit-check",
-    "version": "1.3.2",
+    "version": "2.0.0",
     "private": false,
     "description": "Security audit for security vulnerabilities",
     "main": "lib/main.js",
@@ -34,26 +34,22 @@
         "url": "https://github.com/actions-rs/audit-check/issues"
     },
     "dependencies": {
-        "@rinse-repeat/actions-rs-core": "0.1.8",
+        "@clechasseur/rs-actions-core": "^3.0.5",
-        "@actions/core": "^1.2.6",
+        "nunjucks": "^3.2.4"
-        "@actions/github": "^5.1.0",
-        "npm-check-updates": "^16.8.0",
-        "nunjucks": "^3.2.3"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.56.0",
+        "@typescript-eslint/parser": "^6.21.0",
-        "ts-node": "^10.9.1",
+        "@typescript-eslint/eslint-plugin": "^6.21.0",
-        "@typescript-eslint/parser": "^5.56.0",
+        "ts-node": "^10.9.2",
-        "eslint": "^8.36.0",
+        "eslint": "^8.56.0",
-        "eslint-config-prettier": "^6.11.0",
+        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^3.1.3",
+        "eslint-plugin-prettier": "^5.1.3",
-        "@types/jest": "^26.0.1",
+        "@types/jest": "^29.5.12",
-        "@types/node": "^16.11.7",
+        "@types/node": "^20.11.17",
-        "@vincentriemer/ncc": "^0.20.5",
+        "@vercel/ncc": "0.38.1",
-        "jest": "^26.0.1",
+        "jest": "^29.7.0",
-        "jest-circus": "^26.0.1",
+        "ts-jest": "^29.1.2",
-        "ts-jest": "^26.0.1",
+        "typescript": "^5.3.3",
-        "typescript": "^3.8.3",
+        "prettier": "^3.2.5"
-        "prettier": "^2.0.5"
     }
 }

src/input.ts

@@ -2,18 +2,19 @@
  * Parse action input into a some proper thing.
  */
 
-import { input } from '@rinse-repeat/actions-rs-core';
+import { input } from '@clechasseur/rs-actions-core';
-import { getInputList } from '@rinse-repeat/actions-rs-core/dist/input';
 
 // Parsed action input
 export interface Input {
     token: string;
     ignore: string[];
+    workingDirectory: string;
 }
 
 export function get(): Input {
     return {
         token: input.getInput('token', { required: true }),
-        ignore: getInputList('ignore', { required: false }),
+        ignore: input.getInputList('ignore', { required: false }),
+        workingDirectory: input.getInput('working-directory', { required: false }) ?? '.',
     };
 }

src/main.ts

@@ -4,7 +4,7 @@ import * as os from 'os';
 import * as core from '@actions/core';
 import * as github from '@actions/github';
 
-import { Cargo } from '@rinse-repeat/actions-rs-core';
+import { Cargo } from '@clechasseur/rs-actions-core';
 
 import * as input from './input';
 import * as interfaces from './interfaces';
@@ -12,12 +12,11 @@ import * as reporter from './reporter';
 
 async function getData(
     ignore: string[] | undefined,
+    workingDirectory: string,
 ): Promise<interfaces.Report> {
     const cargo = await Cargo.get();
     await cargo.findOrInstall('cargo-audit');
 
-    await cargo.call(['generate-lockfile']);
-
     let stdout = '';
     try {
         core.startGroup('Calling cargo-audit (JSON output)');
@@ -26,6 +25,7 @@ async function getData(
             commandArray.push('--ignore', item);
         }
         commandArray.push('--json');
+        commandArray.push('--file', `${workingDirectory}/Cargo.lock`);
         await cargo.call(commandArray, {
             ignoreReturnCode: true,
             listeners: {
@@ -46,9 +46,17 @@ async function getData(
     return JSON.parse(stdout);
 }
 
+function removeTrailingSlash(str) {
+    if (str[str.length - 1] === '/') {
+        return str.substr(0, str.length - 1);
+    }
+    return str;
+}
+
 export async function run(actionInput: input.Input): Promise<void> {
     const ignore = actionInput.ignore;
-    const report = await getData(ignore);
+    const workingDirectory = removeTrailingSlash(actionInput.workingDirectory);
+    const report = await getData(ignore, workingDirectory);
     let shouldReport = false;
     if (!report.vulnerabilities.found) {
         core.info('No vulnerabilities were found');
@@ -100,7 +108,7 @@ async function main(): Promise<void> {
         const actionInput = input.get();
         await run(actionInput);
     } catch (error) {
-        core.setFailed(error.message);
+        core.setFailed((error as Error).message);
     }
 
     return;

src/reporter.ts

@@ -4,7 +4,7 @@ import * as core from '@actions/core';
 import * as github from '@actions/github';
 import * as nunjucks from 'nunjucks';
 
-import { checks } from '@rinse-repeat/actions-rs-core';
+import { checks } from '@clechasseur/rs-actions-core';
 import * as interfaces from './interfaces';
 import * as templates from './templates';
 
@@ -15,6 +15,7 @@ interface Stats {
     critical: number;
     notices: number;
     unmaintained: number;
+    unsound: number;
     other: number;
 }
 
@@ -89,6 +90,7 @@ function getStats(
     let critical = 0;
     let notices = 0;
     let unmaintained = 0;
+    let unsound = 0;
     let other = 0;
     for (const vulnerability of vulnerabilities) {
         switch (vulnerability.advisory.informational) {
@@ -98,6 +100,9 @@ function getStats(
             case 'unmaintained':
                 unmaintained += 1;
                 break;
+            case 'unsound':
+                unsound += 1;
+                break;
             case null:
                 critical += 1;
                 break;
@@ -113,6 +118,10 @@ function getStats(
                 unmaintained += 1;
                 break;
 
+            case 'unsound':
+                unsound += 1;
+                break;
+
             default:
                 // Both yanked and informational types of kind
                 other += 1;
@@ -124,6 +133,7 @@ function getStats(
         critical: critical,
         notices: notices,
         unmaintained: unmaintained,
+        unsound: unsound,
         other: other,
     };
 }
@@ -132,8 +142,7 @@ function getSummary(stats: Stats): string {
     const blocks: string[] = [];
 
     if (stats.critical > 0) {
-        // TODO: Plural
+        blocks.push(`${stats.critical} advisories`);
-        blocks.push(`${stats.critical} advisory(ies)`);
     }
     if (stats.notices > 0) {
         blocks.push(`${stats.notices} notice${plural(stats.notices)}`);
@@ -141,6 +150,9 @@ function getSummary(stats: Stats): string {
     if (stats.unmaintained > 0) {
         blocks.push(`${stats.unmaintained} unmaintained`);
     }
+    if (stats.unsound > 0) {
+        blocks.push(`${stats.unsound} unsound`);
+    }
     if (stats.other > 0) {
         blocks.push(`${stats.other} other`);
     }
@@ -275,6 +287,8 @@ export async function reportIssues(
     for (const warning of warnings) {
         let advisory: interfaces.Advisory;
         switch (warning.kind) {
+            case 'unsound':
+            case 'notice':
             case 'unmaintained':
             case 'informational':
                 advisory = warning.advisory;