@trustify-da/trustify-da-javascript-client 0.3.0-ea.c555cdf → 0.3.0-ea.cb4ae28
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 +43 -1
- package/dist/package.json +11 -4
- package/dist/src/analysis.js +21 -76
- package/dist/src/cli.js +72 -6
- package/dist/src/cyclone_dx_sbom.d.ts +3 -1
- package/dist/src/cyclone_dx_sbom.js +16 -4
- package/dist/src/index.d.ts +5 -3
- package/dist/src/index.js +5 -3
- package/dist/src/license/index.d.ts +28 -0
- package/dist/src/license/index.js +100 -0
- package/dist/src/license/license_utils.d.ts +40 -0
- package/dist/src/license/license_utils.js +134 -0
- package/dist/src/license/licenses_api.d.ts +34 -0
- package/dist/src/license/licenses_api.js +98 -0
- package/dist/src/license/project_license.d.ts +20 -0
- package/dist/src/license/project_license.js +62 -0
- package/dist/src/provider.d.ts +12 -3
- package/dist/src/provider.js +16 -1
- package/dist/src/providers/base_javascript.d.ts +10 -4
- package/dist/src/providers/base_javascript.js +30 -4
- package/dist/src/providers/golang_gomodules.d.ts +8 -1
- package/dist/src/providers/golang_gomodules.js +13 -4
- package/dist/src/providers/java_gradle.d.ts +6 -0
- package/dist/src/providers/java_gradle.js +12 -2
- package/dist/src/providers/java_maven.d.ts +8 -1
- package/dist/src/providers/java_maven.js +32 -4
- package/dist/src/providers/python_controller.d.ts +5 -2
- package/dist/src/providers/python_controller.js +56 -58
- package/dist/src/providers/python_pip.d.ts +11 -4
- package/dist/src/providers/python_pip.js +46 -53
- package/dist/src/providers/requirements_parser.d.ts +6 -0
- package/dist/src/providers/requirements_parser.js +24 -0
- package/dist/src/providers/tree-sitter-requirements.wasm +0 -0
- package/dist/src/sbom.d.ts +3 -1
- package/dist/src/sbom.js +3 -2
- package/dist/src/tools.d.ts +18 -0
- package/dist/src/tools.js +56 -1
- package/package.json +12 -5
|
@@ -2,6 +2,7 @@ import fs from 'node:fs';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { EOL } from 'os';
|
|
4
4
|
import TOML from 'fast-toml';
|
|
5
|
+
import { readLicenseFile } from '../license/license_utils.js';
|
|
5
6
|
import Sbom from '../sbom.js';
|
|
6
7
|
import Base_java, { ecosystem_gradle } from "./base_java.js";
|
|
7
8
|
/** @typedef {import('../provider.js').Provider} */
|
|
@@ -49,6 +50,13 @@ export default class Java_gradle extends Base_java {
|
|
|
49
50
|
* @param {string} manifestDir - the directory where the manifest lies
|
|
50
51
|
*/
|
|
51
52
|
validateLockFile() { return true; }
|
|
53
|
+
/**
|
|
54
|
+
* Gradle manifests (build.gradle, build.gradle.kts) have no standard license field.
|
|
55
|
+
* @param {string} manifestPath - path to manifest
|
|
56
|
+
* @returns {null}
|
|
57
|
+
*/
|
|
58
|
+
// eslint-disable-next-line no-unused-vars
|
|
59
|
+
readLicenseFromManifest(manifestPath) { return readLicenseFile(manifestPath); }
|
|
52
60
|
/**
|
|
53
61
|
* Provide content and content type for stack analysis.
|
|
54
62
|
* @param {string} manifest - the manifest path or name
|
|
@@ -158,7 +166,8 @@ export default class Java_gradle extends Base_java {
|
|
|
158
166
|
let sbom = new Sbom();
|
|
159
167
|
let root = `${properties.group}:${properties[ROOT_PROJECT_KEY_NAME].match(/Root project '(.+)'/)[1]}:jar:${properties.version}`;
|
|
160
168
|
let rootPurl = this.parseDep(root);
|
|
161
|
-
|
|
169
|
+
const license = this.readLicenseFromManifest(manifestPath);
|
|
170
|
+
sbom.addRoot(rootPurl, license);
|
|
162
171
|
let ignoredDeps = this.#getIgnoredDeps(manifestPath);
|
|
163
172
|
const [runtimeConfig, compileConfig] = this.#extractConfigurations(content);
|
|
164
173
|
const processedDeps = new Set();
|
|
@@ -298,7 +307,8 @@ export default class Java_gradle extends Base_java {
|
|
|
298
307
|
let sbom = new Sbom();
|
|
299
308
|
let root = `${properties.group}:${properties[ROOT_PROJECT_KEY_NAME].match(/Root project '(.+)'/)[1]}:jar:${properties.version}`;
|
|
300
309
|
let rootPurl = this.parseDep(root);
|
|
301
|
-
|
|
310
|
+
const license = this.readLicenseFromManifest(manifestPath);
|
|
311
|
+
sbom.addRoot(rootPurl, license);
|
|
302
312
|
let ignoredDeps = this.#getIgnoredDeps(manifestPath);
|
|
303
313
|
const [runtimeConfig, compileConfig] = this.#extractConfigurations(content);
|
|
304
314
|
let directDependencies = new Map();
|
|
@@ -27,13 +27,20 @@ export default class Java_maven extends Base_java {
|
|
|
27
27
|
* @returns {Provided}
|
|
28
28
|
*/
|
|
29
29
|
provideComponent(manifest: string, opts?: {}): Provided;
|
|
30
|
+
/**
|
|
31
|
+
* Read license from pom.xml manifest, with fallback to LICENSE file
|
|
32
|
+
* @param {string} manifestPath - path to pom.xml
|
|
33
|
+
* @returns {string|null}
|
|
34
|
+
*/
|
|
35
|
+
readLicenseFromManifest(manifestPath: string): string | null;
|
|
30
36
|
/**
|
|
31
37
|
*
|
|
32
38
|
* @param {String} textGraphList Text graph String of the manifest
|
|
33
39
|
* @param {[String]} ignoredDeps List of ignored dependencies to be omitted from sbom
|
|
40
|
+
* @param {String} manifestPath Path to the pom.xml manifest
|
|
34
41
|
* @return {String} formatted sbom Json String with all dependencies
|
|
35
42
|
*/
|
|
36
|
-
createSbomFileFromTextFormat(textGraphList: string, ignoredDeps: [string], opts: any): string;
|
|
43
|
+
createSbomFileFromTextFormat(textGraphList: string, ignoredDeps: [string], opts: any, manifestPath: string): string;
|
|
37
44
|
#private;
|
|
38
45
|
}
|
|
39
46
|
export type Java_maven = import("../provider").Provider;
|
|
@@ -3,6 +3,7 @@ import os from 'node:os';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { EOL } from 'os';
|
|
5
5
|
import { XMLParser } from 'fast-xml-parser';
|
|
6
|
+
import { getLicense } from '../license/license_utils.js';
|
|
6
7
|
import Sbom from '../sbom.js';
|
|
7
8
|
import { getCustom } from '../tools.js';
|
|
8
9
|
import Base_java, { ecosystem_maven } from "./base_java.js";
|
|
@@ -51,6 +52,30 @@ export default class Java_maven extends Base_java {
|
|
|
51
52
|
contentType: 'application/vnd.cyclonedx+json'
|
|
52
53
|
};
|
|
53
54
|
}
|
|
55
|
+
/**
|
|
56
|
+
* Read license from pom.xml manifest, with fallback to LICENSE file
|
|
57
|
+
* @param {string} manifestPath - path to pom.xml
|
|
58
|
+
* @returns {string|null}
|
|
59
|
+
*/
|
|
60
|
+
readLicenseFromManifest(manifestPath) {
|
|
61
|
+
let fromPom = null;
|
|
62
|
+
try {
|
|
63
|
+
const xml = fs.readFileSync(manifestPath, 'utf-8');
|
|
64
|
+
const parser = new XMLParser({ ignoreAttributes: false });
|
|
65
|
+
const obj = parser.parse(xml);
|
|
66
|
+
const project = obj?.project;
|
|
67
|
+
if (project?.licenses?.license) {
|
|
68
|
+
const license = Array.isArray(project.licenses.license)
|
|
69
|
+
? project.licenses.license[0]
|
|
70
|
+
: project.licenses.license;
|
|
71
|
+
fromPom = (license?.name && license.name.trim()) || null;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
// leave fromPom as null
|
|
76
|
+
}
|
|
77
|
+
return getLicense(fromPom, manifestPath);
|
|
78
|
+
}
|
|
54
79
|
/**
|
|
55
80
|
* Create a Dot Graph dependency tree for a manifest path.
|
|
56
81
|
* @param {string} manifest - path for pom.xml
|
|
@@ -105,7 +130,7 @@ export default class Java_maven extends Base_java {
|
|
|
105
130
|
if (process.env["TRUSTIFY_DA_DEBUG"] === "true") {
|
|
106
131
|
console.error("Dependency tree that will be used as input for creating the BOM =>" + EOL + EOL + content.toString());
|
|
107
132
|
}
|
|
108
|
-
let sbom = this.createSbomFileFromTextFormat(content.toString(), ignoredDeps, opts);
|
|
133
|
+
let sbom = this.createSbomFileFromTextFormat(content.toString(), ignoredDeps, opts, manifest);
|
|
109
134
|
// delete temp file and directory
|
|
110
135
|
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
111
136
|
// return dependency graph as string
|
|
@@ -115,15 +140,17 @@ export default class Java_maven extends Base_java {
|
|
|
115
140
|
*
|
|
116
141
|
* @param {String} textGraphList Text graph String of the manifest
|
|
117
142
|
* @param {[String]} ignoredDeps List of ignored dependencies to be omitted from sbom
|
|
143
|
+
* @param {String} manifestPath Path to the pom.xml manifest
|
|
118
144
|
* @return {String} formatted sbom Json String with all dependencies
|
|
119
145
|
*/
|
|
120
|
-
createSbomFileFromTextFormat(textGraphList, ignoredDeps, opts) {
|
|
146
|
+
createSbomFileFromTextFormat(textGraphList, ignoredDeps, opts, manifestPath) {
|
|
121
147
|
let lines = textGraphList.split(EOL);
|
|
122
148
|
// get root component
|
|
123
149
|
let root = lines[0];
|
|
124
150
|
let rootPurl = this.parseDep(root);
|
|
151
|
+
const license = this.readLicenseFromManifest(manifestPath);
|
|
125
152
|
let sbom = new Sbom();
|
|
126
|
-
sbom.addRoot(rootPurl);
|
|
153
|
+
sbom.addRoot(rootPurl, license);
|
|
127
154
|
this.parseDependencyTree(root, 0, lines.slice(1), sbom);
|
|
128
155
|
return sbom.filterIgnoredDeps(ignoredDeps).getAsJsonString(opts);
|
|
129
156
|
}
|
|
@@ -156,7 +183,8 @@ export default class Java_maven extends Base_java {
|
|
|
156
183
|
let sbom = new Sbom();
|
|
157
184
|
let rootDependency = this.#getRootFromPom(tmpEffectivePom, manifestPath);
|
|
158
185
|
let purlRoot = this.toPurl(rootDependency.groupId, rootDependency.artifactId, rootDependency.version);
|
|
159
|
-
|
|
186
|
+
const license = this.readLicenseFromManifest(manifestPath);
|
|
187
|
+
sbom.addRoot(purlRoot, license);
|
|
160
188
|
dependencies.forEach(dep => {
|
|
161
189
|
let currentPurl = this.toPurl(dep.groupId, dep.artifactId, dep.version);
|
|
162
190
|
sbom.addDependency(purlRoot, currentPurl);
|
|
@@ -15,13 +15,16 @@ export default class Python_controller {
|
|
|
15
15
|
realEnvironment: boolean;
|
|
16
16
|
pathToRequirements: string;
|
|
17
17
|
options: {};
|
|
18
|
+
parser: Promise<import("web-tree-sitter").Parser>;
|
|
19
|
+
requirementsQuery: Promise<import("web-tree-sitter").Query>;
|
|
20
|
+
pinnedVersionQuery: Promise<import("web-tree-sitter").Query>;
|
|
18
21
|
prepareEnvironment(): void;
|
|
19
22
|
/**
|
|
20
23
|
*
|
|
21
24
|
* @param {boolean} includeTransitive - whether to return include in returned object transitive dependencies or not
|
|
22
|
-
* @return {[DependencyEntry]}
|
|
25
|
+
* @return {Promise<[DependencyEntry]>}
|
|
23
26
|
*/
|
|
24
|
-
getDependencies(includeTransitive: boolean): [DependencyEntry]
|
|
27
|
+
getDependencies(includeTransitive: boolean): Promise<[DependencyEntry]>;
|
|
25
28
|
#private;
|
|
26
29
|
}
|
|
27
30
|
export type DependencyEntry = {
|
|
@@ -2,6 +2,7 @@ import fs from "node:fs";
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import os, { EOL } from "os";
|
|
4
4
|
import { environmentVariableIsPopulated, getCustom, invokeCommand } from "../tools.js";
|
|
5
|
+
import { getParser, getRequirementQuery, getPinnedVersionQuery } from './requirements_parser.js';
|
|
5
6
|
function getPipFreezeOutput() {
|
|
6
7
|
try {
|
|
7
8
|
return environmentVariableIsPopulated("TRUSTIFY_DA_PIP_FREEZE") ? new Buffer.from(process.env["TRUSTIFY_DA_PIP_FREEZE"], 'base64').toString('ascii') : invokeCommand(this.pathToPipBin, ['freeze', '--all']).toString();
|
|
@@ -26,6 +27,9 @@ export default class Python_controller {
|
|
|
26
27
|
realEnvironment;
|
|
27
28
|
pathToRequirements;
|
|
28
29
|
options;
|
|
30
|
+
parser;
|
|
31
|
+
requirementsQuery;
|
|
32
|
+
pinnedVersionQuery;
|
|
29
33
|
/**
|
|
30
34
|
* Constructor to create new python controller instance to interact with pip package manager
|
|
31
35
|
* @param {boolean} realEnvironment - whether to use real environment supplied by client or to create virtual environment
|
|
@@ -41,6 +45,9 @@ export default class Python_controller {
|
|
|
41
45
|
this.prepareEnvironment();
|
|
42
46
|
this.pathToRequirements = pathToRequirements;
|
|
43
47
|
this.options = options;
|
|
48
|
+
this.parser = getParser();
|
|
49
|
+
this.requirementsQuery = getRequirementQuery();
|
|
50
|
+
this.pinnedVersionQuery = getPinnedVersionQuery();
|
|
44
51
|
}
|
|
45
52
|
prepareEnvironment() {
|
|
46
53
|
if (!this.realEnvironment) {
|
|
@@ -86,6 +93,23 @@ export default class Python_controller {
|
|
|
86
93
|
}
|
|
87
94
|
}
|
|
88
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* Parse the requirements.txt file using tree-sitter and return structured requirement data.
|
|
98
|
+
* @return {Promise<{name: string, version: string|null}[]>}
|
|
99
|
+
*/
|
|
100
|
+
async #parseRequirements() {
|
|
101
|
+
const content = fs.readFileSync(this.pathToRequirements).toString();
|
|
102
|
+
const tree = (await this.parser).parse(content);
|
|
103
|
+
return Promise.all((await this.requirementsQuery).matches(tree.rootNode).map(async (match) => {
|
|
104
|
+
const reqNode = match.captures.find(c => c.name === 'req').node;
|
|
105
|
+
const name = match.captures.find(c => c.name === 'name').node.text;
|
|
106
|
+
const versionMatches = (await this.pinnedVersionQuery).matches(reqNode);
|
|
107
|
+
const version = versionMatches.length > 0
|
|
108
|
+
? versionMatches[0].captures.find(c => c.name === 'version').node.text
|
|
109
|
+
: null;
|
|
110
|
+
return { name, version };
|
|
111
|
+
}));
|
|
112
|
+
}
|
|
89
113
|
#decideIfWindowsOrLinuxPath(fileName) {
|
|
90
114
|
if (os.platform() === "win32") {
|
|
91
115
|
return fileName + ".exe";
|
|
@@ -97,9 +121,9 @@ export default class Python_controller {
|
|
|
97
121
|
/**
|
|
98
122
|
*
|
|
99
123
|
* @param {boolean} includeTransitive - whether to return include in returned object transitive dependencies or not
|
|
100
|
-
* @return {[DependencyEntry]}
|
|
124
|
+
* @return {Promise<[DependencyEntry]>}
|
|
101
125
|
*/
|
|
102
|
-
getDependencies(includeTransitive) {
|
|
126
|
+
async getDependencies(includeTransitive) {
|
|
103
127
|
let startingTime;
|
|
104
128
|
let endingTime;
|
|
105
129
|
if (process.env["TRUSTIFY_DA_DEBUG"] === "true") {
|
|
@@ -124,10 +148,10 @@ export default class Python_controller {
|
|
|
124
148
|
if (matchManifestVersions === "true") {
|
|
125
149
|
throw new Error("Conflicting settings, TRUSTIFY_DA_PYTHON_INSTALL_BEST_EFFORTS=true can only work with MATCH_MANIFEST_VERSIONS=false");
|
|
126
150
|
}
|
|
127
|
-
this.#installingRequirementsOneByOne();
|
|
151
|
+
await this.#installingRequirementsOneByOne();
|
|
128
152
|
}
|
|
129
153
|
}
|
|
130
|
-
let dependencies = this.#getDependenciesImpl(includeTransitive);
|
|
154
|
+
let dependencies = await this.#getDependenciesImpl(includeTransitive);
|
|
131
155
|
this.#cleanEnvironment();
|
|
132
156
|
if (process.env["TRUSTIFY_DA_DEBUG"] === "true") {
|
|
133
157
|
endingTime = new Date();
|
|
@@ -137,16 +161,14 @@ export default class Python_controller {
|
|
|
137
161
|
}
|
|
138
162
|
return dependencies;
|
|
139
163
|
}
|
|
140
|
-
#installingRequirementsOneByOne() {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
requirementsRows.filter((line) => !line.trim().startsWith("#")).filter((line) => line.trim() !== "").forEach((dependency) => {
|
|
144
|
-
let dependencyName = getDependencyName(dependency);
|
|
164
|
+
async #installingRequirementsOneByOne() {
|
|
165
|
+
const requirements = await this.#parseRequirements();
|
|
166
|
+
requirements.forEach(({ name }) => {
|
|
145
167
|
try {
|
|
146
|
-
invokeCommand(this.pathToPipBin, ['install',
|
|
168
|
+
invokeCommand(this.pathToPipBin, ['install', name]);
|
|
147
169
|
}
|
|
148
170
|
catch (error) {
|
|
149
|
-
throw new Error(`Failed in best-effort installing ${
|
|
171
|
+
throw new Error(`Failed in best-effort installing ${name} in virtual python environment`, { cause: error });
|
|
150
172
|
}
|
|
151
173
|
});
|
|
152
174
|
}
|
|
@@ -163,34 +185,26 @@ export default class Python_controller {
|
|
|
163
185
|
}
|
|
164
186
|
}
|
|
165
187
|
}
|
|
166
|
-
#getDependenciesImpl(includeTransitive) {
|
|
167
|
-
let dependencies =
|
|
188
|
+
async #getDependenciesImpl(includeTransitive) {
|
|
189
|
+
let dependencies = [];
|
|
168
190
|
let usePipDepTree = getCustom("TRUSTIFY_DA_PIP_USE_DEP_TREE", "false", this.options);
|
|
169
|
-
let freezeOutput;
|
|
170
|
-
let lines;
|
|
171
|
-
let depNames;
|
|
172
|
-
let pipShowOutput;
|
|
173
191
|
let allPipShowDeps;
|
|
174
192
|
let pipDepTreeJsonArrayOutput;
|
|
175
193
|
if (usePipDepTree !== "true") {
|
|
176
|
-
freezeOutput = getPipFreezeOutput.call(this);
|
|
177
|
-
lines = freezeOutput.split(EOL);
|
|
178
|
-
depNames = lines.map(line => getDependencyName(line));
|
|
194
|
+
const freezeOutput = getPipFreezeOutput.call(this);
|
|
195
|
+
const lines = freezeOutput.split(EOL);
|
|
196
|
+
const depNames = lines.map(line => getDependencyName(line));
|
|
197
|
+
const pipShowOutput = getPipShowOutput.call(this, depNames);
|
|
198
|
+
allPipShowDeps = pipShowOutput.split(EOL + "---" + EOL);
|
|
179
199
|
}
|
|
180
200
|
else {
|
|
181
201
|
pipDepTreeJsonArrayOutput = getDependencyTreeJsonFromPipDepTree(this.pathToPipBin, this.pathToPythonBin);
|
|
182
202
|
}
|
|
183
|
-
if (usePipDepTree !== "true") {
|
|
184
|
-
pipShowOutput = getPipShowOutput.call(this, depNames);
|
|
185
|
-
allPipShowDeps = pipShowOutput.split(EOL + "---" + EOL);
|
|
186
|
-
}
|
|
187
|
-
//debug
|
|
188
|
-
// pipShowOutput = "alternative pip show output goes here for debugging"
|
|
189
203
|
let matchManifestVersions = getCustom("MATCH_MANIFEST_VERSIONS", "true", this.options);
|
|
190
|
-
let
|
|
204
|
+
let parsedRequirements = await this.#parseRequirements();
|
|
191
205
|
let CachedEnvironmentDeps = {};
|
|
192
206
|
if (usePipDepTree !== "true") {
|
|
193
|
-
allPipShowDeps.forEach(
|
|
207
|
+
allPipShowDeps.forEach(record => {
|
|
194
208
|
let dependencyName = getDependencyNameShow(record).toLowerCase();
|
|
195
209
|
CachedEnvironmentDeps[dependencyName] = record;
|
|
196
210
|
CachedEnvironmentDeps[dependencyName.replace("-", "_")] = record;
|
|
@@ -210,40 +224,24 @@ export default class Python_controller {
|
|
|
210
224
|
CachedEnvironmentDeps[packageName.replace("_", "-")] = pipDepTreeEntryForCache;
|
|
211
225
|
});
|
|
212
226
|
}
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
if (matchManifestVersions === "true") {
|
|
216
|
-
let dependencyName;
|
|
217
|
-
let manifestVersion;
|
|
227
|
+
parsedRequirements.forEach(({ name: depName, version: manifestVersion }) => {
|
|
228
|
+
if (matchManifestVersions === "true" && manifestVersion != null) {
|
|
218
229
|
let installedVersion;
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
manifestVersion = dep.substring(doubleEqualSignPosition + 2).trim();
|
|
223
|
-
if (manifestVersion.includes("#")) {
|
|
224
|
-
let hashCharIndex = manifestVersion.indexOf("#");
|
|
225
|
-
manifestVersion = manifestVersion.substring(0, hashCharIndex);
|
|
230
|
+
if (CachedEnvironmentDeps[depName.toLowerCase()] !== undefined) {
|
|
231
|
+
if (usePipDepTree !== "true") {
|
|
232
|
+
installedVersion = getDependencyVersion(CachedEnvironmentDeps[depName.toLowerCase()]);
|
|
226
233
|
}
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
if (CachedEnvironmentDeps[dependencyName.toLowerCase()] !== undefined) {
|
|
230
|
-
if (usePipDepTree !== "true") {
|
|
231
|
-
installedVersion = getDependencyVersion(CachedEnvironmentDeps[dependencyName.toLowerCase()]);
|
|
232
|
-
}
|
|
233
|
-
else {
|
|
234
|
-
installedVersion = CachedEnvironmentDeps[dependencyName.toLowerCase()].version;
|
|
235
|
-
}
|
|
234
|
+
else {
|
|
235
|
+
installedVersion = CachedEnvironmentDeps[depName.toLowerCase()].version;
|
|
236
236
|
}
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
}
|
|
237
|
+
}
|
|
238
|
+
if (installedVersion) {
|
|
239
|
+
if (manifestVersion.trim() !== installedVersion.trim()) {
|
|
240
|
+
throw new Error(`Can't continue with analysis - versions mismatch for dependency name ${depName} (manifest version=${manifestVersion}, installed version=${installedVersion}).If you want to allow version mismatch for analysis between installed and requested packages, set environment variable/setting MATCH_MANIFEST_VERSIONS=false`);
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
243
|
}
|
|
244
|
-
let path =
|
|
245
|
-
let depName = getDependencyName(dep);
|
|
246
|
-
//array to track a path for each branch in the dependency tree
|
|
244
|
+
let path = [];
|
|
247
245
|
path.push(depName.toLowerCase());
|
|
248
246
|
bringAllDependencies(dependencies, depName, CachedEnvironmentDeps, includeTransitive, path, usePipDepTree);
|
|
249
247
|
});
|
|
@@ -347,11 +345,11 @@ function bringAllDependencies(dependencies, dependencyName, cachedEnvironmentDep
|
|
|
347
345
|
version = record.version;
|
|
348
346
|
directDeps = record.dependencies;
|
|
349
347
|
}
|
|
350
|
-
let targetDeps =
|
|
348
|
+
let targetDeps = [];
|
|
351
349
|
let entry = { "name": depName, "version": version, "dependencies": [] };
|
|
352
350
|
dependencies.push(entry);
|
|
353
351
|
directDeps.forEach((dep) => {
|
|
354
|
-
let depArray =
|
|
352
|
+
let depArray = [];
|
|
355
353
|
// to avoid infinite loop, check if the dependency not already on current path, before going recursively resolving its dependencies.
|
|
356
354
|
if (!path.includes(dep.toLowerCase())) {
|
|
357
355
|
// send to recurrsion the path + the current dep
|
|
@@ -3,6 +3,7 @@ declare namespace _default {
|
|
|
3
3
|
export { validateLockFile };
|
|
4
4
|
export { provideComponent };
|
|
5
5
|
export { provideStack };
|
|
6
|
+
export { readLicenseFromManifest };
|
|
6
7
|
}
|
|
7
8
|
export default _default;
|
|
8
9
|
export type DependencyEntry = {
|
|
@@ -23,13 +24,19 @@ declare function validateLockFile(): boolean;
|
|
|
23
24
|
* Provide content and content type for python-pip component analysis.
|
|
24
25
|
* @param {string} manifest - path to requirements.txt for component report
|
|
25
26
|
* @param {{}} [opts={}] - optional various options to pass along the application
|
|
26
|
-
* @returns {Provided}
|
|
27
|
+
* @returns {Promise<Provided>}
|
|
27
28
|
*/
|
|
28
|
-
declare function provideComponent(manifest: string, opts?: {}): Provided
|
|
29
|
+
declare function provideComponent(manifest: string, opts?: {}): Promise<Provided>;
|
|
29
30
|
/**
|
|
30
31
|
* Provide content and content type for python-pip stack analysis.
|
|
31
32
|
* @param {string} manifest - the manifest path or name
|
|
32
33
|
* @param {{}} [opts={}] - optional various options to pass along the application
|
|
33
|
-
* @returns {Provided}
|
|
34
|
+
* @returns {Promise<Provided>}
|
|
34
35
|
*/
|
|
35
|
-
declare function provideStack(manifest: string, opts?: {}): Provided
|
|
36
|
+
declare function provideStack(manifest: string, opts?: {}): Promise<Provided>;
|
|
37
|
+
/**
|
|
38
|
+
* Python requirements.txt has no standard license field
|
|
39
|
+
* @param {string} manifestPath - path to requirements.txt
|
|
40
|
+
* @returns {string|null}
|
|
41
|
+
*/
|
|
42
|
+
declare function readLicenseFromManifest(manifestPath: string): string | null;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
|
-
import { EOL } from 'os';
|
|
3
2
|
import { PackageURL } from 'packageurl-js';
|
|
3
|
+
import { readLicenseFile } from '../license/license_utils.js';
|
|
4
4
|
import Sbom from '../sbom.js';
|
|
5
5
|
import { environmentVariableIsPopulated, getCustom, getCustomPath, invokeCommand } from "../tools.js";
|
|
6
6
|
import Python_controller from './python_controller.js';
|
|
7
|
-
|
|
7
|
+
import { getParser, getIgnoreQuery, getPinnedVersionQuery } from './requirements_parser.js';
|
|
8
|
+
export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest };
|
|
8
9
|
/** @typedef {{name: string, version: string, dependencies: DependencyEntry[]}} DependencyEntry */
|
|
9
10
|
/**
|
|
10
11
|
* @type {string} ecosystem for python-pip is 'pip'
|
|
@@ -18,6 +19,13 @@ const ecosystem = 'pip';
|
|
|
18
19
|
function isSupported(manifestName) {
|
|
19
20
|
return 'requirements.txt' === manifestName;
|
|
20
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* Python requirements.txt has no standard license field
|
|
24
|
+
* @param {string} manifestPath - path to requirements.txt
|
|
25
|
+
* @returns {string|null}
|
|
26
|
+
*/
|
|
27
|
+
// eslint-disable-next-line no-unused-vars
|
|
28
|
+
function readLicenseFromManifest(manifestPath) { return readLicenseFile(manifestPath); }
|
|
21
29
|
/**
|
|
22
30
|
* @param {string} manifestDir - the directory where the manifest lies
|
|
23
31
|
*/
|
|
@@ -26,12 +34,12 @@ function validateLockFile() { return true; }
|
|
|
26
34
|
* Provide content and content type for python-pip stack analysis.
|
|
27
35
|
* @param {string} manifest - the manifest path or name
|
|
28
36
|
* @param {{}} [opts={}] - optional various options to pass along the application
|
|
29
|
-
* @returns {Provided}
|
|
37
|
+
* @returns {Promise<Provided>}
|
|
30
38
|
*/
|
|
31
|
-
function provideStack(manifest, opts = {}) {
|
|
39
|
+
async function provideStack(manifest, opts = {}) {
|
|
32
40
|
return {
|
|
33
41
|
ecosystem,
|
|
34
|
-
content: createSbomStackAnalysis(manifest, opts),
|
|
42
|
+
content: await createSbomStackAnalysis(manifest, opts),
|
|
35
43
|
contentType: 'application/vnd.cyclonedx+json'
|
|
36
44
|
};
|
|
37
45
|
}
|
|
@@ -39,12 +47,12 @@ function provideStack(manifest, opts = {}) {
|
|
|
39
47
|
* Provide content and content type for python-pip component analysis.
|
|
40
48
|
* @param {string} manifest - path to requirements.txt for component report
|
|
41
49
|
* @param {{}} [opts={}] - optional various options to pass along the application
|
|
42
|
-
* @returns {Provided}
|
|
50
|
+
* @returns {Promise<Provided>}
|
|
43
51
|
*/
|
|
44
|
-
function provideComponent(manifest, opts = {}) {
|
|
52
|
+
async function provideComponent(manifest, opts = {}) {
|
|
45
53
|
return {
|
|
46
54
|
ecosystem,
|
|
47
|
-
content: getSbomForComponentAnalysis(manifest, opts),
|
|
55
|
+
content: await getSbomForComponentAnalysis(manifest, opts),
|
|
48
56
|
contentType: 'application/vnd.cyclonedx+json'
|
|
49
57
|
};
|
|
50
58
|
}
|
|
@@ -66,49 +74,34 @@ function addAllDependencies(source, dep, sbom) {
|
|
|
66
74
|
}
|
|
67
75
|
/**
|
|
68
76
|
*
|
|
69
|
-
* @param
|
|
70
|
-
* @return {string}
|
|
71
|
-
*/
|
|
72
|
-
function splitToNameVersion(nameVersion) {
|
|
73
|
-
let result = [];
|
|
74
|
-
if (nameVersion.includes("==")) {
|
|
75
|
-
return nameVersion.split("==");
|
|
76
|
-
}
|
|
77
|
-
const regex = /[^\w\s-_]/g;
|
|
78
|
-
let endIndex = nameVersion.search(regex);
|
|
79
|
-
if (endIndex === -1) {
|
|
80
|
-
return [nameVersion.trim()];
|
|
81
|
-
}
|
|
82
|
-
result.push(nameVersion.substring(0, endIndex).trim());
|
|
83
|
-
return result;
|
|
84
|
-
}
|
|
85
|
-
/**
|
|
86
|
-
*
|
|
87
|
-
* @param {string} requirementTxtContent
|
|
77
|
+
* @param {string} manifest - path to requirements.txt
|
|
88
78
|
* @return {PackageURL []}
|
|
89
79
|
*/
|
|
90
|
-
function getIgnoredDependencies(
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
80
|
+
async function getIgnoredDependencies(manifest) {
|
|
81
|
+
const [parser, ignoreQuery, pinnedVersionQuery] = await Promise.all([
|
|
82
|
+
getParser(), getIgnoreQuery(), getPinnedVersionQuery()
|
|
83
|
+
]);
|
|
84
|
+
const content = fs.readFileSync(manifest).toString();
|
|
85
|
+
const tree = parser.parse(content);
|
|
86
|
+
return ignoreQuery.matches(tree.rootNode).map(match => {
|
|
87
|
+
const reqNode = match.captures.find(c => c.name === 'req').node;
|
|
88
|
+
const name = match.captures.find(c => c.name === 'name').node.text;
|
|
89
|
+
const versionMatches = pinnedVersionQuery.matches(reqNode);
|
|
90
|
+
const version = versionMatches.length > 0
|
|
91
|
+
? versionMatches[0].captures.find(c => c.name === 'version').node.text
|
|
92
|
+
: undefined;
|
|
93
|
+
return toPurl(name, version);
|
|
101
94
|
});
|
|
102
95
|
}
|
|
103
96
|
/**
|
|
104
97
|
*
|
|
105
|
-
* @param {string}
|
|
98
|
+
* @param {string} manifest - path to requirements.txt
|
|
106
99
|
* @param {Sbom} sbom object to filter out from it exhortignore dependencies.
|
|
107
100
|
* @param {{Object}} opts - various options and settings for the application
|
|
108
101
|
* @private
|
|
109
102
|
*/
|
|
110
|
-
function handleIgnoredDependencies(
|
|
111
|
-
let ignoredDeps = getIgnoredDependencies(
|
|
103
|
+
async function handleIgnoredDependencies(manifest, sbom, opts = {}) {
|
|
104
|
+
let ignoredDeps = await getIgnoredDependencies(manifest);
|
|
112
105
|
let matchManifestVersions = getCustom("MATCH_MANIFEST_VERSIONS", "true", opts);
|
|
113
106
|
if (matchManifestVersions === "true") {
|
|
114
107
|
const ignoredDepsVersion = ignoredDeps.filter(dep => dep.version !== undefined);
|
|
@@ -172,22 +165,22 @@ const DEFAULT_PIP_ROOT_COMPONENT_VERSION = "0.0.0";
|
|
|
172
165
|
* Create sbom json string out of a manifest path for stack analysis.
|
|
173
166
|
* @param {string} manifest - path for requirements.txt
|
|
174
167
|
* @param {{}} [opts={}] - optional various options to pass along the application
|
|
175
|
-
* @returns {string} the sbom json string content
|
|
168
|
+
* @returns {Promise<string>} the sbom json string content
|
|
176
169
|
* @private
|
|
177
170
|
*/
|
|
178
|
-
function createSbomStackAnalysis(manifest, opts = {}) {
|
|
171
|
+
async function createSbomStackAnalysis(manifest, opts = {}) {
|
|
179
172
|
let binaries = {};
|
|
180
173
|
let createVirtualPythonEnv = handlePythonEnvironment(binaries, opts);
|
|
181
174
|
let pythonController = new Python_controller(createVirtualPythonEnv === "false", binaries.pip, binaries.python, manifest, opts);
|
|
182
|
-
let dependencies = pythonController.getDependencies(true);
|
|
175
|
+
let dependencies = await pythonController.getDependencies(true);
|
|
183
176
|
let sbom = new Sbom();
|
|
184
177
|
const rootPurl = toPurl(DEFAULT_PIP_ROOT_COMPONENT_NAME, DEFAULT_PIP_ROOT_COMPONENT_VERSION);
|
|
185
|
-
|
|
178
|
+
const license = readLicenseFromManifest(manifest);
|
|
179
|
+
sbom.addRoot(rootPurl, license);
|
|
186
180
|
dependencies.forEach(dep => {
|
|
187
181
|
addAllDependencies(rootPurl, dep, sbom);
|
|
188
182
|
});
|
|
189
|
-
|
|
190
|
-
handleIgnoredDependencies(requirementTxtContent, sbom, opts);
|
|
183
|
+
await handleIgnoredDependencies(manifest, sbom, opts);
|
|
191
184
|
// In python there is no root component, then we must remove the dummy root we added, so the sbom json will be accepted by the DA backend
|
|
192
185
|
// sbom.removeRootComponent()
|
|
193
186
|
return sbom.getAsJsonString(opts);
|
|
@@ -196,22 +189,22 @@ function createSbomStackAnalysis(manifest, opts = {}) {
|
|
|
196
189
|
* Create a sbom json string out of a manifest content for component analysis
|
|
197
190
|
* @param {string} manifest - path to requirements.txt
|
|
198
191
|
* @param {{}} [opts={}] - optional various options to pass along the application
|
|
199
|
-
* @returns {string} the sbom json string content
|
|
192
|
+
* @returns {Promise<string>} the sbom json string content
|
|
200
193
|
* @private
|
|
201
194
|
*/
|
|
202
|
-
function getSbomForComponentAnalysis(manifest, opts = {}) {
|
|
195
|
+
async function getSbomForComponentAnalysis(manifest, opts = {}) {
|
|
203
196
|
let binaries = {};
|
|
204
197
|
let createVirtualPythonEnv = handlePythonEnvironment(binaries, opts);
|
|
205
198
|
let pythonController = new Python_controller(createVirtualPythonEnv === "false", binaries.pip, binaries.python, manifest, opts);
|
|
206
|
-
let dependencies = pythonController.getDependencies(false);
|
|
199
|
+
let dependencies = await pythonController.getDependencies(false);
|
|
207
200
|
let sbom = new Sbom();
|
|
208
201
|
const rootPurl = toPurl(DEFAULT_PIP_ROOT_COMPONENT_NAME, DEFAULT_PIP_ROOT_COMPONENT_VERSION);
|
|
209
|
-
|
|
202
|
+
const license = readLicenseFromManifest(manifest);
|
|
203
|
+
sbom.addRoot(rootPurl, license);
|
|
210
204
|
dependencies.forEach(dep => {
|
|
211
205
|
sbom.addDependency(rootPurl, toPurl(dep.name, dep.version));
|
|
212
206
|
});
|
|
213
|
-
|
|
214
|
-
handleIgnoredDependencies(requirementTxtContent, sbom, opts);
|
|
207
|
+
await handleIgnoredDependencies(manifest, sbom, opts);
|
|
215
208
|
// In python there is no root component, then we must remove the dummy root we added, so the sbom json will be accepted by the DA backend
|
|
216
209
|
// sbom.removeRootComponent()
|
|
217
210
|
return sbom.getAsJsonString(opts);
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export function getParser(): Promise<Parser>;
|
|
2
|
+
export function getRequirementQuery(): Promise<Query>;
|
|
3
|
+
export function getIgnoreQuery(): Promise<Query>;
|
|
4
|
+
export function getPinnedVersionQuery(): Promise<Query>;
|
|
5
|
+
import { Parser } from 'web-tree-sitter';
|
|
6
|
+
import { Query } from 'web-tree-sitter';
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { Language, Parser, Query } from 'web-tree-sitter';
|
|
3
|
+
const wasmUrl = new URL('./tree-sitter-requirements.wasm', import.meta.url);
|
|
4
|
+
async function init() {
|
|
5
|
+
await Parser.init();
|
|
6
|
+
const wasmBytes = new Uint8Array(await readFile(wasmUrl));
|
|
7
|
+
return await Language.load(wasmBytes);
|
|
8
|
+
}
|
|
9
|
+
export async function getParser() {
|
|
10
|
+
const language = await init();
|
|
11
|
+
return new Parser().setLanguage(language);
|
|
12
|
+
}
|
|
13
|
+
export async function getRequirementQuery() {
|
|
14
|
+
const language = await init();
|
|
15
|
+
return new Query(language, '(requirement (package) @name) @req');
|
|
16
|
+
}
|
|
17
|
+
export async function getIgnoreQuery() {
|
|
18
|
+
const language = await init();
|
|
19
|
+
return new Query(language, '((requirement (package) @name) @req . (comment) @comment (#match? @comment "^#[\\t ]*exhortignore"))');
|
|
20
|
+
}
|
|
21
|
+
export async function getPinnedVersionQuery() {
|
|
22
|
+
const language = await init();
|
|
23
|
+
return new Query(language, '(version_spec (version_cmp) @cmp (version) @version (#eq? @cmp "=="))');
|
|
24
|
+
}
|
|
Binary file
|
package/dist/src/sbom.d.ts
CHANGED
|
@@ -2,9 +2,10 @@ export default class Sbom {
|
|
|
2
2
|
sbomModel: CycloneDxSbom;
|
|
3
3
|
/**
|
|
4
4
|
* @param {PackageURL} root - add main/root component for sbom
|
|
5
|
+
* @param {string|Array} [licenses] - optional license(s) for the root component
|
|
5
6
|
* @return Sbom
|
|
6
7
|
*/
|
|
7
|
-
addRoot(root: PackageURL): CycloneDxSbom;
|
|
8
|
+
addRoot(root: PackageURL, licenses?: string | any[]): CycloneDxSbom;
|
|
8
9
|
/**
|
|
9
10
|
* @return {{{"bom-ref": string, name, purl: string, type, version}}} root component of sbom.
|
|
10
11
|
*/
|
|
@@ -43,6 +44,7 @@ export default class Sbom {
|
|
|
43
44
|
type: any;
|
|
44
45
|
version: any;
|
|
45
46
|
scope: any;
|
|
47
|
+
licenses?: any;
|
|
46
48
|
};
|
|
47
49
|
/** This method gets a component object, and a string name, and checks if the name is a substring of the component' purl.
|
|
48
50
|
* @param {} component to search in its dependencies
|