@salesforce/plugin-trust 2.5.0-qa.1 → 2.5.0

package/lib/commands/plugins/trust/verify.d.ts

@@ -10,8 +10,8 @@ export declare class Verify extends SfCommand<VerifyResponse> {
     static readonly hidden: true;
     static readonly flags: {
         npm: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        registry: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        registry: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     private static getVerifier;
     run(): Promise<VerifyResponse>;

package/lib/commands/plugins/trust/verify.js

@@ -11,6 +11,7 @@ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const installationVerification_1 = require("../../../shared/installationVerification");
 const NpmName_1 = require("../../../shared/NpmName");
+const errors_1 = require("../../../shared/errors");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-trust', 'verify');
 class Verify extends sf_plugins_core_1.SfCommand {
@@ -42,28 +43,25 @@ class Verify extends sf_plugins_core_1.SfCommand {
             logger.debug(`meta.verified: ${meta.verified}`);
             if (!meta.verified) {
                 const e = messages.createError('FailedDigitalSignatureVerification');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                e.name = 'FailedDigitalSignatureVerification';
-                throw e;
+                throw (0, errors_1.setErrorName)(e, 'FailedDigitalSignatureVerification');
             }
             const message = `Successfully validated digital signature for ${npmName.name}.`;
             if (!flags.json) {
                 vConfig.log(message);
             }
-            else {
-                return { message, verified: true };
-            }
+            return { message, verified: true };
         }
         catch (error) {
-            const err = error;
-            logger.debug(`err reported: ${JSON.stringify(err, null, 4)}`);
+            if (!(error instanceof Error)) {
+                throw error;
+            }
+            logger.debug(`err reported: ${JSON.stringify(error, null, 4)}`);
             const response = {
                 verified: false,
-                message: err.message,
+                message: error.message,
             };
-            if (err.name === 'NotSigned') {
-                let message = err.message;
+            if (error.name === 'NotSigned') {
+                let message = error.message;
                 if (await vConfig.verifier.isAllowListed()) {
                     message = `The plugin [${npmName.name}] is not digitally signed but it is allow-listed.`;
                     vConfig.log(message);
@@ -76,7 +74,7 @@ class Verify extends sf_plugins_core_1.SfCommand {
                 }
                 return response;
             }
-            throw core_1.SfError.wrap(err);
+            throw core_1.SfError.wrap(error);
         }
     }
 }

package/lib/commands/plugins/trust/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/commands/plugins/trust/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/commands/plugins/trust/verify.ts"],"names":[],"mappings":"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"}

package/lib/hooks/jitPluginInstall.js

@@ -11,7 +11,6 @@ const core_1 = require("@salesforce/core");
 const appInsights_1 = require("@salesforce/telemetry/lib/appInsights");
 const hook = async function (opts) {
     try {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         global.cliTelemetry?.record({
             eventName: 'JIT_INSTALL_STARTED',
             type: 'EVENT',
@@ -20,7 +19,6 @@ const hook = async function (opts) {
             command: opts.command.id,
         });
         await opts.config.runCommand('plugins:install', [`${opts.command.pluginName}@${opts.pluginVersion}`]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         global.cliTelemetry?.record({
             eventName: 'JIT_INSTALL_SUCCESS',
             type: 'EVENT',
@@ -30,14 +28,13 @@ const hook = async function (opts) {
         });
     }
     catch (error) {
-        const err = error;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         global.cliTelemetry?.record({
             eventName: 'JIT_INSTALL_FAILED',
             type: 'EVENT',
-            message: err.message,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-            stackTrace: err?.stack?.replace(new RegExp(os.homedir(), 'g'), appInsights_1.AppInsights.GDPR_HIDDEN),
+            message: error instanceof Error ? error.message : 'malformed error',
+            stackTrace: error instanceof Error
+                ? error?.stack?.replace(new RegExp(os.homedir(), 'g'), appInsights_1.AppInsights.GDPR_HIDDEN)
+                : undefined,
             version: opts.pluginVersion,
             plugin: opts.command.pluginName,
             command: opts.command.id,

package/lib/hooks/jitPluginInstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"jitPluginInstall.js","sourceRoot":"","sources":["../../src/hooks/jitPluginInstall.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yBAAyB;AAEzB,2CAA2C;AAE3C,uEAAoE;AAIpE,MAAM,IAAI,GAAqC,KAAK,WAAW,IAAI;IACjE,IAAI;QACF,yGAAyG;QACzG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC;YAC1B,SAAS,EAAE,qBAAqB;YAChC,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAEtG,yGAAyG;QACzG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC;YAC1B,SAAS,EAAE,qBAAqB;YAChC,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;SACzB,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,GAAG,GAAG,KAAc,CAAC;QAE3B,yGAAyG;QACzG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC;YAC1B,SAAS,EAAE,oBAAoB;YAC/B,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,6GAA6G;YAC7G,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,yBAAW,CAAC,WAAW,CAAC;YACvF,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,IAAI,cAAO,CAAC,qBAAqB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,uBAAuB,CAAC,CAAC;KAC5F;AACH,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"jitPluginInstall.js","sourceRoot":"","sources":["../../src/hooks/jitPluginInstall.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yBAAyB;AAEzB,2CAA2C;AAE3C,uEAAoE;AAIpE,MAAM,IAAI,GAAqC,KAAK,WAAW,IAAI;IACjE,IAAI;QACF,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC;YAC1B,SAAS,EAAE,qBAAqB;YAChC,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAEtG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC;YAC1B,SAAS,EAAE,qBAAqB;YAChC,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;SACzB,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC;YAC1B,SAAS,EAAE,oBAAoB;YAC/B,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB;YACnE,UAAU,EACR,KAAK,YAAY,KAAK;gBACpB,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,yBAAW,CAAC,WAAW,CAAC;gBAC/E,CAAC,CAAC,SAAS;YACf,OAAO,EAAE,IAAI,CAAC,aAAa;YAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,IAAI,cAAO,CAAC,qBAAqB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,uBAAuB,CAAC,CAAC;KAC5F;AACH,CAAC,CAAC;AAEF,kBAAe,IAAI,CAAC"}

package/lib/hooks/verifyInstallSignature.d.ts

@@ -1,11 +1,3 @@
 import { Hook } from '@oclif/core';
-import { ConfigContext, VerificationConfig } from '../shared/installationVerification';
-import { NpmName } from '../shared/NpmName';
-/**
- * Build a VerificationConfig. Useful for testing.
- */
-export declare class VerificationConfigBuilder {
-    static build(npmName: NpmName, configContext: ConfigContext): VerificationConfig;
-}
 export declare const hook: Hook.PluginsPreinstall;
 export default hook;

package/lib/hooks/verifyInstallSignature.js

@@ -6,28 +6,18 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hook = exports.VerificationConfigBuilder = void 0;
+exports.hook = void 0;
 const core_1 = require("@salesforce/core");
 const core_2 = require("@oclif/core");
 const installationVerification_1 = require("../shared/installationVerification");
 const NpmName_1 = require("../shared/NpmName");
-/**
- * Build a VerificationConfig. Useful for testing.
- */
-class VerificationConfigBuilder {
-    static build(npmName, configContext) {
-        const vConfig = new installationVerification_1.VerificationConfig();
-        vConfig.verifier = new installationVerification_1.InstallationVerification().setPluginNpmName(npmName).setConfig(configContext);
-        return vConfig;
-    }
-}
-exports.VerificationConfigBuilder = VerificationConfigBuilder;
 const hook = async function (options) {
     if (options.plugin && options.plugin.type === 'npm') {
         const logger = await core_1.Logger.child('verifyInstallSignature');
         const plugin = options.plugin;
         // skip if the plugin version being installed is listed in the CLI's JIT config
         if (plugin.tag &&
+            options.config.pjson.oclif.jitPlugins &&
             plugin.name in options.config.pjson.oclif.jitPlugins &&
             options.config.pjson.oclif.jitPlugins?.[plugin.name] === plugin.tag) {
             logger.debug(`Skipping verification for ${options.plugin.name} because it is listed in the CLI's JIT config.`);
@@ -46,7 +36,7 @@ const hook = async function (options) {
             dataDir: options.config.dataDir,
             cliRoot: options.config.root,
         };
-        const vConfig = VerificationConfigBuilder.build(npmName, configContext);
+        const vConfig = buildVerificationConfig(npmName, configContext);
         logger.debug('finished building the VerificationConfigBuilder');
         try {
             logger.debug('doing verification');
@@ -54,9 +44,11 @@ const hook = async function (options) {
             core_2.ux.log('Finished digital signature check.');
         }
         catch (error) {
-            const err = error;
-            logger.debug(err.message);
-            this.error(err);
+            if (!(error instanceof Error)) {
+                throw error;
+            }
+            logger.debug(error.message);
+            this.error(error);
         }
     }
     else {
@@ -65,4 +57,12 @@ const hook = async function (options) {
 };
 exports.hook = hook;
 exports.default = exports.hook;
+/**
+ * Build a VerificationConfig. Useful for testing.
+ */
+const buildVerificationConfig = (npmName, configContext) => {
+    const vConfig = new installationVerification_1.VerificationConfig();
+    vConfig.verifier = new installationVerification_1.InstallationVerification().setPluginNpmName(npmName).setConfig(configContext);
+    return vConfig;
+};
 //# sourceMappingURL=verifyInstallSignature.js.map

package/lib/hooks/verifyInstallSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyInstallSignature.js","sourceRoot":"","sources":["../../src/hooks/verifyInstallSignature.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyInstallSignature.js","sourceRoot":"","sources":["../../src/hooks/verifyInstallSignature.ts"],"names":[],"mappings":"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"}

package/lib/shared/NpmName.d.ts

@@ -7,8 +7,8 @@
  */
 export declare class NpmName {
     static readonly DEFAULT_TAG = "latest";
-    scope: string;
     tag: string;
+    scope: string;
     name: string;
     /**
      * Private ctor. Use static parse method.

package/lib/shared/NpmName.js

@@ -8,6 +8,7 @@ exports.NpmName = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const core_1 = require("@salesforce/core");
+const errors_1 = require("./errors");
 /**
  * String representing the parsed components of an NpmName
  *
@@ -30,11 +31,7 @@ class NpmName {
      */
     static parse(npmName) {
         if (!npmName || npmName.length < 1) {
-            const err = new core_1.SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'MissingOrInvalidNpmName';
-            throw err;
+            throw (0, errors_1.setErrorName)(new core_1.SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName'), 'MissingOrInvalidNpmName');
         }
         const returnNpmName = new NpmName();
         const components = npmName.split('@');
@@ -75,11 +72,7 @@ class NpmName {
             returnNpmName.name = NpmName.validateComponentString(subComponents[0]);
         }
         else {
-            const err = new core_1.SfError('The npm name is invalid.', 'InvalidNpmName');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'InvalidNpmName';
-            throw err;
+            throw (0, errors_1.setErrorName)(new core_1.SfError('The npm name is invalid.', 'InvalidNpmName'), 'InvalidNpmName');
         }
     }
     /**
@@ -94,11 +87,7 @@ class NpmName {
             return trimmedName;
         }
         else {
-            const err = new core_1.SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'MissingOrInvalidNpmName';
-            throw err;
+            throw (0, errors_1.setErrorName)(new core_1.SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName'), 'MissingOrInvalidNpmName');
         }
     }
     /**

package/lib/shared/NpmName.js.map

@@ -1 +1 @@
-{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/shared/NpmName.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/shared/NpmName.ts"],"names":[],"mappings":"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"}

package/lib/shared/errors.d.ts

@@ -0,0 +1,6 @@
+import { SfError } from '@salesforce/core';
+/**
+ * convenience method for doing something SfError doesn't allow
+ * (explicitly setting the error name)
+ */
+export declare const setErrorName: (err: SfError, name: string) => SfError;

package/lib/shared/errors.js

@@ -0,0 +1,21 @@
+"use strict";
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setErrorName = void 0;
+/**
+ * convenience method for doing something SfError doesn't allow
+ * (explicitly setting the error name)
+ */
+const setErrorName = (err, name) => {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore override readonly .name field
+    err.name = name;
+    return err;
+};
+exports.setErrorName = setErrorName;
+//# sourceMappingURL=errors.js.map

package/lib/shared/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/shared/errors.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;GAGG;AACI,MAAM,YAAY,GAAG,CAAC,GAAY,EAAE,IAAY,EAAW,EAAE;IAClE,6DAA6D;IAC7D,2CAA2C;IAC3C,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB"}

package/lib/shared/installationVerification.d.ts

@@ -3,7 +3,6 @@ import { Readable } from 'stream';
 import { URL } from 'url';
 import { NpmMeta } from '../shared/npmCommand';
 import { NpmName } from './NpmName';
-export declare const ALLOW_LIST_FILENAME = "unsignedPluginAllowList.json";
 export declare const DEFAULT_REGISTRY = "https://registry.npmjs.org/";
 export interface ConfigContext {
     configDir?: string;
@@ -15,10 +14,10 @@ export interface Verifier {
     verify(): Promise<NpmMeta>;
     isAllowListed(): Promise<boolean>;
 }
-export declare class CodeVerifierInfo {
-    private signature;
-    private publicKey;
-    private data;
+declare class CodeVerifierInfo {
+    private signature?;
+    private publicKey?;
+    private data?;
     get dataToVerify(): Readable;
     set dataToVerify(value: Readable);
     get signatureStream(): Readable;
@@ -26,20 +25,15 @@ export declare class CodeVerifierInfo {
     get publicKeyStream(): Readable;
     set publicKeyStream(value: Readable);
 }
-export declare function validSalesforceHostname(url: string | null): boolean;
 export declare function verify(codeVerifierInfo: CodeVerifierInfo): Promise<boolean>;
 export declare const getNpmRegistry: () => URL;
 /**
  * class for verifying a digital signature pack of an npm
  */
 export declare class InstallationVerification implements Verifier {
-    private pluginNpmName;
-    private config;
-    private fsImpl;
-    private readonly readFileAsync;
-    private readonly unlinkAsync;
-    private logger;
-    constructor(fsImpl?: unknown);
+    private pluginNpmName?;
+    private config?;
+    private logger?;
     /**
      * setter for the cli engine config
      *
@@ -57,12 +51,6 @@ export declare class InstallationVerification implements Verifier {
      */
     verify(): Promise<NpmMeta>;
     isAllowListed(): Promise<boolean>;
-    /**
-     * Retrieve url content for a host
-     *
-     * @param url host url.
-     */
-    getSigningContent(url: string): Promise<Readable>;
     /**
      * Downloads the tgz file content and stores it in a cache folder
      */
@@ -76,9 +64,9 @@ export declare class InstallationVerification implements Verifier {
     private getLogger;
 }
 export declare class VerificationConfig {
-    private verifierMember;
-    get verifier(): Verifier;
-    set verifier(value: Verifier);
+    private verifierMember?;
+    get verifier(): Verifier | undefined;
+    set verifier(value: Verifier | undefined);
     log(message: string): void;
 }
 export declare function doPrompt(): Promise<void>;
@@ -86,3 +74,4 @@ export declare function doInstallationCodeSigningVerification(config: ConfigCont
     plugin: string;
     tag: string;
 }, verificationConfig: VerificationConfig): Promise<void>;
+export {};

package/lib/shared/installationVerification.js

@@ -6,30 +6,28 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doInstallationCodeSigningVerification = exports.doPrompt = exports.VerificationConfig = exports.InstallationVerification = exports.getNpmRegistry = exports.verify = exports.validSalesforceHostname = exports.CodeVerifierInfo = exports.DEFAULT_REGISTRY = exports.ALLOW_LIST_FILENAME = void 0;
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+exports.doInstallationCodeSigningVerification = exports.doPrompt = exports.VerificationConfig = exports.InstallationVerification = exports.getNpmRegistry = exports.verify = exports.DEFAULT_REGISTRY = void 0;
 const path = require("path");
 const stream_1 = require("stream");
 const url_1 = require("url");
-const util_1 = require("util");
 const crypto = require("crypto");
 const fs = require("fs");
 const promises_1 = require("fs/promises");
 const core_1 = require("@salesforce/core");
 const got_1 = require("got");
-const ProxyAgent = require("proxy-agent");
-const proxy_from_env_1 = require("proxy-from-env");
+const proxy_agent_1 = require("proxy-agent");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_2 = require("@oclif/core");
 const npmCommand_1 = require("../shared/npmCommand");
+const errors_1 = require("./errors");
 const CRYPTO_LEVEL = 'RSA-SHA256';
-exports.ALLOW_LIST_FILENAME = 'unsignedPluginAllowList.json';
+const ALLOW_LIST_FILENAME = 'unsignedPluginAllowList.json';
 exports.DEFAULT_REGISTRY = 'https://registry.npmjs.org/';
 class CodeVerifierInfo {
     get dataToVerify() {
+        if (!this.data) {
+            throw new Error('CodeVerifierInfo: Verifier has no data because it has not be set');
+        }
         return this.data;
     }
     set dataToVerify(value) {
@@ -37,6 +35,9 @@ class CodeVerifierInfo {
     }
     // eslint-disable-next-line @typescript-eslint/member-ordering
     get signatureStream() {
+        if (!this.signature) {
+            throw new Error('CodeVerifierInfo: signatureStream has no value because it has not be set');
+        }
         return this.signature;
     }
     set signatureStream(value) {
@@ -44,26 +45,29 @@ class CodeVerifierInfo {
     }
     // eslint-disable-next-line @typescript-eslint/member-ordering
     get publicKeyStream() {
+        if (!this.publicKey) {
+            throw new Error('CodeVerifierInfo: publicKey has no value because it has not be set');
+        }
         return this.publicKey;
     }
     set publicKeyStream(value) {
         this.publicKey = value;
     }
 }
-exports.CodeVerifierInfo = CodeVerifierInfo;
 function validSalesforceHostname(url) {
     if (!url) {
         return false;
     }
-    const parsedUrl = (0, url_1.parse)(url);
+    const parsedUrl = new url_1.URL(url);
     if (process.env.SFDX_ALLOW_ALL_SALESFORCE_CERTSIG_HOSTING === 'true') {
-        return parsedUrl.hostname && /(\.salesforce\.com)$/.test(parsedUrl.hostname);
+        return Boolean(parsedUrl.hostname) && /(\.salesforce\.com)$/.test(parsedUrl.hostname);
     }
     else {
-        return parsedUrl.protocol === 'https:' && parsedUrl.hostname && parsedUrl.hostname === 'developer.salesforce.com';
+        return (parsedUrl.protocol === 'https:' &&
+            Boolean(parsedUrl.hostname) &&
+            parsedUrl.hostname === 'developer.salesforce.com');
     }
 }
-exports.validSalesforceHostname = validSalesforceHostname;
 function retrieveKey(stream) {
     return new Promise((resolve, reject) => {
         let key = '';
@@ -85,6 +89,7 @@ async function verify(codeVerifierInfo) {
     const publicKey = await retrieveKey(codeVerifierInfo.publicKeyStream);
     const signApi = crypto.createVerify(CRYPTO_LEVEL);
     return new Promise((resolve, reject) => {
+        codeVerifierInfo.dataToVerify.on('error', (err) => reject(errorHandlerForVerify(err)));
         codeVerifierInfo.dataToVerify.pipe(signApi);
         codeVerifierInfo.dataToVerify.on('end', () => {
             // The sign signature returns a base64 encode string.
@@ -101,24 +106,23 @@ async function verify(codeVerifierInfo) {
                     return resolve(verification);
                 }
             });
-            codeVerifierInfo.signatureStream.on('error', (err) => reject(err));
+            codeVerifierInfo.signatureStream.on('error', (err) => reject(errorHandlerForVerify(err)));
         });
-        codeVerifierInfo.dataToVerify.on('error', (err) => reject(err));
     });
 }
 exports.verify = verify;
-const getNpmRegistry = () => new url_1.URL(process.env.SFDX_NPM_REGISTRY || exports.DEFAULT_REGISTRY);
+const errorHandlerForVerify = (err) => {
+    if ('code' in err && err.code === 'DEPTH_ZERO_SELF_SIGNED_CERT') {
+        return (0, errors_1.setErrorName)(new core_1.SfError('Encountered a self signed certificated. To enable "export NODE_TLS_REJECT_UNAUTHORIZED=0"'), 'SelfSignedCert');
+    }
+    return err;
+};
+const getNpmRegistry = () => new url_1.URL(process.env.SFDX_NPM_REGISTRY ?? exports.DEFAULT_REGISTRY);
 exports.getNpmRegistry = getNpmRegistry;
 /**
  * class for verifying a digital signature pack of an npm
  */
 class InstallationVerification {
-    constructor(fsImpl) {
-        // why? dependency injection is better than sinon
-        this.fsImpl = fsImpl ? fsImpl : fs;
-        this.readFileAsync = (0, util_1.promisify)(this.fsImpl.readFile);
-        this.unlinkAsync = (0, util_1.promisify)(this.fsImpl.unlink);
-    }
     /**
      * setter for the cli engine config
      *
@@ -129,11 +133,7 @@ class InstallationVerification {
             this.config = _config;
             return this;
         }
-        const err = new core_1.SfError('the cli engine config cannot be null', 'InvalidParam');
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore override readonly .name field
-        err.name = 'InvalidParam';
-        throw err;
+        throw (0, errors_1.setErrorName)(new core_1.SfError('the cli engine config cannot be null', 'InvalidParam'), 'InvalidParam');
     }
     /**
      * setter for the plugin name
@@ -145,11 +145,7 @@ class InstallationVerification {
             this.pluginNpmName = _pluginName;
             return this;
         }
-        const err = new core_1.SfError('pluginName must be specified.', 'InvalidParam');
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore override readonly .name field
-        err.name = 'InvalidParam';
-        throw err;
+        throw (0, errors_1.setErrorName)(new core_1.SfError('the plugin name cannot be null', 'InvalidParam'), 'InvalidParam');
     }
     /**
      * validates the digital signature.
@@ -157,51 +153,51 @@ class InstallationVerification {
     async verify() {
         const logger = await this.getLogger();
         const npmMeta = await this.streamTagGz();
+        if (!npmMeta.tarballLocalPath) {
+            throw new core_1.SfError('The npmMeta does not contain a tarball path');
+        }
+        if (!npmMeta.signatureUrl) {
+            throw new core_1.SfError('The npmMeta does not contain a signatureUrl');
+        }
+        if (!npmMeta.publicKeyUrl) {
+            throw new core_1.SfError('The npmMeta does not contain a publicKeyUrl');
+        }
         logger.debug(`verify | Found npmMeta? ${!!npmMeta}`);
         logger.debug(`verify | creating a read stream for path - npmMeta.tarballLocalPath: ${npmMeta.tarballLocalPath}`);
-        const info = new CodeVerifierInfo();
-        info.dataToVerify = this.fsImpl.createReadStream(npmMeta.tarballLocalPath, { encoding: 'binary' });
         logger.debug(`verify | npmMeta.signatureUrl: ${npmMeta.signatureUrl}`);
         logger.debug(`verify | npmMeta.publicKeyUrl: ${npmMeta.publicKeyUrl}`);
-        return Promise.all([this.getSigningContent(npmMeta.signatureUrl), this.getSigningContent(npmMeta.publicKeyUrl)])
-            .then((result) => {
-            info.signatureStream = result[0];
-            info.publicKeyStream = result[1];
-            return verify(info);
-        })
-            .then((result) => {
-            npmMeta.verified = result;
-            return this.unlinkAsync(npmMeta.tarballLocalPath)
-                .catch((err) => {
-                logger.debug(`error occurred deleting cache tgz at path: ${npmMeta.tarballLocalPath}`);
-                logger.debug(err);
-            })
-                .then(() => npmMeta);
-        })
-            .catch((e) => {
-            if (e.code === 'DEPTH_ZERO_SELF_SIGNED_CERT') {
-                const err = new core_1.SfError('Encountered a self signed certificated. To enable "export NODE_TLS_REJECT_UNAUTHORIZED=0"', 'SelfSignedCert');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                err.name = 'SelfSignedCert';
-                throw err;
-            }
-            throw e;
-        });
+        const [signatureStream, publicKeyStream] = await Promise.all([
+            getSigningContent(npmMeta.signatureUrl),
+            getSigningContent(npmMeta.publicKeyUrl),
+        ]);
+        const info = new CodeVerifierInfo();
+        info.dataToVerify = fs.createReadStream(npmMeta.tarballLocalPath, { encoding: 'binary' });
+        info.publicKeyStream = publicKeyStream;
+        info.signatureStream = signatureStream;
+        npmMeta.verified = await verify(info);
+        try {
+            await fs.promises.rm(npmMeta.tarballLocalPath);
+        }
+        catch (err) {
+            logger.debug(`error occurred deleting cache tgz at path: ${npmMeta.tarballLocalPath}`);
+            logger.debug(err);
+        }
+        return npmMeta;
     }
     async isAllowListed() {
         const logger = await this.getLogger();
-        const allowListedFilePath = path.join(this.getConfigPath(), exports.ALLOW_LIST_FILENAME);
+        const allowListedFilePath = path.join(this.getConfigPath() ?? '', ALLOW_LIST_FILENAME);
         logger.debug(`isAllowListed | allowlistFilePath: ${allowListedFilePath}`);
         let fileContent;
         try {
-            fileContent = await this.readFileAsync(allowListedFilePath);
+            fileContent = await fs.promises.readFile(allowListedFilePath, 'utf8');
             const allowlistArray = JSON.parse(fileContent);
             logger.debug('isAllowListed | Successfully parsed allowlist.');
-            return allowlistArray?.includes(this.pluginNpmName.toString());
+            const nameToFind = this.pluginNpmName?.toString();
+            return nameToFind ? allowlistArray.includes(nameToFind) : false;
         }
         catch (err) {
-            if (err.code === 'ENOENT') {
+            if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
                 return false;
             }
             else {
@@ -209,45 +205,40 @@ class InstallationVerification {
             }
         }
     }
-    /**
-     * Retrieve url content for a host
-     *
-     * @param url host url.
-     */
-    // eslint-disable-next-line class-methods-use-this
-    async getSigningContent(url) {
-        const res = await got_1.default.get({
-            url,
-            timeout: { request: 10000 },
-            agent: { https: ProxyAgent((0, proxy_from_env_1.getProxyForUrl)(url)) },
-        });
-        if (res.statusCode !== 200) {
-            throw new core_1.SfError(`A request to url ${url} failed with error code: [${res.statusCode}]`, 'ErrorGettingContent');
-        }
-        return stream_1.Readable.from(Buffer.from(res.body));
-    }
     /**
      * Downloads the tgz file content and stores it in a cache folder
      */
     async streamTagGz() {
         const logger = await this.getLogger();
         const npmMeta = await this.retrieveNpmMeta();
+        if (!npmMeta.tarballUrl) {
+            throw new Error('tarballUrl is not defined in the npmMeta object');
+        }
         const urlObject = new url_1.URL(npmMeta.tarballUrl);
         const urlPathsAsArray = urlObject.pathname.split('/');
-        npmMeta.tarballFilename = npmMeta.moduleName.replace(/@/g, '');
+        npmMeta.tarballFilename = npmMeta.moduleName?.replace(/@/g, '');
         logger.debug(`streamTagGz | urlPathsAsArray: ${urlPathsAsArray.join(',')}`);
         const fileNameStr = urlPathsAsArray[urlPathsAsArray.length - 1];
         logger.debug(`streamTagGz | fileNameStr: ${fileNameStr}`);
         // Make sure the cache path exists.
         try {
+            if (!npmMeta.moduleName) {
+                throw new Error('moduleName is not defined in the npmMeta object');
+            }
+            if (!npmMeta.version) {
+                throw new Error('version is not defined in the npmMeta object');
+            }
             await (0, promises_1.mkdir)(this.getCachePath(), { recursive: true });
-            const npmModule = new npmCommand_1.NpmModule(npmMeta.moduleName, npmMeta.version, this.config.cliRoot);
+            const npmModule = new npmCommand_1.NpmModule(npmMeta.moduleName, npmMeta.version, this.config?.cliRoot);
             await npmModule.fetchTarball((0, exports.getNpmRegistry)().href, {
                 cwd: this.getCachePath(),
             });
             const tarBallFile = fs
                 .readdirSync(this.getCachePath(), { withFileTypes: true })
-                .find((entry) => entry.isFile() && entry.name.includes(npmMeta.version));
+                .find((entry) => entry.isFile() && npmMeta.version && entry.name.includes(npmMeta.version));
+            if (!tarBallFile) {
+                throw new Error(`Unable to find retrieved tarball file for ${npmMeta.moduleName} version ${npmMeta.version}`);
+            }
             npmMeta.tarballLocalPath = path.join(this.getCachePath(), tarBallFile.name);
         }
         catch (err) {
@@ -258,10 +249,16 @@ class InstallationVerification {
     }
     // this is generally $HOME/.config/sfdx
     getConfigPath() {
+        if (!this.config?.configDir) {
+            throw new Error('configDir is not defined in the config object');
+        }
         return this.config.configDir;
     }
     // this is generally $HOME/Library/Caches/sfdx on mac
     getCachePath() {
+        if (!this.config?.cacheDir) {
+            throw new Error('cacheDir is not defined in the config object');
+        }
         return this.config.cacheDir;
     }
     /**
@@ -270,6 +267,9 @@ class InstallationVerification {
     async retrieveNpmMeta() {
         const logger = await this.getLogger();
         const npmRegistry = (0, exports.getNpmRegistry)();
+        if (!this.pluginNpmName) {
+            throw new Error('pluginNpmName is not defined on the InstallationVerification class.  setPluginNpmName should have been called before this method.');
+        }
         logger.debug(`retrieveNpmMeta | npmRegistry: ${npmRegistry.href}`);
         logger.debug(`retrieveNpmMeta | this.pluginNpmName.name: ${this.pluginNpmName.name}`);
         logger.debug(`retrieveNpmMeta | this.pluginNpmName.scope: ${this.pluginNpmName.scope}`);
@@ -277,18 +277,15 @@ class InstallationVerification {
         const npmShowModule = this.pluginNpmName.scope
             ? `@${this.pluginNpmName.scope}/${this.pluginNpmName.name}`
             : this.pluginNpmName.name;
-        const npmModule = new npmCommand_1.NpmModule(npmShowModule, this.pluginNpmName.tag, this.config.cliRoot);
+        const npmModule = new npmCommand_1.NpmModule(npmShowModule, this.pluginNpmName.tag, this.config?.cliRoot);
         const npmMetadata = npmModule.show(npmRegistry.href);
         logger.debug('retrieveNpmMeta | Found npm meta information.');
         if (!npmMetadata.versions) {
             const err = new core_1.SfError(`The npm metadata for plugin ${this.pluginNpmName.name} is missing the versions attribute.`, 'InvalidNpmMetadata');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'InvalidNpmMetadata';
-            throw err;
+            throw (0, errors_1.setErrorName)(err, 'InvalidNpmMetadata');
         }
         // Assume the tag is version tag.
-        let versionNumber = npmMetadata.versions.find((version) => version === this.pluginNpmName.tag);
+        let versionNumber = npmMetadata.versions.find((version) => version === this.pluginNpmName?.tag);
         logger.debug(`retrieveNpmMeta | versionObject: ${JSON.stringify(versionNumber)}`);
         // If the assumption was not correct the tag must be a non-versioned dist-tag or not specified.
         if (!versionNumber) {
@@ -305,35 +302,21 @@ class InstallationVerification {
                 }
                 else {
                     const err = new core_1.SfError(`The dist tag ${this.pluginNpmName.tag} was not found for plugin: ${this.pluginNpmName.name}`, 'NpmTagNotFound');
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore override readonly .name field
-                    err.name = 'NpmTagNotFound';
-                    throw err;
+                    throw (0, errors_1.setErrorName)(err, 'NpmTagNotFound');
                 }
             }
             else {
-                const err = new core_1.SfError('The deployed NPM is missing dist-tags.', 'UnexpectedNpmFormat');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                err.name = 'UnexpectedNpmFormat';
-                throw err;
+                throw (0, errors_1.setErrorName)(new core_1.SfError('The deployed NPM is missing dist-tags.', 'UnexpectedNpmFormat'), 'UnexpectedNpmFormat');
             }
         }
         npmModule.npmMeta.version = versionNumber;
         if (!npmMetadata.sfdx) {
-            const err = new core_1.SfError('This plugin is not signed by Salesforce.com, Inc.', 'NotSigned');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'NotSigned';
-            throw err;
+            throw (0, errors_1.setErrorName)(new core_1.SfError('This plugin is not signed by Salesforce.com, Inc.', 'NotSigned'), 'NotSigned');
         }
         else {
             if (!validSalesforceHostname(npmMetadata.sfdx.publicKeyUrl)) {
                 const err = new core_1.SfError(`The host is not allowed to provide signing information. [${npmMetadata.sfdx.publicKeyUrl}]`, 'UnexpectedHost');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                err.name = 'UnexpectedHost';
-                throw err;
+                throw (0, errors_1.setErrorName)(err, 'UnexpectedHost');
             }
             else {
                 logger.debug(`retrieveNpmMeta | versionObject.sfdx.publicKeyUrl: ${npmMetadata.sfdx.publicKeyUrl}`);
@@ -341,16 +324,13 @@ class InstallationVerification {
             }
             if (!validSalesforceHostname(npmMetadata.sfdx.signatureUrl)) {
                 const err = new core_1.SfError(`The host is not allowed to provide signing information. [${npmMetadata.sfdx.signatureUrl}]`, 'UnexpectedHost');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                err.name = 'UnexpectedHost';
-                throw err;
+                throw (0, errors_1.setErrorName)(err, 'UnexpectedHost');
             }
             else {
                 logger.debug(`retrieveNpmMeta | versionObject.sfdx.signatureUrl: ${npmMetadata.sfdx.signatureUrl}`);
                 npmModule.npmMeta.signatureUrl = npmMetadata.sfdx.signatureUrl;
             }
-            npmModule.npmMeta.tarballUrl = npmMetadata.dist.tarball;
+            npmModule.npmMeta.tarballUrl = npmMetadata.dist?.tarball;
             logger.debug(`retrieveNpmMeta | meta.tarballUrl: ${npmModule.npmMeta.tarballUrl}`);
             return npmModule.npmMeta;
         }
@@ -380,23 +360,28 @@ async function doPrompt() {
     if (!(await new sf_plugins_core_1.Prompter().confirm('This plugin is not digitally signed and its authenticity cannot be verified. Continue installation?', 30000, false))) {
         throw new core_1.SfError('The user canceled the plugin installation.', 'InstallationCanceledError');
     }
+    // they approved the plugin.  Let them know how to automate this.
+    core_2.ux.log('To avoid installation confirmation, configure unsignedPluginAllowList.json.  https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_allowlist.htm');
 }
 exports.doPrompt = doPrompt;
 async function doInstallationCodeSigningVerification(config, plugin, verificationConfig) {
     try {
+        if (!verificationConfig.verifier) {
+            throw new Error('VerificationConfig.verifier is not set.');
+        }
         const meta = await verificationConfig.verifier.verify();
         if (!meta.verified) {
             const err = new core_1.SfError("A digital signature is specified for this plugin but it didn't verify against the certificate.", 'FailedDigitalSignatureVerification');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'FailedDigitalSignatureVerification';
-            throw err;
+            throw (0, errors_1.setErrorName)(err, 'FailedDigitalSignatureVerification');
         }
         verificationConfig.log(`Successfully validated digital signature for ${plugin.plugin}.`);
     }
     catch (err) {
         if (err instanceof Error) {
             if (err.name === 'NotSigned') {
+                if (!verificationConfig.verifier) {
+                    throw new Error('VerificationConfig.verifier is not set.');
+                }
                 if (await verificationConfig.verifier.isAllowListed()) {
                     verificationConfig.log(`The plugin [${plugin.plugin}] is not digitally signed but it is allow-listed.`);
                     return;
@@ -406,19 +391,27 @@ async function doInstallationCodeSigningVerification(config, plugin, verificatio
                 }
             }
             else if (err.name === 'PluginNotFound' || err.name === 'PluginAccessDenied') {
-                const e = new core_1.SfError(err.message || 'The user canceled the plugin installation.');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                e.name = '';
-                throw e;
+                throw (0, errors_1.setErrorName)(new core_1.SfError(err.message ?? 'The user canceled the plugin installation.'), '');
             }
-            const sfErr = core_1.SfError.wrap(err);
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            sfErr.name = err.name;
-            throw sfErr;
+            throw (0, errors_1.setErrorName)(core_1.SfError.wrap(err), err.name);
         }
     }
 }
 exports.doInstallationCodeSigningVerification = doInstallationCodeSigningVerification;
+/**
+ * Retrieve url content for a host
+ *
+ * @param url host url.
+ */
+const getSigningContent = async (url) => {
+    const res = await got_1.default.get({
+        url,
+        timeout: { request: 10000 },
+        agent: { https: new proxy_agent_1.ProxyAgent() },
+    });
+    if (res.statusCode !== 200) {
+        throw new core_1.SfError(`A request to url ${url} failed with error code: [${res.statusCode}]`, 'ErrorGettingContent');
+    }
+    return stream_1.Readable.from(Buffer.from(res.body));
+};
 //# sourceMappingURL=installationVerification.js.map

package/lib/shared/installationVerification.js.map

@@ -1 +1 @@
-{"version":3,"file":"installationVerification.js","sourceRoot":"","sources":["../../src/shared/installationVerification.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"installationVerification.js","sourceRoot":"","sources":["../../src/shared/installationVerification.ts"],"names":[],"mappings":"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"}

package/lib/shared/npmCommand.d.ts

@@ -22,49 +22,14 @@ export type NpmShowResults = {
         [name: string]: string;
     };
 };
-type NpmCommandOptions = shelljs.ExecOptions & {
-    json?: boolean;
-    registry?: string;
-    cliRoot?: string;
-};
-type NpmCommandResult = shelljs.ShellString;
-export declare class NpmCommand {
-    private static npmPkgPath;
-    static runNpmCmd(cmd: string, options?: NpmCommandOptions): NpmCommandResult;
-    private static npmPackagePath;
-    /**
-     * Returns the path to the npm-cli.js file in this package's node_modules
-     *
-     * @private
-     */
-    private static npmCli;
-    /**
-     * Locate node executable and return its absolute path
-     * First it tries to locate the node executable on the root path passed in
-     * If not found then tries to use whatver 'node' resolves to on the user's PATH
-     * If found return absolute path to the executable
-     * If the node executable cannot be found, an error is thrown
-     *
-     * @private
-     */
-    private static findNode;
-    /**
-     * Finds the bin directory in the sfdx installation root path
-     *
-     * @param sfdxPath
-     * @private
-     */
-    private static findSfdxBinDirs;
-}
 export declare class NpmModule {
     private module;
     private version;
-    private cliRoot;
+    private cliRoot?;
     npmMeta: NpmMeta;
-    constructor(module: string, version?: string, cliRoot?: string);
+    constructor(module: string, version?: string, cliRoot?: string | undefined);
     show(registry: string): NpmShowResults;
     pack(registry: string, options?: shelljs.ExecOptions): void;
     fetchTarball(registry: string, options?: shelljs.ExecOptions): Promise<void>;
     pollForAvailability(checkFn: () => void): Promise<void>;
 }
-export {};

package/lib/shared/npmCommand.js

@@ -5,9 +5,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NpmModule = exports.NpmCommand = void 0;
+exports.NpmModule = void 0;
 const os_1 = require("os");
 const path = require("path");
 const fs = require("fs");
@@ -16,6 +15,7 @@ const shelljs = require("shelljs");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const errors_1 = require("./errors");
 class NpmCommand {
     static runNpmCmd(cmd, options = {}) {
         const nodeExecutable = NpmCommand.findNode(options.cliRoot);
@@ -56,7 +56,7 @@ class NpmCommand {
      *
      * @private
      */
-    static findNode(root = undefined) {
+    static findNode(root) {
         const isExecutable = (filepath) => {
             if ((0, os_1.type)() === 'Windows_NT')
                 return filepath.endsWith('node.exe');
@@ -86,11 +86,7 @@ class NpmCommand {
         const nodeShellString = shelljs.which('node');
         if (nodeShellString?.code === 0 && nodeShellString?.stdout)
             return nodeShellString.stdout;
-        const err = new core_1.SfError('Cannot locate node executable.', 'CannotFindNodeExecutable');
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore override readonly .name field
-        err.name = 'CannotFindNodeExecutable';
-        throw err;
+        throw (0, errors_1.setErrorName)(new core_1.SfError('Cannot locate node executable.', 'CannotFindNodeExecutable'), 'CannotFindNodeExecutable');
     }
     /**
      * Finds the bin directory in the sfdx installation root path
@@ -104,10 +100,9 @@ class NpmCommand {
             : [];
     }
 }
-exports.NpmCommand = NpmCommand;
 NpmCommand.npmPkgPath = require.resolve('npm/package.json');
 class NpmModule {
-    constructor(module, version = 'latest', cliRoot = undefined) {
+    constructor(module, version = 'latest', cliRoot) {
         this.module = module;
         this.version = version;
         this.cliRoot = cliRoot;
@@ -123,23 +118,16 @@ class NpmModule {
         // `npm show` doesn't return exit code 1 when it fails to get a specific package version
         // If `stdout` is empty then no info was found in the registry.
         if (showCmd.stdout === '') {
-            const err = new core_1.SfError(`Failed to find ${this.module}@${this.version} in the registry`, 'NpmError');
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore override readonly .name field
-            err.name = 'NpmError';
-            throw err;
+            throw (0, errors_1.setErrorName)(new core_1.SfError(`Failed to find ${this.module}@${this.version} in the registry`, 'NpmError'), 'NpmError');
         }
         try {
             return JSON.parse(showCmd.stdout);
         }
         catch (error) {
             if (error instanceof Error) {
-                const err = new core_1.SfError(error.message, 'ShellParseError');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                err.name = 'ShellParseError';
-                throw err;
+                throw (0, errors_1.setErrorName)(new core_1.SfError(error.message, 'ShellParseError'), 'ShellParseError');
             }
+            throw error;
         }
     }
     pack(registry, options) {
@@ -154,10 +142,7 @@ class NpmModule {
             if (err instanceof Error) {
                 const sfErr = core_1.SfError.wrap(err);
                 const e = new core_1.SfError(`Failed to fetch tarball from the registry: \n${sfErr.message}`, 'NpmError');
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore override readonly .name field
-                e.name = 'NpmError';
-                throw e;
+                throw (0, errors_1.setErrorName)(e, 'NpmError');
             }
         }
         return;

package/lib/shared/npmCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"npmCommand.js","sourceRoot":"","sources":["../../src/shared/npmCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"npmCommand.js","sourceRoot":"","sources":["../../src/shared/npmCommand.ts"],"names":[],"mappings":"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"}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0-qa.1",
+  "version": "2.5.0",
   "commands": {
     "plugins:trust:verify": {
       "id": "plugins:trust:verify",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@salesforce/plugin-trust",
     "description": "validate a digital signature for a npm package",
-    "version": "2.5.0-qa.1",
+    "version": "2.5.0",
     "author": "Salesforce",
     "main": "lib/index.js",
     "bin": {
@@ -9,59 +9,57 @@
     },
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
-        "@oclif/core": "^2.8.2",
-        "@salesforce/core": "^3.33.4",
-        "@salesforce/plugin-telemetry": "^2.1.5",
-        "@salesforce/sf-plugins-core": "^2",
-        "@salesforce/telemetry": "^3.2.13",
+        "@oclif/core": "^2.11.1",
+        "@salesforce/core": "^5.1.4",
+        "@salesforce/sf-plugins-core": "^3.1.13",
+        "@salesforce/telemetry": "^3.2.29",
         "got": "^11",
         "npm": "^8.19.4",
         "npm-run-path": "^4.0.1",
-        "proxy-agent": "^5.0.0",
-        "proxy-from-env": "^1.1.0",
+        "proxy-agent": "^6.3.0",
         "shelljs": "^0.8.4",
         "tslib": "^2"
     },
     "devDependencies": {
-        "@oclif/plugin-command-snapshot": "^3.3.9",
-        "@salesforce/cli-plugins-testkit": "^3.3.2",
-        "@salesforce/dev-config": "^3.0.0",
-        "@salesforce/dev-scripts": "^4.3.0",
-        "@salesforce/plugin-command-reference": "^2.4.1",
-        "@salesforce/prettier-config": "^0.0.2",
+        "@oclif/plugin-command-snapshot": "^4.0.9",
+        "@salesforce/cli-plugins-testkit": "^4.2.8",
+        "@salesforce/dev-config": "^4.0.1",
+        "@salesforce/dev-scripts": "^5.4.3",
+        "@salesforce/plugin-command-reference": "^3.0.21",
+        "@salesforce/plugin-telemetry": "^2.1.5",
+        "@salesforce/prettier-config": "^0.0.3",
         "@salesforce/ts-sinon": "^1.4.6",
-        "@swc/core": "^1.3.39",
-        "@types/proxy-from-env": "^1.0.1",
+        "@swc/core": "1.3.39",
         "@types/shelljs": "^0.8.9",
-        "@types/sinon-chai": "^3.2.5",
-        "@typescript-eslint/eslint-plugin": "^5.33.0",
-        "@typescript-eslint/parser": "^5.57.1",
+        "@types/sinon-chai": "^3.2.9",
+        "@typescript-eslint/eslint-plugin": "^5.61.0",
+        "@typescript-eslint/parser": "^5.61.0",
         "chai": "^4.3.7",
-        "eslint": "^8.38.0",
+        "eslint": "^8.46.0",
         "eslint-config-prettier": "^8.8.0",
-        "eslint-config-salesforce": "^1.2.0",
+        "eslint-config-salesforce": "^2.0.2",
         "eslint-config-salesforce-license": "^0.2.0",
-        "eslint-config-salesforce-typescript": "^1.1.1",
+        "eslint-config-salesforce-typescript": "^1.1.2",
         "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-import": "2.27.5",
-        "eslint-plugin-jsdoc": "^39.9.1",
-        "eslint-plugin-sf-plugin": "^1.14.0",
+        "eslint-plugin-jsdoc": "^43.0.5",
+        "eslint-plugin-sf-plugin": "^1.16.0",
         "husky": "^7.0.4",
         "mocha": "^9.1.3",
         "nyc": "^15.1.0",
-        "oclif": "^3.7.3",
-        "prettier": "^2.8.7",
+        "oclif": "^3.9.1",
+        "prettier": "^2.8.8",
         "pretty-quick": "^3.1.0",
         "shx": "0.3.4",
         "sinon": "10.0.0",
         "sinon-chai": "^3.7.0",
         "ts-node": "^10.0.0",
         "typescript": "^4.9.5",
-        "wireit": "^0.9.5"
+        "wireit": "^0.10.0"
     },
     "config": {},
     "engines": {
-        "node": ">=14.0.0"
+        "node": ">=16.0.0"
     },
     "files": [
         "bin",
@@ -229,7 +227,7 @@
         }
     },
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/2.5.0-qa.1.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/2.5.0-qa.1.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/2.5.0.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/2.5.0.sig"
     }
 }