Skip to content

Commit

Permalink
fix: python dist-packages support
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahmed-agabani-snyk
ahmed-agabani-snyk committed Jan 10, 2023
1 parent 40bc9ee commit 259de20
Show file tree
Hide file tree
Showing 4 changed files with 259 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/inputs/python/static.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { streamToString } from "../../stream-utils";
const poetryManifestFiles = ["pyproject.toml", "poetry.lock"];
const pipManifestFiles = ["requirements.txt"];
const pythonMetadataFilesRegex =
/\/lib\/python.*?\/site-packages\/.*?\.dist-info\/METADATA/;
/\/lib\/python.*?\/(?:dist|site)-packages\/.*?\.dist-info\/METADATA/;
const deletedPoetryAppFiles = poetryManifestFiles.map((file) => ".wh." + file);
const deletedPipAppFiles = pipManifestFiles.map((file) => ".wh." + file);

Expand Down
Binary file added test/fixtures/docker-archives/docker-save/pip-dist-packages.tar
View file
Binary file not shown.
244 changes: 244 additions & 0 deletions test/system/application-scans/python/__snapshots__/pip.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,247 @@ Object {
],
}
`;

exports[`pip application scan should correctly return applications as multiple scan results with dist-packages 1`] = `
Object {
"scanResults": Array [
Object {
"facts": Array [
Object {
"data": Object {
"graph": Object {
"nodes": Array [
Object {
"deps": Array [],
"nodeId": "root-node",
"pkgId": "docker-image|pip-dist-packages.tar@",
},
],
"rootNodeId": "root-node",
},
"pkgManager": Object {
"name": "linux",
"repositories": Array [
Object {
"alias": "unknown:0.0",
},
],
},
"pkgs": Array [
Object {
"id": "docker-image|pip-dist-packages.tar@",
"info": Object {
"name": "docker-image|pip-dist-packages.tar",
"version": undefined,
},
},
],
"schemaVersion": "1.3.0",
},
"type": "depGraph",
},
Object {
"data": "sha256:436a467a4bbbe103e2417a965e290f27f4030b74c5de64a088f1e67c7b4caa10",
"type": "imageId",
},
Object {
"data": Array [
"168e0ecfcd143d7297d2aa58f4c48c0483370aa003f62f555cf53e1d1f1829a2/layer.tar",
"157c0127779720af31c6767bb6315597558f74455a3aeed5bce61701b823fc2a/layer.tar",
],
"type": "imageLayers",
},
Object {
"data": "2023-01-10T12:06:10.183855463Z",
"type": "imageCreationTime",
},
Object {
"data": Array [
"sha256:2cc09064b491aefa0399d2886aa2e56055fed4d159ac104bc60328278772d9c1",
"sha256:7bc258cc6ab05c1da5517e07e8de024ea560b5d713d4f8638984400485899de9",
],
"type": "rootFs",
},
],
"identity": Object {
"args": Object {
"platform": "linux/arm64",
},
"type": "linux",
},
"target": Object {
"image": "docker-image|pip-dist-packages.tar",
},
},
Object {
"facts": Array [
Object {
"data": Object {
"graph": Object {
"nodes": Array [
Object {
"deps": Array [
Object {
"nodeId": "[email protected]",
},
Object {
"nodeId": "[email protected]",
},
Object {
"nodeId": "[email protected]",
},
],
"nodeId": "root-node",
"pkgId": "/app/requirements.txt@",
},
Object {
"deps": Array [],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [
Object {
"nodeId": "[email protected]",
},
Object {
"nodeId": "[email protected]",
},
Object {
"nodeId": "[email protected]",
},
Object {
"nodeId": "[email protected]",
},
],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [
Object {
"nodeId": "[email protected]",
},
],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [
Object {
"nodeId": "[email protected]",
},
],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
Object {
"deps": Array [],
"nodeId": "[email protected]",
"pkgId": "[email protected]",
},
],
"rootNodeId": "root-node",
},
"pkgManager": Object {
"name": "pip",
},
"pkgs": Array [
Object {
"id": "/app/requirements.txt@",
"info": Object {
"name": "/app/requirements.txt",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "six",
"version": "1.16.0",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "flask",
"version": "2.2.2",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "werkzeug",
"version": "2.2.2",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "markupsafe",
"version": "2.1.1",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "jinja2",
"version": "3.1.2",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "itsdangerous",
"version": "2.1.2",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "click",
"version": "8.1.3",
},
},
Object {
"id": "[email protected]",
"info": Object {
"name": "rpc.py",
"version": "0.4.2",
},
},
],
"schemaVersion": "1.3.0",
},
"type": "depGraph",
},
Object {
"data": "sha256:436a467a4bbbe103e2417a965e290f27f4030b74c5de64a088f1e67c7b4caa10",
"type": "imageId",
},
],
"identity": Object {
"targetFile": "/app/requirements.txt",
"type": "pip",
},
"target": Object {
"image": "docker-image|pip-dist-packages.tar",
},
},
],
}
`;
14 changes: 14 additions & 0 deletions test/system/application-scans/python/pip.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@ describe("pip application scan", () => {
expect(pluginResult.scanResults).toHaveLength(2);
});

it("should correctly return applications as multiple scan results with dist-packages", async () => {
const fixturePath = getFixture(
"docker-archives/docker-save/pip-dist-packages.tar",
);
const imageNameAndTag = `docker-archive:${fixturePath}`;

const pluginResult = await scan({
path: imageNameAndTag,
});

expect(pluginResult).toMatchSnapshot();
expect(pluginResult.scanResults).toHaveLength(2);
});

it("should handle --exclude-app-vulns with string and boolean value", async () => {
const fixturePath = getFixture("docker-archives/docker-save/pip.tar");
const imageNameAndTag = `docker-archive:${fixturePath}`;
Expand Down

0 comments on commit 259de20

Please sign in to comment.