scanoss 0.11.0 → 0.11.1

package/README.md

@@ -66,7 +66,7 @@ Note: the --dependencies flag is not applicable here, given that manifest files
 
 The manifest files acknowledged during the scanning process are:
 
-    * Python: requirements.txt
+    * Python: requirements.txt, pyproject.toml
     * Java: pom.xml
     * Javascript: package.json, package-lock.json, yarn.lock
     * Ruby: Gemfile, Gemfile.lock

package/build/main/cli/bin/cli-bin.js

@@ -1,77 +1,78 @@
 #!/usr/bin/env node
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
+const Utils_1 = require("../../sdk/Utils/Utils");
 const dep_1 = require("../commands/dep");
-const wfp_1 = require("../commands/wfp");
 const scan_1 = require("../commands/scan");
-const Utils_1 = require("../../sdk/Utils/Utils");
+const wfp_1 = require("../commands/wfp");
 function CLIErrorHandler(e) {
-    console.error(' ');
+    console.error(" ");
     console.error(e);
     process.exit(1);
 }
 async function main() {
-    commander_1.program
-        .version(Utils_1.Utils.getPackageVersion())
-        .description('The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.');
-    commander_1.program
-        .command('scan <source>')
-        .description('Scan a folder/file')
-        .option('-w, --wfp', 'Scan a .wfp file instead of a folder')
-        .option('-H, --hpsm', 'Scan using winnowing high precision matching')
-        .option('-x, --extract', 'Extract compressed files before launch scan in folder <<zip_name>>-unzipped')
-        .option('   --extract-overwrite', 'Overwrite folder when decompressing if exists')
-        .option('   --extract-deep <number>', 'Sets uncompress recursion level')
-        .option('   --extract-suffix <suffix>', 'Sets suffix for the folder name')
-        .option('-c, --concurrency <number>', 'Number of concurrent connections to use while scanning (optional -default 10)')
-        .option('-n, --ignore <ignore>', 'Ignore components specified in the SBOM file')
-        .option('-o, --output <filename>', 'Output result file name (optional - default stdout)')
-        .option('-f, --format <format>', 'Result output format. {JSON, HTML} Default: JSON')
-        .option('-F, --flags <flags>', 'Scanning engine flags (1: disable snippet matching, 2 enable snippet ids, 4: disable dependencies, 8: disable licenses, 16: disable copyrights,32: disable vulnerabilities, 64: disable quality, 128: disable cryptography,256: disable best match, 512: Report identified files)')
-        .option('-P, --post-size <postsize>', 'Number of kilobytes to limit the post to while scanning (optional - default 32)')
-        .option('-R, --max-retry <retry>', 'Max number of retries for each POST (optional -default 5)')
-        .option('-M, --timeout <timeout>', 'Timeout (in seconds) for API communication (optional -default 120)')
-        .option('--obfuscate', 'Obfuscate fingerprints')
-        .option('-D, --dependencies', 'Add dependency scanning')
-        .option('--apiurl <apiurl>', 'SCANOSS API URL (optional - default: https://osskb.org/api/scan/direct)')
-        .option('--api2url <api2url>', 'SCANOSS gRPC API 2.0 URL (optional - default: scanoss.com:443)')
-        .option('-k, --key <key>', 'SCANOSS API Key token (optional - not required for default OSSKB URL)')
-        .option('--ignore-cert-errors', 'Ignore self signed certificate errors')
-        .option('--ca-cert <cert>', 'Specify a path for a cert used in SSL/TLS connection')
-        .option('--proxy <proxy>', 'Proxy URL to use for connections (optional). Can also use the environment variable "HTTPS_PROXY=[ip]:[port]" and "grcp_proxy=[ip]:[port]" for gRPC')
-        .option('--pac <pac>', 'Proxy auto configuration (optional). Specify a file, http url or ftp url')
-        .option('-v, --verbose', 'Makes scan operation verbose')
-        .action((source, options) => {
+    const scan = new commander_1.Command("scan");
+    scan.addArgument(new commander_1.Argument("<source>"));
+    scan.description("Scan a folder/file");
+    scan.addHelpText("after", "Example:\n$ scanoss-js scan -o scan-output.json <source-folder>");
+    scan.addOption(new commander_1.Option("-w, --wfp", "Scan a .wfp file instead of a folder"));
+    scan.addOption(new commander_1.Option("-H, --hpsm", "Scan using winnowing high precision matching"));
+    scan.addOption(new commander_1.Option("-x, --extract", "Extract compressed files before launch scan in folder <<zip_name>>-unzipped"));
+    scan.addOption(new commander_1.Option("   --extract-overwrite", "Overwrite folder when decompressing if exists"));
+    scan.addOption(new commander_1.Option("   --extract-deep <number>", "Sets uncompress recursion level"));
+    scan.addOption(new commander_1.Option("   --extract-suffix <suffix>", "Sets suffix for the folder name"));
+    scan.addOption(new commander_1.Option("-c, --concurrency <number>", "Number of concurrent connections to use while scanning (optional -default 10)"));
+    scan.addOption(new commander_1.Option("-n, --ignore <ignore>", "Ignore components specified in the SBOM file"));
+    scan.addOption(new commander_1.Option("-o, --output <filename>", "Output result file name (optional - default stdout)"));
+    scan.addOption(new commander_1.Option("-f, --format <format>", "Result output format").choices(["json", "html"]));
+    scan.addOption(new commander_1.Option("-F, --flags <flags>", "Scanning engine flags (1: disable snippet matching, 2 enable snippet ids, 4: disable dependencies, 8: disable licenses, 16: disable copyrights,32: disable vulnerabilities, 64: disable quality, 128: disable cryptography,256: disable best match, 512: Report identified files)"));
+    scan.addOption(new commander_1.Option("-P, --post-size postsize>", "Number of kilobytes to limit the post to while scanning (optional - default 32)"));
+    scan.addOption(new commander_1.Option("-R, --max-retry <retry>", "Max number of retries for each POST (optional -default 5)"));
+    scan.addOption(new commander_1.Option("-M, --timeout <timeout>", "Timeout (in seconds) for API communication (optional -default 120)"));
+    scan.addOption(new commander_1.Option("    --obfuscate", "Obfuscate fingerprints"));
+    scan.addOption(new commander_1.Option("-D, --dependencies", "Add dependency scanning"));
+    scan.addOption(new commander_1.Option("    --apiurl <apiurl>", "SCANOSS API URL (optional - default: https://osskb.org/api/scan/direct)"));
+    scan.addOption(new commander_1.Option("    --api2url <api2url>", "SCANOSS gRPC API 2.0 URL (optional - default: scanoss.com:443)"));
+    scan.addOption(new commander_1.Option("-k, --key <key>", "SCANOSS API Key token (optional - not required for default OSSKB URL)"));
+    scan.addOption(new commander_1.Option("    --ignore-cert-errors", "Ignore self signed certificate errors"));
+    scan.addOption(new commander_1.Option("    --ca-cert <cert>", "Specify a path for a cert used in SSL/TLS connection"));
+    scan.addOption(new commander_1.Option("    --proxy <proxy>", "Proxy URL to use for connections (optional). Can also use the environment variable \"HTTPS_PROXY=[ip]:[port]\" and \"grcp_proxy=[ip]:[port]\" for gRPC"));
+    scan.addOption(new commander_1.Option("    --pac <pac>", "Proxy auto configuration (optional). Specify a file, http url or ftp url"));
+    scan.addOption(new commander_1.Option("-v, --verbose", "Makes scan operation verbose"));
+    scan.action((source, options) => {
         scan_1.scanHandler(source, options).catch((e) => {
             CLIErrorHandler(e);
         });
-    })
-        .addHelpText('after', `
-  Examples:
-    $ scanoss-js scan -o scan-output.json <source-folder>`);
-    commander_1.program
-        .command('dep <source>')
-        .description('Scan for dependencies')
-        .option('-o, --output <filename>', 'Output result file name (optional - default stdout)')
-        .option('-a, --grpc-host <host>', 'SCANOSS GRPC HOST (optional - default: scanoss.com:443)')
-        .action((source, options) => {
+    });
+    const dependencies = new commander_1.Command("dep");
+    dependencies.description("Scan for dependencies");
+    dependencies.addArgument(new commander_1.Argument("<source>"));
+    dependencies.addOption(new commander_1.Option("-o, --output <filename>", "Output result file name (optional - default stdout)"));
+    dependencies.addOption(new commander_1.Option("-a, --grpc-host <host>", "SCANOSS GRPC HOST (optional - default: scanoss.com:443)"));
+    dependencies.action((source, options) => {
         dep_1.depHandler(source, options).catch((e) => {
             CLIErrorHandler(e);
         });
     });
-    commander_1.program
-        .command('wfp <source>')
-        .description('Generates fingerprints for a folder/file')
-        .option('-H, --hpsm', 'Scan using winnowing high precision matching')
-        .option('--obfuscate', 'Obfuscate fingerprints')
-        .option('-o, --output <filename>', 'Output result file name (optional - default stdout)')
-        .option('-p, --block-size <size>', 'Maximum size in Kb for each fingerprint block (optional - default 64Kb)')
-        .action((source, options) => {
+    const fingerprint = new commander_1.Command("wfp");
+    fingerprint.addArgument(new commander_1.Argument("<source>"));
+    fingerprint.description("Generates fingerprints for a folder/file");
+    fingerprint.addOption(new commander_1.Option("-H, --hpsm", "Scan using winnowing high precision matching"));
+    fingerprint.addOption(new commander_1.Option("--obfuscate", "Obfuscate fingerprints"));
+    fingerprint.addOption(new commander_1.Option("-o, --output <filename>", "Output result file name (optional - default stdout)"));
+    fingerprint.addOption(new commander_1.Option("-p, --block-size <size>", "Maximum size in Kb for each fingerprint block (optional - default 64Kb)"));
+    fingerprint.action((source, options) => {
         wfp_1.wfpHandler(source, options).catch((e) => {
             CLIErrorHandler(e);
         });
     });
-    await commander_1.program.parseAsync(process.argv);
+    const program = new commander_1.Command();
+    program.version(Utils_1.Utils.getPackageVersion());
+    program.description("The SCANOSS JS package provides a simple, easy to consume module for interacting with SCANOSS APIs/Engine.");
+    program.addCommand(scan);
+    program.addCommand(dependencies);
+    program.addCommand(fingerprint);
+    await program.parseAsync(process.argv);
 }
 try {
     main();
@@ -80,4 +81,4 @@ catch (e) {
     console.error(e);
     process.exit(1);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLWJpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jbGkvYmluL2NsaS1iaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSx5Q0FBb0M7QUFDcEMseUNBQTZDO0FBQzdDLHlDQUE2QztBQUM3QywyQ0FBK0M7QUFDL0MsaURBQThDO0FBRTlDLFNBQVMsZUFBZSxDQUFDLENBQVE7SUFDL0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQztBQUVELEtBQUssVUFBVSxJQUFJO0lBQ2pCLG1CQUFPO1NBQ0osT0FBTyxDQUFDLGFBQUssQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1NBQ2xDLFdBQVcsQ0FDViw0R0FBNEcsQ0FDN0csQ0FBQztJQUVKLG1CQUFPO1NBQ0osT0FBTyxDQUFDLGVBQWUsQ0FBQztTQUN4QixXQUFXLENBQUMsb0JBQW9CLENBQUM7U0FDakMsTUFBTSxDQUFDLFdBQVcsRUFBRSxzQ0FBc0MsQ0FBQztTQUMzRCxNQUFNLENBQUMsWUFBWSxFQUFFLDhDQUE4QyxDQUFDO1NBQ3BFLE1BQU0sQ0FDTCxlQUFlLEVBQ2YsNkVBQTZFLENBQzlFO1NBQ0EsTUFBTSxDQUNMLHdCQUF3QixFQUN4QiwrQ0FBK0MsQ0FDaEQ7U0FDQSxNQUFNLENBQUMsNEJBQTRCLEVBQUUsaUNBQWlDLENBQUM7U0FDdkUsTUFBTSxDQUFDLDhCQUE4QixFQUFFLGlDQUFpQyxDQUFDO1NBQ3pFLE1BQU0sQ0FDTCw0QkFBNEIsRUFDNUIsK0VBQStFLENBQ2hGO1NBQ0EsTUFBTSxDQUNMLHVCQUF1QixFQUN2Qiw4Q0FBOEMsQ0FDL0M7U0FDQSxNQUFNLENBQ0wseUJBQXlCLEVBQ3pCLHFEQUFxRCxDQUN0RDtTQUNBLE1BQU0sQ0FDTCx1QkFBdUIs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLWJpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jbGkvYmluL2NsaS1iaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSx5Q0FBc0Q7QUFFdEQsaURBQThDO0FBQzlDLHlDQUE2QztBQUM3QywyQ0FBK0M7QUFDL0MseUNBQTZDO0FBRTdDLFNBQVMsZUFBZSxDQUFDLENBQVE7SUFDL0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQztBQUVELEtBQUssVUFBVSxJQUFJO0lBRWpCLE1BQU0sSUFBSSxHQUFHLElBQUksbUJBQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqQyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksb0JBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBQzNDLElBQUksQ0FBQyxXQUFXLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUN2QyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxpRUFBaUUsQ0FBQyxDQUFDO0lBRTdGLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxrQkFBTSxDQUFDLFdBQVcsRUFBRSxzQ0FBc0MsQ0FBQyxDQUFDLENBQUM7SUFDaEYsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLGtCQUFNLENBQUMsWUFBWSxFQUFFLDhDQUE4QyxDQUFDLENBQUMsQ0FBQztJQUN6RixJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksa0JBQU0sQ0FBQyxlQUFlLEVBQUUsNkVBQTZFLENBQUMsQ0FBQyxDQUFDO0lBQzNILElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxrQkFBTSxDQUFDLHdCQUF3QixFQUFFLCtDQUErQyxDQUFDLENBQUMsQ0FBQztJQUN0RyxJQUFJLENBQUMsU0FBUyxDQUFD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

package/build/main/sdk/Dependencies/LocalDependency/parsers/npmParser.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yarnLockV2Parser = exports.yarnLockV1Parser = exports.yarnLockRecognizeVersion = exports.yarnLockParser = exports.packagelockParser = exports.packageParser = void 0;
 const path_1 = __importDefault(require("path"));
 const packageurl_js_1 = require("packageurl-js");
-const PURL_TYPE = 'npm';
+const PURL_TYPE = "npm";
 // Parse a package.json file from node projects
 // See reference on: https://docs.npmjs.com/cli/v8/configuring-npm/package-json
-const MANIFEST_FILE = 'package.json';
+const MANIFEST_FILE = "package.json";
 function packageParser(fileContent, filePath) {
     // If the file is not manifest file, return an empty results
     const results = { file: filePath, purls: [] };
@@ -30,10 +30,11 @@ function packageParser(fileContent, filePath) {
 exports.packageParser = packageParser;
 // Parse a package-lock.json file from node projects
 // See reference on: https://docs.npmjs.com/cli/v8/configuring-npm/package-json
+const dRegex = new RegExp(/.*node_modules\/((?<scope>@.*)\/)?(?<p_name>.*)$/);
 function packagelockParser(fileContent, filePath) {
     var _a;
     const results = { file: filePath, purls: [] };
-    if (path_1.default.basename(filePath) != 'package-lock.json')
+    if (path_1.default.basename(filePath) != "package-lock.json")
         return Promise.resolve(results);
     const packages = (_a = JSON.parse(fileContent)) === null || _a === void 0 ? void 0 : _a.packages;
     if (!packages)
@@ -41,10 +42,9 @@ function packagelockParser(fileContent, filePath) {
     for (const [key, value] of Object.entries(packages)) {
         if (!key)
             continue;
-        const keySplit = key.split("/");
-        const depName = keySplit[keySplit.length - 1];
-        let purl = new packageurl_js_1.PackageURL(PURL_TYPE, undefined, depName, undefined, undefined, undefined).toString();
-        let req = value['version'];
+        const dep = key.match(dRegex);
+        let purl = new packageurl_js_1.PackageURL(PURL_TYPE, dep.groups.scope, dep.groups.p_name, undefined, undefined, undefined).toString();
+        let req = value["version"];
         results.purls.push({ purl: purl, requirement: req });
     }
     return Promise.resolve(results);
@@ -52,7 +52,7 @@ function packagelockParser(fileContent, filePath) {
 exports.packagelockParser = packagelockParser;
 function yarnLockParser(fileContent, filePath) {
     const results = { file: filePath, purls: [] };
-    if (path_1.default.basename(filePath) != 'yarn.lock')
+    if (path_1.default.basename(filePath) != "yarn.lock")
         return Promise.resolve(results);
     const yarnVersion = yarnLockRecognizeVersion(fileContent);
     if (yarnVersion === YarnLockVersionEnum.V1)
@@ -82,9 +82,9 @@ var YarnLockVersionEnum;
 function yarnLockRecognizeVersion(fileContent) {
     const yarn = fileContent.split("\n", 10); //Check only the first 10 lines;
     for (const line of yarn) {
-        if (line.includes('__metadata:'))
+        if (line.includes("__metadata:"))
             return YarnLockVersionEnum.V2;
-        if (line.includes('yarn lockfile v1'))
+        if (line.includes("yarn lockfile v1"))
             return YarnLockVersionEnum.V1;
     }
     return YarnLockVersionEnum.UnknownYarnLockFormat;
@@ -114,18 +114,19 @@ function yarnLockV1Parser(fileContent, filePath) {
         for (const dep_line of dep_lines) {
             // Clean comments and empty lines
             const trimmed = dep_line.trim();
-            const comment = trimmed.startsWith('#');
+            const comment = trimmed.startsWith("#");
             if (!trimmed || comment)
                 continue;
             // Do nothing with it's own dependencies
             //    "@babel/code-frame" "^7.0.0"
             //    "@babel/generator" "^7.3.4"
-            if (dep_line.startsWith(' '.repeat(4))) { }
+            if (dep_line.startsWith(" ".repeat(4))) {
+            }
             //  version "7.3.4"
             //  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b"
             //  integrity sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==
             //  dependencies:
-            else if (dep_line.startsWith(' '.repeat(2))) {
+            else if (dep_line.startsWith(" ".repeat(2))) {
                 const dep = trimmed.split(" ");
                 const key = dep[0].trim();
                 if (key !== "dependencies:" && key !== "optionalDependencies:") {
@@ -134,7 +135,7 @@ function yarnLockV1Parser(fileContent, filePath) {
             }
             // the first line of a dependency has the name and requirements
             //"@babel/core@^7.1.0", "@babel/core@^7.3.4":
-            else if (!dep_line.startsWith(' ')) {
+            else if (!dep_line.startsWith(" ")) {
                 const dep = dep_line.replace(/:/g, "").split(",");
                 const requirements = dep.map(line => line.trim().replace(/"|'/g, ""));
                 for (const req of requirements) {
@@ -142,7 +143,7 @@ function yarnLockV1Parser(fileContent, filePath) {
                     let constraint = req.slice(atIndex + 1); // gets ^7.1.0
                     constraint = constraint.replace(/"|'/g, "");
                     const ns_name = req.slice(0, atIndex);
-                    let ns = '';
+                    let ns = "";
                     let name = ns_name;
                     if (ns_name.includes("/")) {
                         const slashIndex = req.lastIndexOf("/");
@@ -164,9 +165,9 @@ function yarnLockV1Parser(fileContent, filePath) {
         const topRequirement = topRequirements[0];
         const namespace = topRequirement.ns;
         const name = topRequirement.name;
-        const version = dependencyData['version'];
+        const version = dependencyData["version"];
         const purl = new packageurl_js_1.PackageURL(PURL_TYPE, namespace, name, version, undefined, undefined).toString();
-        let requirement = '';
+        let requirement = "";
         for (const topRequirement of topRequirements) {
             requirement += topRequirement.constraint + ", ";
         }
@@ -184,4 +185,4 @@ function yarnLockV2Parser(fileContent, filePath) {
     return Promise.resolve(results);
 }
 exports.yarnLockV2Parser = yarnLockV2Parser;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmParser.js","sourceRoot":"","sources":["../../../../../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmParser.js","sourceRoot":"","sources":["../../../../../../src/sdk/Dependencies/LocalDependency/parsers/npmParser.ts"],"names":[],"mappings":"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"}