@socketsecurity/cli-with-sentry 1.0.81 → 1.0.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +124 -84
- package/dist/cli.js.map +1 -1
- package/dist/constants.js +3 -3
- package/dist/constants.js.map +1 -1
- package/dist/tsconfig.dts.tsbuildinfo +1 -1
- package/dist/types/commands/fix/agent-fix.d.mts +5 -1
- package/dist/types/commands/fix/agent-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/npm-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/pnpm-fix.d.mts.map +1 -1
- package/dist/types/utils/api.d.mts +1 -1
- package/dist/types/utils/api.d.mts.map +1 -1
- package/dist/types/utils/config.d.mts.map +1 -1
- package/dist/types/utils/git.d.mts.map +1 -1
- package/dist/types/utils/package-environment.d.mts.map +1 -1
- package/dist/utils.js +34 -30
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -26,7 +26,11 @@ export type InstallOptions = {
|
|
|
26
26
|
spinner?: Spinner | undefined;
|
|
27
27
|
};
|
|
28
28
|
export type InstallPhaseHandler = (editablePkgJson: EditablePackageJson, packument: Packument, oldVersion: string, newVersion: string, vulnerableVersionRange: string, fixConfig: FixConfig) => Promise<void>;
|
|
29
|
-
export type Installer = (pkgEnvDetails: EnvDetails, options: InstallOptions) => Promise<
|
|
29
|
+
export type Installer = (pkgEnvDetails: EnvDetails, options: InstallOptions) => Promise<InstallerResult>;
|
|
30
|
+
export type InstallerResult = {
|
|
31
|
+
actualTree?: NodeClass | undefined;
|
|
32
|
+
error?: unknown | undefined;
|
|
33
|
+
};
|
|
30
34
|
export declare function agentFix(pkgEnvDetails: EnvDetails, actualTree: NodeClass | undefined, alertsMap: AlertsByPurl, installer: Installer, { afterInstall, afterUpdate, beforeInstall, revertInstall }: {
|
|
31
35
|
beforeInstall?: InstallPhaseHandler | undefined;
|
|
32
36
|
afterUpdate?: InstallPhaseHandler | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-fix.d.mts","sourceRoot":"","sources":["../../../../src/commands/fix/agent-fix.mts"],"names":[],"mappings":"AAsDA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,KAAK,EACV,mBAAmB,EACnB,SAAS,EACV,MAAM,uCAAuC,CAAA;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAA;AAEnE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,IAAI,EAAE,OAAO,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,eAAe,EAAE,mBAAmB,EACpC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,SAAS,KACjB,OAAO,CAAC,IAAI,CAAC,CAAA;AAElB,MAAM,MAAM,SAAS,GAAG,CACtB,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"agent-fix.d.mts","sourceRoot":"","sources":["../../../../src/commands/fix/agent-fix.mts"],"names":[],"mappings":"AAsDA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,KAAK,EACV,mBAAmB,EACnB,SAAS,EACV,MAAM,uCAAuC,CAAA;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAA;AAEnE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,OAAO,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,IAAI,EAAE,OAAO,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,eAAe,EAAE,mBAAmB,EACpC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,SAAS,KACjB,OAAO,CAAC,IAAI,CAAC,CAAA;AAElB,MAAM,MAAM,SAAS,GAAG,CACtB,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,eAAe,CAAC,CAAA;AAE7B,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC5B,CAAA;AAID,wBAAsB,QAAQ,CAC5B,aAAa,EAAE,UAAU,EACzB,UAAU,EAAE,SAAS,GAAG,SAAS,EACjC,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,SAAS,EACpB,EACE,YAA0B,EAC1B,WAAyB,EACzB,aAA2B,EAC3B,aAA2B,EAC5B,EAAE;IACD,aAAa,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAC/C,WAAW,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAC7C,YAAY,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAC9C,aAAa,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;CAChD,EACD,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,CAikBtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-fix.d.mts","sourceRoot":"","sources":["../../../../src/commands/fix/npm-fix.mts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"npm-fix.d.mts","sourceRoot":"","sources":["../../../../src/commands/fix/npm-fix.mts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAsFrE,wBAAsB,MAAM,CAC1B,aAAa,EAAE,UAAU,EACzB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,CA8FtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpm-fix.d.mts","sourceRoot":"","sources":["../../../../src/commands/fix/pnpm-fix.mts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"pnpm-fix.d.mts","sourceRoot":"","sources":["../../../../src/commands/fix/pnpm-fix.mts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,OAAO,EAAwB,MAAM,iBAAiB,CAAA;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAsErE,wBAAsB,OAAO,CAC3B,aAAa,EAAE,UAAU,EACzB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,CAyLtC"}
|
|
@@ -10,7 +10,7 @@ export type HandleApiCallOptions = {
|
|
|
10
10
|
export declare function handleApiCall<T extends SocketSdkOperations>(value: Promise<SocketSdkResult<T>>, options?: HandleApiCallOptions | undefined): Promise<CResult<SocketSdkSuccessResult<T>['data']>>;
|
|
11
11
|
export declare function handleApiCallNoSpinner<T extends SocketSdkOperations>(value: Promise<SocketSdkResult<T>>, description: string): Promise<CResult<SocketSdkSuccessResult<T>['data']>>;
|
|
12
12
|
export declare function getErrorMessageForHttpStatusCode(code: number): Promise<string>;
|
|
13
|
-
// The API server that should be used for operations.
|
|
13
|
+
// The Socket API server that should be used for operations.
|
|
14
14
|
export declare function getDefaultApiBaseUrl(): string | undefined;
|
|
15
15
|
export declare function queryApi(path: string, apiToken: string): Promise<Response>;
|
|
16
16
|
export declare function queryApiSafeText(path: string, fetchSpinnerDesc?: string): Promise<CResult<string>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.mts","sourceRoot":"","sources":["../../../src/utils/api.mts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAA;AACnE,OAAO,KAAK,EAEV,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACvB,MAAM,qBAAqB,CAAA;AAI5B,8CAA8C;AAC9C,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,mBAAmB,EACzE,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,KAAK,CAaP;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B,CAAA;AAED,wBAAsB,aAAa,CAAC,CAAC,SAAS,mBAAmB,EAC/D,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAClC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,GACzC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"api.d.mts","sourceRoot":"","sources":["../../../src/utils/api.mts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAA;AACnE,OAAO,KAAK,EAEV,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACvB,MAAM,qBAAqB,CAAA;AAI5B,8CAA8C;AAC9C,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,mBAAmB,EACzE,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,KAAK,CAaP;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B,CAAA;AAED,wBAAsB,aAAa,CAAC,CAAC,SAAS,mBAAmB,EAC/D,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAClC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,GACzC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAoErD;AAED,wBAAsB,sBAAsB,CAAC,CAAC,SAAS,mBAAmB,EACxE,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAClC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAyCrD;AAED,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,MAAM,mBAclE;AAED,4DAA4D;AAC5D,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,SAAS,CAUzD;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAc5D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAqE1B;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,IAAI,EAAE,MAAM,EACZ,gBAAgB,SAAK,GACpB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAmBrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.mts","sourceRoot":"","sources":["../../../src/utils/config.mts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAQ3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACtC,4EAA4E;IAC5E,4EAA4E;IAC5E,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAA;IAC9D,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,GAAG,CAAC,EAAE,MAAM,CAAA,CAAC,mCAAmC;CACjD;
|
|
1
|
+
{"version":3,"file":"config.d.mts","sourceRoot":"","sources":["../../../src/utils/config.mts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAQ3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACtC,4EAA4E;IAC5E,4EAA4E;IAC5E,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAA;IAC9D,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,GAAG,CAAC,EAAE,MAAM,CAAA,CAAC,mCAAmC;CACjD;AAiFD,wBAAgB,iBAAiB,CAAC,GAAG,SAAgB;;;SAuBpD;AAED,wBAAgB,cAAc,CAAC,GAAG,SAAS,MAAM,WAAW,EAC1D,GAAG,EAAE,GAAG,GACP,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAO3B;AAED,6DAA6D;AAC7D,qEAAqE;AACrE,wBAAgB,qBAAqB,CAAC,GAAG,SAAS,MAAM,WAAW,EACjE,GAAG,EAAE,GAAG,GACP,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAO9B;AAMD,wBAAgB,yBAAyB,kCAExC;AAED,wBAAgB,sBAAsB,0BAErC;AAED,wBAAgB,gBAAgB,YAE/B;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,MAAM,WAAW,CAE1E;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,MAAM,WAAW,CAE1E;AAMD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CA6C5E;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,OAAO,QAQvD;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,SAAS,MAAM,WAAW,EAC7D,SAAS,EAAE,MAAM,WAAW,EAC5B,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GACtB,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CAoD7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.mts","sourceRoot":"","sources":["../../../src/utils/git.mts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAG3C,wBAAsB,aAAa,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0BxE;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAsB,WAAW,CAC/B,GAAG,SAAgB,GAClB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"git.d.mts","sourceRoot":"","sources":["../../../src/utils/git.mts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAG3C,wBAAsB,aAAa,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0BxE;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAsB,WAAW,CAC/B,GAAG,SAAgB,GAClB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAkB1B;AAED,wBAAsB,WAAW,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAG7E;AAED,wBAAsB,YAAY,CAChC,GAAG,SAAgB,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB;AAED,wBAAsB,SAAS,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiB3E;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED,wBAAsB,WAAW,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAevE;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAelB;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,CAAC,EAAE,6BAA6B,GAAG,SAAS,GAClD,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,GAAG,SAAgB,GAClB,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAsBlB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAclB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,SAAS,EACf,GAAG,SAAgB,GAClB,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,YAAY,CAChC,MAAM,SAAS,EACf,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,CAelB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,SAAgB,GAClB,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAqB5B;AAID,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CA2BpE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-environment.d.mts","sourceRoot":"","sources":["../../../src/utils/package-environment.mts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAU5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAA;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAiBpC,eAAO,MAAM,MAAM,sEAA2D,CAAA;AAW9E,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAA;AAE3C,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,KAAK,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE,OAAO,CAAA;IACvB,QAAQ,EAAE;QACR,iDAAiD;QACjD,yBAAyB;QACzB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,CAAA;IACD,aAAa,EAAE,OAAO,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE;QACf,KAAK,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;IACD,WAAW,EAAE;QACX,KAAK,EAAE,OAAO,CAAA;QACd,IAAI,EAAE,OAAO,CAAA;KACd,CAAA;CACF,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAC/B,KAAK,CACH,OAAO,GAAG;IACR,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,mBAAmB,CAAA;IACpC,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB,CACF,CACF,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CACtC,KAAK,CACH,OAAO,GAAG;IACR,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,eAAe,EAAE,mBAAmB,GAAG,SAAS,CAAA;IAChD,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAC5B,CACF,CACF,CAAA;AAED,MAAM,MAAM,YAAY,GACpB,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,GACnD,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,GAC1E,CAAC,CACC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,KACR,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"package-environment.d.mts","sourceRoot":"","sources":["../../../src/utils/package-environment.mts"],"names":[],"mappings":"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"}
|
package/dist/utils.js
CHANGED
|
@@ -26,7 +26,7 @@ var globs = require('../external/@socketsecurity/registry/lib/globs');
|
|
|
26
26
|
|
|
27
27
|
var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
|
|
28
28
|
const sensitiveConfigKeyLookup = new Set(['apiToken']);
|
|
29
|
-
const supportedConfig = new Map([['apiBaseUrl', 'Base URL of the API endpoint'], ['apiProxy', 'A proxy through which to access the API'], ['apiToken', 'The API token required to access most API endpoints'], ['defaultOrg', 'The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.'], ['enforcedOrgs', 'Orgs in this list have their security policies enforced on this machine'], ['skipAskToPersistDefaultOrg', 'This flag prevents the CLI from asking you to persist the org slug when you selected one interactively'], ['org', 'Alias for defaultOrg']]);
|
|
29
|
+
const supportedConfig = new Map([['apiBaseUrl', 'Base URL of the Socket API endpoint'], ['apiProxy', 'A proxy through which to access the Socket API'], ['apiToken', 'The Socket API token required to access most Socket API endpoints'], ['defaultOrg', 'The default org slug to use; usually the org your Socket API token has access to. When set, all orgSlug arguments are implied to be this value.'], ['enforcedOrgs', 'Orgs in this list have their security policies enforced on this machine'], ['skipAskToPersistDefaultOrg', 'This flag prevents the Socket CLI from asking you to persist the org slug when you selected one interactively'], ['org', 'Alias for defaultOrg']]);
|
|
30
30
|
const supportedConfigEntries = [...supportedConfig.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
|
|
31
31
|
const supportedConfigKeys = supportedConfigEntries.map(p => p[0]);
|
|
32
32
|
function getConfigValues() {
|
|
@@ -189,7 +189,7 @@ function overrideCachedConfig(jsonConfig) {
|
|
|
189
189
|
};
|
|
190
190
|
}
|
|
191
191
|
function overrideConfigApiToken(apiToken) {
|
|
192
|
-
require$$6.debugFn('notice', 'override: API token (not stored)');
|
|
192
|
+
require$$6.debugFn('notice', 'override: Socket API token (not stored)');
|
|
193
193
|
// Set token to the local cached config and mark it read-only so it doesn't persist.
|
|
194
194
|
_cachedConfig = {
|
|
195
195
|
...vendor.configExports,
|
|
@@ -288,7 +288,7 @@ const {
|
|
|
288
288
|
length: TOKEN_PREFIX_LENGTH
|
|
289
289
|
} = TOKEN_PREFIX;
|
|
290
290
|
|
|
291
|
-
// The API server that should be used for operations.
|
|
291
|
+
// The Socket API server that should be used for operations.
|
|
292
292
|
function getDefaultApiBaseUrl$1() {
|
|
293
293
|
const baseUrl =
|
|
294
294
|
// Lazily access constants.ENV.SOCKET_CLI_API_BASE_URL.
|
|
@@ -296,7 +296,7 @@ function getDefaultApiBaseUrl$1() {
|
|
|
296
296
|
return isUrl(baseUrl) ? baseUrl : undefined;
|
|
297
297
|
}
|
|
298
298
|
|
|
299
|
-
// The API server that should be used for operations.
|
|
299
|
+
// The Socket API server that should be used for operations.
|
|
300
300
|
function getDefaultProxyUrl() {
|
|
301
301
|
const apiProxy =
|
|
302
302
|
// Lazily access constants.ENV.SOCKET_CLI_API_PROXY.
|
|
@@ -314,7 +314,7 @@ function isUrl(value) {
|
|
|
314
314
|
return false;
|
|
315
315
|
}
|
|
316
316
|
|
|
317
|
-
// This API
|
|
317
|
+
// This Socket API token should be stored globally for the duration of the CLI execution.
|
|
318
318
|
let _defaultToken;
|
|
319
319
|
function getDefaultToken() {
|
|
320
320
|
// Lazily access constants.ENV.SOCKET_CLI_NO_API_TOKEN.
|
|
@@ -352,7 +352,7 @@ async function setupSdk(options) {
|
|
|
352
352
|
} = opts;
|
|
353
353
|
if (typeof apiToken !== 'string' && vendor.isInteractiveExports()) {
|
|
354
354
|
apiToken = await prompts.password({
|
|
355
|
-
message: 'Enter your Socket.dev API
|
|
355
|
+
message: 'Enter your Socket.dev API token (not saved, use socket login to persist)'
|
|
356
356
|
});
|
|
357
357
|
_defaultToken = apiToken;
|
|
358
358
|
}
|
|
@@ -360,7 +360,7 @@ async function setupSdk(options) {
|
|
|
360
360
|
return {
|
|
361
361
|
ok: false,
|
|
362
362
|
message: 'Auth Error',
|
|
363
|
-
cause: 'You need to provide an API
|
|
363
|
+
cause: 'You need to provide an API token. Run `socket login` first.'
|
|
364
364
|
};
|
|
365
365
|
}
|
|
366
366
|
let {
|
|
@@ -409,19 +409,22 @@ async function handleApiCall(value, options) {
|
|
|
409
409
|
let sdkResult;
|
|
410
410
|
try {
|
|
411
411
|
sdkResult = await value;
|
|
412
|
+
spinner?.stop();
|
|
412
413
|
if (desc) {
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
414
|
+
const message = `Received Socket API response (after requesting ${desc}).`;
|
|
415
|
+
if (sdkResult.success) {
|
|
416
|
+
logger.logger.success(message);
|
|
417
|
+
} else {
|
|
418
|
+
logger.logger.info(message);
|
|
419
|
+
}
|
|
417
420
|
}
|
|
418
421
|
} catch (e) {
|
|
422
|
+
spinner?.stop();
|
|
419
423
|
if (desc) {
|
|
420
|
-
|
|
424
|
+
logger.logger.fail(`An error was thrown while requesting ${desc}`);
|
|
421
425
|
require$$6.debugFn('error', `caught: ${desc} error`);
|
|
422
426
|
} else {
|
|
423
|
-
|
|
424
|
-
require$$6.debugFn('error', `caught: error`);
|
|
427
|
+
require$$6.debugFn('error', `caught: Socket API request error`);
|
|
425
428
|
}
|
|
426
429
|
require$$6.debugDir('inspect', {
|
|
427
430
|
error: e
|
|
@@ -431,8 +434,6 @@ async function handleApiCall(value, options) {
|
|
|
431
434
|
message: 'Socket API returned an error',
|
|
432
435
|
cause: vendor.messageWithCauses(e)
|
|
433
436
|
};
|
|
434
|
-
} finally {
|
|
435
|
-
spinner?.stop();
|
|
436
437
|
}
|
|
437
438
|
|
|
438
439
|
// Note: TS can't narrow down the type of result due to generics.
|
|
@@ -515,7 +516,7 @@ async function getErrorMessageForHttpStatusCode(code) {
|
|
|
515
516
|
return 'One of the options passed might be incorrect';
|
|
516
517
|
}
|
|
517
518
|
if (code === 403 || code === 401) {
|
|
518
|
-
return 'Your API token may not have the required permissions for this command or you might be trying to access (data from) an organization that is not linked to the API
|
|
519
|
+
return 'Your Socket API token may not have the required permissions for this command or you might be trying to access (data from) an organization that is not linked to the API token you are logged in with';
|
|
519
520
|
}
|
|
520
521
|
if (code === 404) {
|
|
521
522
|
return 'The requested Socket API endpoint was not found (404) or there was no result for the requested parameters. If unexpected, this could be a temporary problem caused by an incident or a bug in the CLI. If the problem persists please let us know.';
|
|
@@ -526,7 +527,7 @@ async function getErrorMessageForHttpStatusCode(code) {
|
|
|
526
527
|
return `Server responded with status code ${code}`;
|
|
527
528
|
}
|
|
528
529
|
|
|
529
|
-
// The API server that should be used for operations.
|
|
530
|
+
// The Socket API server that should be used for operations.
|
|
530
531
|
function getDefaultApiBaseUrl() {
|
|
531
532
|
const baseUrl =
|
|
532
533
|
// Lazily access constants.ENV.SOCKET_CLI_API_BASE_URL.
|
|
@@ -556,7 +557,7 @@ async function queryApiSafeText(path, fetchSpinnerDesc) {
|
|
|
556
557
|
return {
|
|
557
558
|
ok: false,
|
|
558
559
|
message: 'Authentication Error',
|
|
559
|
-
cause: 'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API
|
|
560
|
+
cause: 'User must be authenticated to run this command. To log in, run the command `socket login` and enter your Socket API token.'
|
|
560
561
|
};
|
|
561
562
|
}
|
|
562
563
|
|
|
@@ -571,14 +572,14 @@ async function queryApiSafeText(path, fetchSpinnerDesc) {
|
|
|
571
572
|
try {
|
|
572
573
|
result = await queryApi(path, apiToken);
|
|
573
574
|
if (fetchSpinnerDesc) {
|
|
574
|
-
spinner.successAndStop(`Received API response (after requesting ${fetchSpinnerDesc}).`);
|
|
575
|
+
spinner.successAndStop(`Received Socket API response (after requesting ${fetchSpinnerDesc}).`);
|
|
575
576
|
}
|
|
576
577
|
} catch (e) {
|
|
577
578
|
if (fetchSpinnerDesc) {
|
|
578
579
|
spinner.failAndStop(`An error was thrown while requesting ${fetchSpinnerDesc}.`);
|
|
579
580
|
}
|
|
580
581
|
const cause = e?.message;
|
|
581
|
-
require$$6.debugFn('error', 'caught: queryApi() error');
|
|
582
|
+
require$$6.debugFn('error', 'caught: await queryApi() error');
|
|
582
583
|
require$$6.debugDir('inspect', {
|
|
583
584
|
error: e
|
|
584
585
|
});
|
|
@@ -1043,7 +1044,7 @@ async function meowWithSubcommands(subcommands, options) {
|
|
|
1043
1044
|
out.push('');
|
|
1044
1045
|
out.push(' Main commands');
|
|
1045
1046
|
out.push('');
|
|
1046
|
-
out.push(' socket login Setup the CLI with an API
|
|
1047
|
+
out.push(' socket login Setup the Socket CLI with an API token and defaults');
|
|
1047
1048
|
out.push(' socket scan create Create a new Scan and report');
|
|
1048
1049
|
out.push(' socket npm/eslint@1.0.0 Request the security score of a particular package');
|
|
1049
1050
|
out.push(' socket ci Shorthand for CI; socket scan create --report --no-interactive');
|
|
@@ -1364,7 +1365,7 @@ async function determineOrgSlug(orgFlag, interactive, dryRun) {
|
|
|
1364
1365
|
let orgSlug = String(orgFlag || defaultOrgSlug || '');
|
|
1365
1366
|
if (!orgSlug) {
|
|
1366
1367
|
if (!interactive) {
|
|
1367
|
-
logger.logger.warn('Note: This command requires an org slug because the remote API endpoint does.');
|
|
1368
|
+
logger.logger.warn('Note: This command requires an org slug because the remote Socket API endpoint does.');
|
|
1368
1369
|
logger.logger.warn('');
|
|
1369
1370
|
logger.logger.warn('It seems no default org was setup and the `--org` flag was not used.');
|
|
1370
1371
|
logger.logger.warn("Additionally, `--no-interactive` was set so we can't ask for it.");
|
|
@@ -1427,7 +1428,7 @@ async function getDefaultOrgSlug() {
|
|
|
1427
1428
|
return {
|
|
1428
1429
|
ok: false,
|
|
1429
1430
|
message: 'Failed to establish identity',
|
|
1430
|
-
data: `No organization associated with the API token. Unable to continue.`
|
|
1431
|
+
data: `No organization associated with the Socket API token. Unable to continue.`
|
|
1431
1432
|
};
|
|
1432
1433
|
}
|
|
1433
1434
|
const slug = organizations[keys[0]]?.name ?? undefined;
|
|
@@ -1478,6 +1479,8 @@ async function getBaseBranch(cwd = process.cwd()) {
|
|
|
1478
1479
|
}
|
|
1479
1480
|
async function getRepoInfo(cwd = process.cwd()) {
|
|
1480
1481
|
let info = null;
|
|
1482
|
+
const quotedCmd = 'git remote get-url origin`';
|
|
1483
|
+
require$$6.debugFn('stdio', `spawn: ${quotedCmd}`);
|
|
1481
1484
|
try {
|
|
1482
1485
|
const remoteUrl = (await spawn.spawn('git', ['remote', 'get-url', 'origin'], {
|
|
1483
1486
|
cwd
|
|
@@ -1490,7 +1493,7 @@ async function getRepoInfo(cwd = process.cwd()) {
|
|
|
1490
1493
|
});
|
|
1491
1494
|
}
|
|
1492
1495
|
} catch (e) {
|
|
1493
|
-
require$$6.debugFn('error',
|
|
1496
|
+
require$$6.debugFn('error', `caught: ${quotedCmd} failed`);
|
|
1494
1497
|
require$$6.debugDir('inspect', {
|
|
1495
1498
|
error: e
|
|
1496
1499
|
});
|
|
@@ -3467,8 +3470,10 @@ async function getAgentExecPath(agent) {
|
|
|
3467
3470
|
nothrow: true
|
|
3468
3471
|
})) ?? binName;
|
|
3469
3472
|
}
|
|
3470
|
-
async function getAgentVersion(agentExecPath, cwd) {
|
|
3473
|
+
async function getAgentVersion(agent, agentExecPath, cwd) {
|
|
3471
3474
|
let result;
|
|
3475
|
+
const quotedCmd = `\`${agent} --version\``;
|
|
3476
|
+
require$$6.debugFn('stdio', `spawn: ${quotedCmd}`);
|
|
3472
3477
|
try {
|
|
3473
3478
|
result =
|
|
3474
3479
|
// Coerce version output into a valid semver version by passing it through
|
|
@@ -3476,14 +3481,13 @@ async function getAgentVersion(agentExecPath, cwd) {
|
|
|
3476
3481
|
// and tildes (~).
|
|
3477
3482
|
vendor.semverExports.coerce(
|
|
3478
3483
|
// All package managers support the "--version" flag.
|
|
3479
|
-
|
|
3480
3484
|
(await spawn.spawn(agentExecPath, ['--version'], {
|
|
3481
3485
|
cwd,
|
|
3482
3486
|
// Lazily access constants.WIN32.
|
|
3483
3487
|
shell: constants.WIN32
|
|
3484
3488
|
})).stdout) ?? undefined;
|
|
3485
3489
|
} catch (e) {
|
|
3486
|
-
require$$6.debugFn('error',
|
|
3490
|
+
require$$6.debugFn('error', `caught: ${quotedCmd} failed`);
|
|
3487
3491
|
require$$6.debugDir('inspect', {
|
|
3488
3492
|
error: e
|
|
3489
3493
|
});
|
|
@@ -3530,7 +3534,7 @@ async function detectPackageEnvironment({
|
|
|
3530
3534
|
onUnknown?.(pkgManager);
|
|
3531
3535
|
}
|
|
3532
3536
|
const agentExecPath = await getAgentExecPath(agent);
|
|
3533
|
-
const agentVersion = await getAgentVersion(agentExecPath, cwd);
|
|
3537
|
+
const agentVersion = await getAgentVersion(agent, agentExecPath, cwd);
|
|
3534
3538
|
if (agent === YARN_CLASSIC && (agentVersion?.major ?? 0) > 1) {
|
|
3535
3539
|
agent = YARN_BERRY;
|
|
3536
3540
|
}
|
|
@@ -3872,5 +3876,5 @@ exports.tildify = tildify;
|
|
|
3872
3876
|
exports.updateConfigValue = updateConfigValue;
|
|
3873
3877
|
exports.walkNestedMap = walkNestedMap;
|
|
3874
3878
|
exports.writeSocketJson = writeSocketJson;
|
|
3875
|
-
//# debugId=
|
|
3879
|
+
//# debugId=a8f49554-8fe7-44da-98ac-f1fce824b07c
|
|
3876
3880
|
//# sourceMappingURL=utils.js.map
|