Merge pull request #666 from snyk/fix/revert-ndb-rpm-support

Revert "feat: add support for NDB RPM database CN-70"

Author: pecodez

.circleci/config.yml

@@ -54,12 +54,16 @@ windows_big: &windows_big
 release_defaults: &release_defaults
   resource_class: small
   docker:
-    - image: node:20
+    - image: cimg/node:20.19
   working_directory: ~/snyk-docker-plugin
 
 define: &windows_node_version "20.19.1"
 
 commands:
+  setup_npm_user:
+    steps:
+       - run: 
+           command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
   install_deps:
     description: Install dependencies
     steps:
@@ -68,9 +72,7 @@ commands:
           keys:
             - v2-npm-cache-{{ checksum "package.json" }}
             - v2-npm-cache-
-      - run:
-          name: Use snyk-main npmjs user
-          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
+      - setup_npm_user
       - run: npm ci
       - save_cache:
           key: v2-npm-cache-{{ checksum "package.json" }}
@@ -147,9 +149,7 @@ jobs:
       - checkout
       - install_node_npm:
           node_version: << parameters.node_version >>
-      - run:
-          name: Use snyk-main npmjs user
-          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
+      - setup_npm_user
       - run: npm ci
       - run: docker version
       - run:
@@ -161,9 +161,7 @@ jobs:
       - checkout
       - install_node_npm:
           node_version: << parameters.node_version >>
-      - run:
-          name: Use snyk-main npmjs user
-          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
+      - setup_npm_user
       - run: npm ci
         # make docker appear to be broken.
       - run: "function docker() { return 1; }"
@@ -174,16 +172,17 @@ jobs:
     <<: *defaults
     steps:
       - checkout_and_merge
-      - run:
-          name: Use snyk-main npmjs user
-          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
+      - setup_npm_user
       - run: npm ci
       - run: npm run build
   build_cli:
     <<: *defaults
     resource_class: medium
     steps:
       - checkout_and_merge
+      - run:
+          name: Setup NPM credentials
+          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ../.npmrc
       - run:
           name: Build Snyk CLI with latest changes
           command: ./.circleci/build-cli.sh
@@ -203,6 +202,7 @@ jobs:
     <<: *release_defaults
     steps:
       - checkout
+      - setup_npm_user
       - run: npm ci
       - run: npm run build
       - run:
@@ -241,6 +241,7 @@ workflows:
       - build:
           name: Build
           context:
+            - nodejs-install
             - snyk-bot-slack
           requires:
             - Lint

lib/analyzer/static-analyzer.ts

@@ -44,8 +44,6 @@ import {
 import {
   getRpmDbFileContent,
   getRpmDbFileContentAction,
-  getRpmNdbFileContent,
-  getRpmNdbFileContentAction,
   getRpmSqliteDbFileContent,
   getRpmSqliteDbFileContentAction,
 } from "../inputs/rpm/static";
@@ -92,7 +90,6 @@ export async function analyze(
     getExtFileContentAction,
     getRpmDbFileContentAction,
     getRpmSqliteDbFileContentAction,
-    getRpmNdbFileContentAction,
     ...getOsReleaseActions,
     getNodeBinariesFileContentAction,
     getOpenJDKBinariesFileContentAction,
@@ -156,13 +153,11 @@ export async function analyze(
     aptDbFileContent,
     rpmDbFileContent,
     rpmSqliteDbFileContent,
-    rpmNdbFileContent,
   ] = await Promise.all([
     getApkDbFileContent(extractedLayers),
     getAptDbFileContent(extractedLayers),
     getRpmDbFileContent(extractedLayers),
     getRpmSqliteDbFileContent(extractedLayers),
-    getRpmNdbFileContent(extractedLayers),
   ]);
 
   const distrolessAptFiles = getAptFiles(extractedLayers);
@@ -192,12 +187,7 @@ export async function analyze(
     results = await Promise.all([
       apkAnalyze(targetImage, apkDbFileContent),
       aptAnalyze(targetImage, aptDbFileContent, osRelease),
-      rpmAnalyze(
-        targetImage,
-        [...rpmDbFileContent, ...rpmNdbFileContent],
-        redHatRepositories,
-        osRelease,
-      ),
+      rpmAnalyze(targetImage, rpmDbFileContent, redHatRepositories, osRelease),
       mapRpmSqlitePackages(
         targetImage,
         rpmSqliteDbFileContent,

lib/inputs/rpm/static.ts

@@ -1,8 +1,4 @@
-import {
-  getPackages,
-  getPackagesNdb,
-  getPackagesSqlite,
-} from "@snyk/rpm-parser";
+import { getPackages, getPackagesSqlite } from "@snyk/rpm-parser";
 import { PackageInfo } from "@snyk/rpm-parser/lib/rpm/types";
 import { Response } from "@snyk/rpm-parser/lib/types";
 import * as Debug from "debug";
@@ -65,37 +61,6 @@ export async function getRpmSqliteDbFileContent(
   }
 }
 
-export const getRpmNdbFileContentAction: ExtractAction = {
-  actionName: "rpm-ndb",
-  filePathMatches: (filePath) =>
-    filePath === normalizePath("/usr/lib/sysimage/rpm/Packages.db"),
-  callback: streamToBuffer,
-};
-
-export async function getRpmNdbFileContent(
-  extractedLayers: ExtractedLayers,
-): Promise<PackageInfo[]> {
-  const rpmDb = getContentAsBuffer(extractedLayers, getRpmNdbFileContentAction);
-  if (!rpmDb) {
-    return [];
-  }
-
-  try {
-    const results: Response = await getPackagesNdb(rpmDb);
-
-    if (results.error) {
-      throw results.error;
-    }
-    return results.response;
-  } catch (error) {
-    debug(
-      `An error occurred while analysing RPM NDB packages:`,
-      error.stack || error,
-    );
-    return [];
-  }
-}
-
 export const getRpmSqliteDbFileContentAction: ExtractAction = {
   actionName: "rpm-sqlite-db",
   filePathMatches: (filePath) =>