From 76c678324b4d85870d60fa95fbd9bfb42b94a5cd Mon Sep 17 00:00:00 2001 From: Bryan English Date: Thu, 21 Nov 2024 14:20:56 -0500 Subject: [PATCH] add package manager symlinks to denylist (#4921) --- .gitlab/requirements_block.json | 5 ++++- requirements.json | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/.gitlab/requirements_block.json b/.gitlab/requirements_block.json index e728f802915..ba32e598e3f 100644 --- a/.gitlab/requirements_block.json +++ b/.gitlab/requirements_block.json @@ -6,6 +6,9 @@ {"name": "unsupported 2.x.x glibc x64","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "arm64", "libc": "glibc:2.16.9"}}, {"name": "unsupported 2.x.x glibc x86","filepath": "/some/path", "args": [], "envars": [], "host": {"os": "linux", "arch": "x86", "libc": "glibc:2.17"}}, {"name": "npm","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/npm-cli.js"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}}, + {"name": "npm-symlink","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/npm"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}}, {"name": "yarn","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/yarn.js"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}}, - {"name": "pnpm","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/pnpm.cjs"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}} + {"name": "yarn-symlink","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/yarn"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}}, + {"name": "pnpm","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/pnpm.cjs"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}}, + {"name": "pnpm-symlink","filepath": "/pathto/node", "args": ["/pathto/node", "/pathto/pnpm"], "envars": [], "host": {"os": "linux", "arch": "x64", "libc": "glibc:2.40"}} ] diff --git a/requirements.json b/requirements.json index 85fc7c33894..a5149d0f902 100644 --- a/requirements.json +++ b/requirements.json @@ -55,6 +55,19 @@ "args": [{ "args": ["*/npm-cli.js"], "position": 1}], "envars": null }, + { + "id": "npm_symlink", + "description": "Ignore the npm CLI", + "os": null, + "cmds": [ + "**/node", + "**/nodejs", + "**/ts-node", + "**/ts-node-*" + ], + "args": [{ "args": ["*/npm"], "position": 1}], + "envars": null + }, { "id": "yarn", "description": "Ignore the yarn CLI", @@ -68,6 +81,19 @@ "args": [{ "args": ["*/yarn.js"], "position": 1}], "envars": null }, + { + "id": "yarn_symlink", + "description": "Ignore the yarn CLI", + "os": null, + "cmds": [ + "**/node", + "**/nodejs", + "**/ts-node", + "**/ts-node-*" + ], + "args": [{ "args": ["*/yarn"], "position": 1}], + "envars": null + }, { "id": "pnpm", "description": "Ignore the pnpm CLI", @@ -80,6 +106,19 @@ ], "args": [{ "args": ["*/pnpm.cjs"], "position": 1}], "envars": null + }, + { + "id": "pnpm_symlink", + "description": "Ignore the pnpm CLI", + "os": null, + "cmds": [ + "**/node", + "**/nodejs", + "**/ts-node", + "**/ts-node-*" + ], + "args": [{ "args": ["*/pnpm"], "position": 1}], + "envars": null } ] }