@trustify-da/trustify-da-javascript-client 0.3.0-ea.5e721a4 → 0.3.0-ea.61444d4
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/README.md +177 -3
- package/dist/package.json +25 -22
- package/dist/src/analysis.d.ts +14 -7
- package/dist/src/analysis.js +29 -13
- package/dist/src/cli.js +106 -2
- package/dist/src/cyclone_dx_sbom.d.ts +7 -1
- package/dist/src/cyclone_dx_sbom.js +29 -8
- package/dist/src/index.d.ts +74 -11
- package/dist/src/index.js +78 -7
- package/dist/src/license/index.d.ts +3 -3
- package/dist/src/license/index.js +4 -1
- package/dist/src/license/license_utils.js +4 -1
- package/dist/src/license/licenses_api.d.ts +2 -2
- package/dist/src/oci_image/images.d.ts +1 -1
- package/dist/src/oci_image/images.js +15 -1
- package/dist/src/oci_image/utils.d.ts +5 -5
- package/dist/src/provider.d.ts +4 -3
- package/dist/src/provider.js +8 -2
- package/dist/src/providers/base_java.d.ts +14 -12
- package/dist/src/providers/base_java.js +18 -44
- package/dist/src/providers/base_javascript.d.ts +20 -9
- package/dist/src/providers/base_javascript.js +10 -3
- package/dist/src/providers/base_pyproject.d.ts +19 -31
- package/dist/src/providers/base_pyproject.js +57 -73
- package/dist/src/providers/containerfile_parser.d.ts +5 -0
- package/dist/src/providers/containerfile_parser.js +20 -0
- package/dist/src/providers/golang_gomodules.d.ts +11 -1
- package/dist/src/providers/golang_gomodules.js +108 -10
- package/dist/src/providers/java_gradle.d.ts +19 -0
- package/dist/src/providers/java_gradle.js +116 -2
- package/dist/src/providers/java_gradle_groovy.d.ts +1 -1
- package/dist/src/providers/java_gradle_kotlin.d.ts +1 -1
- package/dist/src/providers/java_maven.d.ts +10 -2
- package/dist/src/providers/java_maven.js +165 -1
- package/dist/src/providers/javascript_bun.d.ts +10 -0
- package/dist/src/providers/javascript_bun.js +100 -0
- package/dist/src/providers/javascript_npm.d.ts +6 -0
- package/dist/src/providers/javascript_npm.js +21 -0
- package/dist/src/providers/javascript_pnpm.js +6 -2
- package/dist/src/providers/marker_evaluator.d.ts +14 -0
- package/dist/src/providers/marker_evaluator.js +191 -0
- package/dist/src/providers/oci_dockerfile.d.ts +51 -0
- package/dist/src/providers/oci_dockerfile.js +177 -0
- package/dist/src/providers/processors/yarn_berry_processor.d.ts +2 -2
- package/dist/src/providers/processors/yarn_berry_processor.js +6 -2
- package/dist/src/providers/processors/yarn_classic_processor.d.ts +2 -2
- package/dist/src/providers/python_controller.d.ts +5 -1
- package/dist/src/providers/python_controller.js +69 -8
- package/dist/src/providers/python_pip.d.ts +5 -0
- package/dist/src/providers/python_pip.js +5 -5
- package/dist/src/providers/python_pip_pyproject.d.ts +61 -0
- package/dist/src/providers/python_pip_pyproject.js +146 -0
- package/dist/src/providers/python_poetry.d.ts +64 -8
- package/dist/src/providers/python_poetry.js +139 -22
- package/dist/src/providers/python_uv.d.ts +20 -1
- package/dist/src/providers/python_uv.js +126 -3
- package/dist/src/providers/rust_cargo.d.ts +6 -2
- package/dist/src/providers/rust_cargo.js +105 -19
- package/dist/src/providers/tree-sitter-containerfile.wasm +0 -0
- package/dist/src/remediate.d.ts +21 -0
- package/dist/src/remediate.js +149 -0
- package/dist/src/remediation.d.ts +57 -0
- package/dist/src/remediation.js +436 -0
- package/dist/src/remediation_report.d.ts +40 -0
- package/dist/src/remediation_report.js +159 -0
- package/dist/src/sbom.d.ts +7 -1
- package/dist/src/sbom.js +4 -2
- package/dist/src/tools.d.ts +28 -2
- package/dist/src/tools.js +58 -0
- package/dist/src/updaters/maven_updater.d.ts +26 -0
- package/dist/src/updaters/maven_updater.js +322 -0
- package/dist/src/updaters/toml_updater.d.ts +33 -0
- package/dist/src/updaters/toml_updater.js +244 -0
- package/dist/src/workspace.d.ts +9 -0
- package/dist/src/workspace.js +1 -1
- package/package.json +26 -23
|
@@ -4,8 +4,9 @@ import { PackageURL } from 'packageurl-js';
|
|
|
4
4
|
import { readLicenseFile } from '../license/license_utils.js';
|
|
5
5
|
import Sbom from '../sbom.js';
|
|
6
6
|
import { getCustom, getCustomPath, invokeCommand } from "../tools.js";
|
|
7
|
+
import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js';
|
|
7
8
|
import { getParser, getRequireQuery } from './gomod_parser.js';
|
|
8
|
-
export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest };
|
|
9
|
+
export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest, packageManagerName() { return 'go'; } };
|
|
9
10
|
/** @typedef {import('../provider').Provider} */
|
|
10
11
|
/** @typedef {import('../provider').Provided} Provided */
|
|
11
12
|
/** @typedef {{name: string, version: string}} Package */
|
|
@@ -186,6 +187,36 @@ function performManifestVersionsCheck(rootElementName, goModGraphOutputRows, man
|
|
|
186
187
|
throw error;
|
|
187
188
|
}
|
|
188
189
|
}
|
|
190
|
+
/** Parses go.sum to build a hash map of module@version to CycloneDX hashes. */
|
|
191
|
+
function parseGoSumHashes(manifestDir) {
|
|
192
|
+
let goSumPath = path.join(manifestDir, 'go.sum');
|
|
193
|
+
if (!fs.existsSync(goSumPath)) {
|
|
194
|
+
return new Map();
|
|
195
|
+
}
|
|
196
|
+
let hashMap = new Map();
|
|
197
|
+
let content = fs.readFileSync(goSumPath, 'utf-8');
|
|
198
|
+
for (let line of content.split('\n')) {
|
|
199
|
+
line = line.trim();
|
|
200
|
+
if (!line) {
|
|
201
|
+
continue;
|
|
202
|
+
}
|
|
203
|
+
let parts = line.split(/\s+/);
|
|
204
|
+
if (parts.length < 3) {
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
let [mod, version, hash] = parts;
|
|
208
|
+
if (version.endsWith('/go.mod')) {
|
|
209
|
+
continue;
|
|
210
|
+
}
|
|
211
|
+
if (!hash.startsWith('h1:')) {
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
let base64Part = hash.slice(3);
|
|
215
|
+
let hexDigest = Buffer.from(base64Part, 'base64').toString('hex');
|
|
216
|
+
hashMap.set(`${mod}@${version}`, [{ alg: "SHA-256", content: hexDigest }]);
|
|
217
|
+
}
|
|
218
|
+
return hashMap;
|
|
219
|
+
}
|
|
189
220
|
/**
|
|
190
221
|
* Create SBOM json string for go Module.
|
|
191
222
|
* @param {string} manifest - path for go.mod
|
|
@@ -240,6 +271,7 @@ async function getSBOM(manifest, opts = {}, includeTransitive) {
|
|
|
240
271
|
if (matchManifestVersions === "true") {
|
|
241
272
|
performManifestVersionsCheck(root, rows, manifestContent, parser, requireQuery);
|
|
242
273
|
}
|
|
274
|
+
let goSumHashes = parseGoSumHashes(manifestDir);
|
|
243
275
|
const mainModule = toPurl(root, "@");
|
|
244
276
|
const license = readLicenseFromManifest(manifest);
|
|
245
277
|
sbom.addRoot(mainModule, license);
|
|
@@ -261,7 +293,7 @@ async function getSBOM(manifest, opts = {}, includeTransitive) {
|
|
|
261
293
|
if (getParentVertexFromEdge(row) === root && !directDepPaths.has(getPackageName(child))) {
|
|
262
294
|
return;
|
|
263
295
|
}
|
|
264
|
-
sbom.addDependency(source, target);
|
|
296
|
+
sbom.addDependency(source, target, undefined, goSumHashes.get(child));
|
|
265
297
|
});
|
|
266
298
|
// at the end, filter out all ignored dependencies including versions.
|
|
267
299
|
sbom.filterIgnoredDepsIncludingVersion(allIgnoredDeps);
|
|
@@ -274,12 +306,22 @@ async function getSBOM(manifest, opts = {}, includeTransitive) {
|
|
|
274
306
|
let target = toPurl(child, "@");
|
|
275
307
|
if (dependencyNotIgnored(ignoredDeps, target)) {
|
|
276
308
|
if (directDepPaths.has(getPackageName(child))) {
|
|
277
|
-
sbom.addDependency(mainModule, target);
|
|
309
|
+
sbom.addDependency(mainModule, target, undefined, goSumHashes.get(child));
|
|
278
310
|
}
|
|
279
311
|
}
|
|
280
312
|
});
|
|
281
313
|
enforceRemovingIgnoredDepsInCaseOfAutomaticVersionUpdate(ignoredDeps, sbom);
|
|
282
314
|
}
|
|
315
|
+
// Backfill hashes for components that were only seen as dependency sources
|
|
316
|
+
for (const comp of sbom.sbomModel.components) {
|
|
317
|
+
if (!comp.hashes && comp.purl) {
|
|
318
|
+
let key = decodeURIComponent(comp.purl.replace('pkg:golang/', ''));
|
|
319
|
+
let hashes = goSumHashes.get(key);
|
|
320
|
+
if (hashes) {
|
|
321
|
+
comp.hashes = hashes;
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
}
|
|
283
325
|
return sbom.getAsJsonString(opts);
|
|
284
326
|
}
|
|
285
327
|
/**
|
|
@@ -328,13 +370,7 @@ function getFinalPackagesVersionsForModule(rows, manifestPath, goBin) {
|
|
|
328
370
|
catch (error) {
|
|
329
371
|
throw new Error('failed to list all modules', { cause: error });
|
|
330
372
|
}
|
|
331
|
-
let finalVersionModules =
|
|
332
|
-
finalVersionsForAllModules.split(getLineSeparatorGolang()).filter(string => string.trim() !== "")
|
|
333
|
-
.filter(string => string.trim().split(" ").length === 2)
|
|
334
|
-
.forEach((dependency) => {
|
|
335
|
-
let dep = dependency.split(" ");
|
|
336
|
-
finalVersionModules[dep[0]] = dep[1];
|
|
337
|
-
});
|
|
373
|
+
let finalVersionModules = parseModuleVersions(finalVersionsForAllModules);
|
|
338
374
|
let finalVersionModulesArray = new Array();
|
|
339
375
|
rows.filter(string => string.trim() !== "").forEach(module => {
|
|
340
376
|
let child = getChildVertexFromEdge(module);
|
|
@@ -395,7 +431,69 @@ function getVersionOfPackage(fullPackage) {
|
|
|
395
431
|
let parts = fullPackage.split("@");
|
|
396
432
|
return parts.length > 1 ? parts[1] : undefined;
|
|
397
433
|
}
|
|
434
|
+
function parseModuleVersions(goListOutput) {
|
|
435
|
+
let modules = {};
|
|
436
|
+
goListOutput.split(getLineSeparatorGolang()).filter(string => string.trim() !== "")
|
|
437
|
+
.forEach((line) => {
|
|
438
|
+
let parts = line.trim().split(" ");
|
|
439
|
+
if (parts.length === 2) {
|
|
440
|
+
modules[parts[0]] = parts[1];
|
|
441
|
+
}
|
|
442
|
+
else if (parts.length >= 4 && parts[2] === "=>") {
|
|
443
|
+
modules[parts[0]] = parts[parts.length - 1];
|
|
444
|
+
}
|
|
445
|
+
});
|
|
446
|
+
return modules;
|
|
447
|
+
}
|
|
398
448
|
function getLineSeparatorGolang() {
|
|
399
449
|
let reg = /\n|\r\n/;
|
|
400
450
|
return reg;
|
|
401
451
|
}
|
|
452
|
+
/**
|
|
453
|
+
* Discover all go.mod manifest paths in a Go workspace.
|
|
454
|
+
* Uses `go work edit -json` to get workspace members.
|
|
455
|
+
*
|
|
456
|
+
* @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain go.work)
|
|
457
|
+
* @param {import('../index.js').Options} [opts={}]
|
|
458
|
+
* @returns {Promise<string[]>} Paths to go.mod files (absolute)
|
|
459
|
+
*/
|
|
460
|
+
export async function discoverGoWorkspaceModules(workspaceRoot, opts = {}) {
|
|
461
|
+
const root = path.resolve(workspaceRoot);
|
|
462
|
+
const goWork = path.join(root, 'go.work');
|
|
463
|
+
if (!fs.existsSync(goWork)) {
|
|
464
|
+
return [];
|
|
465
|
+
}
|
|
466
|
+
const goBin = getCustomPath('go', opts);
|
|
467
|
+
let output;
|
|
468
|
+
try {
|
|
469
|
+
output = invokeCommand(goBin, ['work', 'edit', '-json', goWork], { cwd: root });
|
|
470
|
+
}
|
|
471
|
+
catch {
|
|
472
|
+
return [];
|
|
473
|
+
}
|
|
474
|
+
let workspace;
|
|
475
|
+
try {
|
|
476
|
+
workspace = JSON.parse(output.toString().trim());
|
|
477
|
+
}
|
|
478
|
+
catch {
|
|
479
|
+
return [];
|
|
480
|
+
}
|
|
481
|
+
const useEntries = workspace.Use || [];
|
|
482
|
+
if (useEntries.length === 0) {
|
|
483
|
+
return [];
|
|
484
|
+
}
|
|
485
|
+
const manifestPaths = [];
|
|
486
|
+
for (const entry of useEntries) {
|
|
487
|
+
const diskPath = entry.DiskPath;
|
|
488
|
+
if (!diskPath) {
|
|
489
|
+
continue;
|
|
490
|
+
}
|
|
491
|
+
const moduleDir = path.resolve(root, diskPath);
|
|
492
|
+
const goMod = path.join(moduleDir, 'go.mod');
|
|
493
|
+
if (fs.existsSync(goMod)) {
|
|
494
|
+
manifestPaths.push(goMod);
|
|
495
|
+
}
|
|
496
|
+
}
|
|
497
|
+
const ignorePatterns = resolveWorkspaceDiscoveryIgnore(opts);
|
|
498
|
+
return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
|
|
499
|
+
}
|
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Discover all build.gradle[.kts] manifest paths in a Gradle multi-project build.
|
|
3
|
+
* Uses a custom init script to get structured project listing.
|
|
4
|
+
*
|
|
5
|
+
* @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain settings.gradle[.kts])
|
|
6
|
+
* @param {import('../index.js').Options} [opts={}]
|
|
7
|
+
* @returns {Promise<string[]>} Paths to build.gradle[.kts] files (absolute)
|
|
8
|
+
*/
|
|
9
|
+
export function discoverGradleSubprojects(workspaceRoot: string, opts?: import("../index.js").Options): Promise<string[]>;
|
|
10
|
+
/**
|
|
11
|
+
* Parse the structured output from the Gradle init script.
|
|
12
|
+
*
|
|
13
|
+
* @param {string} raw - Raw stdout from gradle
|
|
14
|
+
* @returns {{ path: string, dir: string }[]}
|
|
15
|
+
*/
|
|
16
|
+
export function parseGradleInitScriptOutput(raw: string): {
|
|
17
|
+
path: string;
|
|
18
|
+
dir: string;
|
|
19
|
+
}[];
|
|
1
20
|
/**
|
|
2
21
|
* This class provides common functionality for Groovy and Kotlin DSL files.
|
|
3
22
|
*/
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
import crypto from 'node:crypto';
|
|
1
2
|
import fs from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
2
4
|
import path from 'node:path';
|
|
3
5
|
import { EOL } from 'os';
|
|
4
|
-
import
|
|
6
|
+
import { parse as parseToml } from 'smol-toml';
|
|
5
7
|
import { readLicenseFile } from '../license/license_utils.js';
|
|
6
8
|
import Sbom from '../sbom.js';
|
|
9
|
+
import { invokeCommand } from '../tools.js';
|
|
10
|
+
import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js';
|
|
7
11
|
import Base_java, { ecosystem_gradle } from "./base_java.js";
|
|
8
12
|
/** @typedef {import('../provider.js').Provider} */
|
|
9
13
|
/** @typedef {import('../provider.js').Provided} Provided */
|
|
@@ -362,7 +366,7 @@ export default class Java_gradle extends Base_java {
|
|
|
362
366
|
// Read and parse the TOML file
|
|
363
367
|
let pathOfToml = path.join(path.dirname(manifestPath), "gradle", "libs.versions.toml");
|
|
364
368
|
const tomlString = fs.readFileSync(pathOfToml).toString();
|
|
365
|
-
let tomlObject =
|
|
369
|
+
let tomlObject = parseToml(tomlString);
|
|
366
370
|
let groupPlusArtifactObject = tomlObject.libraries[alias];
|
|
367
371
|
let parts = groupPlusArtifactObject.module.split(":");
|
|
368
372
|
let groupId = parts[0];
|
|
@@ -407,3 +411,113 @@ export default class Java_gradle extends Base_java {
|
|
|
407
411
|
return undefined;
|
|
408
412
|
}
|
|
409
413
|
}
|
|
414
|
+
const DEFAULT_GRADLE_DISCOVERY_IGNORE = [
|
|
415
|
+
'**/build/**',
|
|
416
|
+
'**/.gradle/**',
|
|
417
|
+
];
|
|
418
|
+
/** Gradle init script that emits structured project listing. */
|
|
419
|
+
const GRADLE_INIT_SCRIPT = `allprojects {
|
|
420
|
+
task daListProjects {
|
|
421
|
+
doLast {
|
|
422
|
+
println "::DA_PROJECT::\${project.path}::\${project.projectDir}"
|
|
423
|
+
}
|
|
424
|
+
}
|
|
425
|
+
}
|
|
426
|
+
`;
|
|
427
|
+
/**
|
|
428
|
+
* Discover all build.gradle[.kts] manifest paths in a Gradle multi-project build.
|
|
429
|
+
* Uses a custom init script to get structured project listing.
|
|
430
|
+
*
|
|
431
|
+
* @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain settings.gradle[.kts])
|
|
432
|
+
* @param {import('../index.js').Options} [opts={}]
|
|
433
|
+
* @returns {Promise<string[]>} Paths to build.gradle[.kts] files (absolute)
|
|
434
|
+
*/
|
|
435
|
+
export async function discoverGradleSubprojects(workspaceRoot, opts = {}) {
|
|
436
|
+
const root = path.resolve(workspaceRoot);
|
|
437
|
+
const hasSettings = fs.existsSync(path.join(root, 'settings.gradle'))
|
|
438
|
+
|| fs.existsSync(path.join(root, 'settings.gradle.kts'));
|
|
439
|
+
if (!hasSettings) {
|
|
440
|
+
return [];
|
|
441
|
+
}
|
|
442
|
+
const manifestPaths = [];
|
|
443
|
+
const rootBuildKts = path.join(root, 'build.gradle.kts');
|
|
444
|
+
const rootBuild = path.join(root, 'build.gradle');
|
|
445
|
+
const rootManifest = fs.existsSync(rootBuildKts) ? rootBuildKts : fs.existsSync(rootBuild) ? rootBuild : null;
|
|
446
|
+
if (rootManifest) {
|
|
447
|
+
manifestPaths.push(rootManifest);
|
|
448
|
+
}
|
|
449
|
+
let gradleBin;
|
|
450
|
+
try {
|
|
451
|
+
gradleBin = new Java_gradle().selectToolBinary(rootManifest || rootBuild, opts);
|
|
452
|
+
}
|
|
453
|
+
catch {
|
|
454
|
+
const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE];
|
|
455
|
+
return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
|
|
456
|
+
}
|
|
457
|
+
const initScriptPath = path.join(os.tmpdir(), `da-list-projects-${crypto.randomUUID()}.gradle`);
|
|
458
|
+
try {
|
|
459
|
+
fs.writeFileSync(initScriptPath, GRADLE_INIT_SCRIPT);
|
|
460
|
+
let output;
|
|
461
|
+
try {
|
|
462
|
+
output = invokeCommand(gradleBin, [
|
|
463
|
+
'-q', '--no-daemon',
|
|
464
|
+
'--init-script', initScriptPath,
|
|
465
|
+
'daListProjects',
|
|
466
|
+
], { cwd: root });
|
|
467
|
+
}
|
|
468
|
+
catch {
|
|
469
|
+
const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE];
|
|
470
|
+
return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
|
|
471
|
+
}
|
|
472
|
+
const projects = parseGradleInitScriptOutput(output.toString());
|
|
473
|
+
for (const proj of projects) {
|
|
474
|
+
if (proj.path === ':') {
|
|
475
|
+
continue;
|
|
476
|
+
}
|
|
477
|
+
const projDir = path.resolve(proj.dir);
|
|
478
|
+
const buildKts = path.join(projDir, 'build.gradle.kts');
|
|
479
|
+
const buildGroovy = path.join(projDir, 'build.gradle');
|
|
480
|
+
if (fs.existsSync(buildKts)) {
|
|
481
|
+
manifestPaths.push(buildKts);
|
|
482
|
+
}
|
|
483
|
+
else if (fs.existsSync(buildGroovy)) {
|
|
484
|
+
manifestPaths.push(buildGroovy);
|
|
485
|
+
}
|
|
486
|
+
}
|
|
487
|
+
}
|
|
488
|
+
finally {
|
|
489
|
+
try {
|
|
490
|
+
fs.unlinkSync(initScriptPath);
|
|
491
|
+
}
|
|
492
|
+
catch { /* ignore */ }
|
|
493
|
+
}
|
|
494
|
+
const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE];
|
|
495
|
+
return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
|
|
496
|
+
}
|
|
497
|
+
/**
|
|
498
|
+
* Parse the structured output from the Gradle init script.
|
|
499
|
+
*
|
|
500
|
+
* @param {string} raw - Raw stdout from gradle
|
|
501
|
+
* @returns {{ path: string, dir: string }[]}
|
|
502
|
+
*/
|
|
503
|
+
export function parseGradleInitScriptOutput(raw) {
|
|
504
|
+
const projects = [];
|
|
505
|
+
for (const rawLine of raw.split('\n')) {
|
|
506
|
+
const line = rawLine.trimEnd();
|
|
507
|
+
if (!line.startsWith('::DA_PROJECT::')) {
|
|
508
|
+
continue;
|
|
509
|
+
}
|
|
510
|
+
const prefix = '::DA_PROJECT::';
|
|
511
|
+
const remainder = line.substring(prefix.length);
|
|
512
|
+
const lastSep = remainder.lastIndexOf('::');
|
|
513
|
+
if (lastSep < 0) {
|
|
514
|
+
continue;
|
|
515
|
+
}
|
|
516
|
+
const projPath = remainder.substring(0, lastSep);
|
|
517
|
+
const dir = remainder.substring(lastSep + 2);
|
|
518
|
+
if (projPath && dir) {
|
|
519
|
+
projects.push({ path: projPath, dir });
|
|
520
|
+
}
|
|
521
|
+
}
|
|
522
|
+
return projects;
|
|
523
|
+
}
|
|
@@ -3,5 +3,5 @@ export default class Java_gradle_groovy extends Java_gradle {
|
|
|
3
3
|
_parseAliasForLibsNotation(alias: any): any;
|
|
4
4
|
_extractDepToBeIgnored(dep: any): any;
|
|
5
5
|
}
|
|
6
|
-
export type Provided =
|
|
6
|
+
export type Provided = any;
|
|
7
7
|
import Java_gradle from './java_gradle.js';
|
|
@@ -7,5 +7,5 @@ export default class Java_gradle_kotlin extends Java_gradle {
|
|
|
7
7
|
_parseAliasForLibsNotation(alias: any): any;
|
|
8
8
|
_extractDepToBeIgnored(dep: any): string | null;
|
|
9
9
|
}
|
|
10
|
-
export type Provided =
|
|
10
|
+
export type Provided = any;
|
|
11
11
|
import Java_gradle from './java_gradle.js';
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Discover all pom.xml manifest paths in a Maven multi-module project.
|
|
3
|
+
*
|
|
4
|
+
* @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pom.xml)
|
|
5
|
+
* @param {object} [opts={}]
|
|
6
|
+
* @returns {Promise<string[]>} Paths to pom.xml files (absolute)
|
|
7
|
+
*/
|
|
8
|
+
export function discoverMavenModules(workspaceRoot: string, opts?: object): Promise<string[]>;
|
|
1
9
|
/** @typedef {import('../provider').Provider} */
|
|
2
10
|
/** @typedef {import('../provider').Provided} Provided */
|
|
3
11
|
/** @typedef {{name: string, version: string}} Package */
|
|
@@ -43,8 +51,8 @@ export default class Java_maven extends Base_java {
|
|
|
43
51
|
createSbomFileFromTextFormat(textGraphList: string, ignoredDeps: [string], opts: any, manifestPath: string): string;
|
|
44
52
|
#private;
|
|
45
53
|
}
|
|
46
|
-
export type Java_maven =
|
|
47
|
-
export type Provided =
|
|
54
|
+
export type Java_maven = any;
|
|
55
|
+
export type Provided = any;
|
|
48
56
|
export type Package = {
|
|
49
57
|
name: string;
|
|
50
58
|
version: string;
|
|
@@ -5,7 +5,8 @@ import { EOL } from 'os';
|
|
|
5
5
|
import { XMLParser } from 'fast-xml-parser';
|
|
6
6
|
import { getLicense } from '../license/license_utils.js';
|
|
7
7
|
import Sbom from '../sbom.js';
|
|
8
|
-
import { getCustom } from '../tools.js';
|
|
8
|
+
import { getCustom, invokeCommand } from '../tools.js';
|
|
9
|
+
import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js';
|
|
9
10
|
import Base_java, { ecosystem_maven } from "./base_java.js";
|
|
10
11
|
/** @typedef {import('../provider').Provider} */
|
|
11
12
|
/** @typedef {import('../provider').Provided} Provided */
|
|
@@ -180,6 +181,7 @@ export default class Java_maven extends Base_java {
|
|
|
180
181
|
/** @type [Dependency] */
|
|
181
182
|
let dependencies = this.#getDependencies(tmpEffectivePom)
|
|
182
183
|
.filter(d => !this.#dependencyIn(d, ignored));
|
|
184
|
+
dependencies = this.#resolveVersionRanges(dependencies, manifestPath, opts);
|
|
183
185
|
let sbom = new Sbom();
|
|
184
186
|
let rootDependency = this.#getRootFromPom(tmpEffectivePom, manifestPath);
|
|
185
187
|
let purlRoot = this.toPurl(rootDependency.groupId, rootDependency.artifactId, rootDependency.version);
|
|
@@ -288,4 +290,166 @@ export default class Java_maven extends Base_java {
|
|
|
288
290
|
#dependencyIn(dep, deps) {
|
|
289
291
|
return deps.filter(d => dep.artifactId === d.artifactId && dep.groupId === d.groupId && dep.scope === d.scope).length > 0;
|
|
290
292
|
}
|
|
293
|
+
/**
|
|
294
|
+
* Returns true if the given version string is a Maven version range
|
|
295
|
+
* (starts with '[' or '(').
|
|
296
|
+
* @param {string} version
|
|
297
|
+
* @returns {boolean}
|
|
298
|
+
* @private
|
|
299
|
+
*/
|
|
300
|
+
#isVersionRange(version) {
|
|
301
|
+
return typeof version === 'string' && (version.startsWith('[') || version.startsWith('('));
|
|
302
|
+
}
|
|
303
|
+
/**
|
|
304
|
+
* Resolves Maven version ranges in the given dependency list by running
|
|
305
|
+
* maven-dependency-plugin:tree and reading the concrete versions it selects.
|
|
306
|
+
* If no dependency uses a version range, returns the list unchanged.
|
|
307
|
+
* @param {Dependency[]} dependencies
|
|
308
|
+
* @param {string} manifestPath
|
|
309
|
+
* @param {object} opts
|
|
310
|
+
* @returns {Dependency[]}
|
|
311
|
+
* @private
|
|
312
|
+
*/
|
|
313
|
+
#resolveVersionRanges(dependencies, manifestPath, opts = {}) {
|
|
314
|
+
// short-circuit if no dependency has a version range
|
|
315
|
+
if (!dependencies.some(dep => this.#isVersionRange(dep.version))) {
|
|
316
|
+
return dependencies;
|
|
317
|
+
}
|
|
318
|
+
const mvn = this.selectToolBinary(manifestPath, opts);
|
|
319
|
+
const mvnArgs = JSON.parse(getCustom('TRUSTIFY_DA_MVN_ARGS', '[]', opts));
|
|
320
|
+
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'trustify_da_range_'));
|
|
321
|
+
const tmpDepTree = path.join(tmpDir, 'mvn_deptree_ranges.txt');
|
|
322
|
+
try {
|
|
323
|
+
this._invokeCommand(mvn, [
|
|
324
|
+
'-q',
|
|
325
|
+
'org.apache.maven.plugins:maven-dependency-plugin:3.6.0:tree',
|
|
326
|
+
'-Dscope=compile',
|
|
327
|
+
'-DoutputType=text',
|
|
328
|
+
`-DoutputFile=${tmpDepTree}`,
|
|
329
|
+
...mvnArgs
|
|
330
|
+
], { cwd: path.dirname(manifestPath) });
|
|
331
|
+
const content = fs.readFileSync(tmpDepTree);
|
|
332
|
+
const lines = content.toString().split(EOL).filter(l => l.trim() !== '');
|
|
333
|
+
// Build a map of groupId:artifactId -> resolved version from depth-1 entries
|
|
334
|
+
/** @type {Map<string, string>} */
|
|
335
|
+
const resolvedVersions = new Map();
|
|
336
|
+
for (const line of lines) {
|
|
337
|
+
if (this._getDepth(line) === 1) {
|
|
338
|
+
const purl = this.parseDep(line);
|
|
339
|
+
resolvedVersions.set(`${purl.namespace}:${purl.name}`, purl.version);
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
// Replace version ranges with resolved concrete versions
|
|
343
|
+
return dependencies.map(dep => {
|
|
344
|
+
if (this.#isVersionRange(dep.version)) {
|
|
345
|
+
const key = `${dep.groupId}:${dep.artifactId}`;
|
|
346
|
+
const resolved = resolvedVersions.get(key);
|
|
347
|
+
if (resolved) {
|
|
348
|
+
return { ...dep, version: resolved };
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
return dep;
|
|
352
|
+
});
|
|
353
|
+
}
|
|
354
|
+
catch (error) {
|
|
355
|
+
if (process.env["TRUSTIFY_DA_DEBUG"] === "true") {
|
|
356
|
+
console.error("Failed to resolve Maven version ranges: " + error.message);
|
|
357
|
+
}
|
|
358
|
+
return dependencies;
|
|
359
|
+
}
|
|
360
|
+
finally {
|
|
361
|
+
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
const DEFAULT_MAVEN_DISCOVERY_IGNORE = [
|
|
366
|
+
'**/target/**',
|
|
367
|
+
];
|
|
368
|
+
/**
|
|
369
|
+
* Discover all pom.xml manifest paths in a Maven multi-module project.
|
|
370
|
+
*
|
|
371
|
+
* @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pom.xml)
|
|
372
|
+
* @param {object} [opts={}]
|
|
373
|
+
* @returns {Promise<string[]>} Paths to pom.xml files (absolute)
|
|
374
|
+
*/
|
|
375
|
+
export async function discoverMavenModules(workspaceRoot, opts = {}) {
|
|
376
|
+
const root = path.resolve(workspaceRoot);
|
|
377
|
+
const rootPom = path.join(root, 'pom.xml');
|
|
378
|
+
if (!fs.existsSync(rootPom)) {
|
|
379
|
+
return [];
|
|
380
|
+
}
|
|
381
|
+
let mvnBin;
|
|
382
|
+
try {
|
|
383
|
+
mvnBin = new Java_maven().selectToolBinary(rootPom, opts);
|
|
384
|
+
}
|
|
385
|
+
catch {
|
|
386
|
+
return [rootPom];
|
|
387
|
+
}
|
|
388
|
+
const visited = new Set();
|
|
389
|
+
const manifestPaths = [rootPom];
|
|
390
|
+
collectMavenModules(root, mvnBin, visited, manifestPaths);
|
|
391
|
+
const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_MAVEN_DISCOVERY_IGNORE];
|
|
392
|
+
return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
|
|
393
|
+
}
|
|
394
|
+
/**
|
|
395
|
+
* @param {string} dir - Absolute path to directory containing pom.xml
|
|
396
|
+
* @param {string} mvnBin - Maven binary path
|
|
397
|
+
* @param {Set<string>} visited - Already-visited directories (cycle guard)
|
|
398
|
+
* @param {string[]} manifestPaths - Accumulator for discovered pom.xml paths
|
|
399
|
+
*/
|
|
400
|
+
function collectMavenModules(dir, mvnBin, visited, manifestPaths) {
|
|
401
|
+
const resolvedDir = path.resolve(dir);
|
|
402
|
+
if (visited.has(resolvedDir)) {
|
|
403
|
+
return;
|
|
404
|
+
}
|
|
405
|
+
visited.add(resolvedDir);
|
|
406
|
+
const modules = listMavenModules(resolvedDir, mvnBin);
|
|
407
|
+
for (const mod of modules) {
|
|
408
|
+
const moduleDir = path.resolve(resolvedDir, mod);
|
|
409
|
+
const modulePom = path.join(moduleDir, 'pom.xml');
|
|
410
|
+
if (fs.existsSync(modulePom)) {
|
|
411
|
+
manifestPaths.push(modulePom);
|
|
412
|
+
collectMavenModules(moduleDir, mvnBin, visited, manifestPaths);
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
/**
|
|
417
|
+
* @param {string} dir - Directory containing pom.xml
|
|
418
|
+
* @param {string} mvnBin - Maven binary path
|
|
419
|
+
* @returns {string[]} Module directory names (relative to `dir`)
|
|
420
|
+
*/
|
|
421
|
+
function listMavenModules(dir, mvnBin) {
|
|
422
|
+
let output;
|
|
423
|
+
try {
|
|
424
|
+
output = invokeCommand(mvnBin, [
|
|
425
|
+
'help:evaluate',
|
|
426
|
+
'-Dexpression=project.modules',
|
|
427
|
+
'-q',
|
|
428
|
+
'-DforceStdout',
|
|
429
|
+
'-f', path.join(dir, 'pom.xml'),
|
|
430
|
+
'--batch-mode',
|
|
431
|
+
], { cwd: dir });
|
|
432
|
+
}
|
|
433
|
+
catch {
|
|
434
|
+
return [];
|
|
435
|
+
}
|
|
436
|
+
const raw = output.toString().trim();
|
|
437
|
+
if (!raw || raw.startsWith('<modules')) {
|
|
438
|
+
return [];
|
|
439
|
+
}
|
|
440
|
+
return parseMavenModuleList(raw);
|
|
441
|
+
}
|
|
442
|
+
/**
|
|
443
|
+
* @param {string} raw - Raw stdout from mvn help:evaluate -DforceStdout
|
|
444
|
+
* @returns {string[]}
|
|
445
|
+
*/
|
|
446
|
+
function parseMavenModuleList(raw) {
|
|
447
|
+
const parser = new XMLParser();
|
|
448
|
+
const parsed = parser.parse(raw);
|
|
449
|
+
const entries = parsed?.strings?.string;
|
|
450
|
+
if (!entries) {
|
|
451
|
+
return [];
|
|
452
|
+
}
|
|
453
|
+
const list = Array.isArray(entries) ? entries : [entries];
|
|
454
|
+
return list.map(s => String(s).trim()).filter(Boolean);
|
|
291
455
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export default class Javascript_bun extends Base_javascript {
|
|
2
|
+
_listCmdArgs(): void;
|
|
3
|
+
_buildDependencyTree(includeTransitive: any, opts?: {}): {
|
|
4
|
+
name: any;
|
|
5
|
+
version: any;
|
|
6
|
+
dependencies: {};
|
|
7
|
+
};
|
|
8
|
+
#private;
|
|
9
|
+
}
|
|
10
|
+
import Base_javascript from './base_javascript.js';
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { parse } from 'jsonc-parser';
|
|
4
|
+
import Base_javascript from './base_javascript.js';
|
|
5
|
+
export default class Javascript_bun extends Base_javascript {
|
|
6
|
+
_lockFileName() {
|
|
7
|
+
return "bun.lock";
|
|
8
|
+
}
|
|
9
|
+
_cmdName() {
|
|
10
|
+
return "bun";
|
|
11
|
+
}
|
|
12
|
+
_listCmdArgs() {
|
|
13
|
+
throw new Error("not supported by Bun");
|
|
14
|
+
}
|
|
15
|
+
_updateLockFileCmdArgs() {
|
|
16
|
+
return ['install', '--lockfile-only'];
|
|
17
|
+
}
|
|
18
|
+
_buildDependencyTree(includeTransitive, opts = {}) {
|
|
19
|
+
this._version();
|
|
20
|
+
const manifestDir = path.dirname(this._getManifest().manifestPath);
|
|
21
|
+
const lockDir = this._findLockFileDir(manifestDir, opts) || manifestDir;
|
|
22
|
+
this._createLockFile(lockDir);
|
|
23
|
+
const lockContent = fs.readFileSync(path.join(lockDir, 'bun.lock'), 'utf-8');
|
|
24
|
+
const lockData = parse(lockContent);
|
|
25
|
+
const packages = lockData.packages || {};
|
|
26
|
+
const memberName = this._getManifest().name;
|
|
27
|
+
const workspaceEntry = this.#findWorkspaceEntry(lockData, lockDir, manifestDir, memberName);
|
|
28
|
+
const directDeps = workspaceEntry?.dependencies || {};
|
|
29
|
+
const tree = { name: memberName, version: this._getManifest().version, dependencies: {} };
|
|
30
|
+
const visited = new Set();
|
|
31
|
+
for (const depName of Object.keys(directDeps)) {
|
|
32
|
+
const resolved = this.#resolvePackage(depName, '', packages);
|
|
33
|
+
if (resolved) {
|
|
34
|
+
tree.dependencies[depName] = this.#buildNode(depName, resolved, packages, includeTransitive, visited);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return tree;
|
|
38
|
+
}
|
|
39
|
+
#findWorkspaceEntry(lockData, lockDir, manifestDir, memberName) {
|
|
40
|
+
const workspaces = lockData.workspaces || {};
|
|
41
|
+
const relPath = path.relative(lockDir, path.resolve(manifestDir));
|
|
42
|
+
if (!relPath || relPath === '.') {
|
|
43
|
+
return workspaces[''] || {};
|
|
44
|
+
}
|
|
45
|
+
const normalised = relPath.split(path.sep).join('/');
|
|
46
|
+
if (workspaces[normalised]) {
|
|
47
|
+
return workspaces[normalised];
|
|
48
|
+
}
|
|
49
|
+
for (const [wsPath, entry] of Object.entries(workspaces)) {
|
|
50
|
+
if (entry.name === memberName && wsPath !== '') {
|
|
51
|
+
return entry;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return workspaces[''] || {};
|
|
55
|
+
}
|
|
56
|
+
#resolvePackage(depName, parentKey, packages) {
|
|
57
|
+
if (parentKey) {
|
|
58
|
+
const scopedKey = `${parentKey}/${depName}`;
|
|
59
|
+
if (packages[scopedKey]) {
|
|
60
|
+
return packages[scopedKey];
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return packages[depName] || null;
|
|
64
|
+
}
|
|
65
|
+
#buildNode(depName, resolved, packages, includeTransitive, visited) {
|
|
66
|
+
const resolvedId = Array.isArray(resolved) ? resolved[0] : resolved;
|
|
67
|
+
const version = this.#extractVersion(resolvedId);
|
|
68
|
+
const node = { version };
|
|
69
|
+
if (!includeTransitive) {
|
|
70
|
+
return node;
|
|
71
|
+
}
|
|
72
|
+
const metadata = Array.isArray(resolved) ? (resolved[2] || {}) : {};
|
|
73
|
+
const subDeps = metadata.dependencies || {};
|
|
74
|
+
if (Object.keys(subDeps).length > 0) {
|
|
75
|
+
const visitKey = `${depName}@${version}`;
|
|
76
|
+
if (visited.has(visitKey)) {
|
|
77
|
+
return node;
|
|
78
|
+
}
|
|
79
|
+
visited.add(visitKey);
|
|
80
|
+
node.dependencies = {};
|
|
81
|
+
for (const subName of Object.keys(subDeps)) {
|
|
82
|
+
const subResolved = this.#resolvePackage(subName, depName, packages);
|
|
83
|
+
if (subResolved) {
|
|
84
|
+
node.dependencies[subName] = this.#buildNode(subName, subResolved, packages, true, visited);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return node;
|
|
89
|
+
}
|
|
90
|
+
#extractVersion(resolvedId) {
|
|
91
|
+
if (typeof resolvedId !== 'string') {
|
|
92
|
+
return '0.0.0';
|
|
93
|
+
}
|
|
94
|
+
const atIdx = resolvedId.lastIndexOf('@');
|
|
95
|
+
if (atIdx > 0) {
|
|
96
|
+
return resolvedId.substring(atIdx + 1);
|
|
97
|
+
}
|
|
98
|
+
return '0.0.0';
|
|
99
|
+
}
|
|
100
|
+
}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
export default class Javascript_npm extends Base_javascript {
|
|
2
2
|
_listCmdArgs(includeTransitive: any): string[];
|
|
3
|
+
_buildDependencyTree(includeTransitive: any, opts?: {}): Object | {
|
|
4
|
+
name: any;
|
|
5
|
+
version: any;
|
|
6
|
+
dependencies: any;
|
|
7
|
+
optionalDependencies: any;
|
|
8
|
+
};
|
|
3
9
|
}
|
|
4
10
|
import Base_javascript from './base_javascript.js';
|