test: use relative paths in test-cli-permission tests · nodejs/node@fcf82ad · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit fcf82ad

Browse filesBrowse the repository at this point in the historyBrowse files

sendoru

authored and

targos

committed

test: use relative paths in test-cli-permission tests

`process.permission.has("fs")` checks if the process has permission for all files under `cwd`. Granting permission for `/tmp` and running tests with `cwd` containing `/tmp` will make the funtion return `true`, differing from expected results. Using relative paths ensures test paths are not `cwd` itself. Fixes: #54021 PR-URL: #54188 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

1 parent 6e550b1 commit fcf82ad
Copy full SHA for fcf82ad

2 files changed

+15-12Lines changed: 15 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test/parallel
  • test-cli-permission-deny-fs.js
  • test-cli-permission-multiple-allow.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/parallel/test-cli-permission-deny-fs.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-cli-permission-deny-fs.js

+5-2Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -27,7 +27,7 @@ const path = require('path');
27	27	}
28	28
29	29	{
30		- const tmpPath = path.resolve('/tmp/');
	30	+ const tmpPath = path.resolve('./tmp/');
31	31	const { status, stdout } = spawnSync(
32	32	process.execPath,
33	33	[
@@ -36,7 +36,7 @@ const path = require('path');
36	36	`console.log(process.permission.has("fs"));
37	37	console.log(process.permission.has("fs.read"));
38	38	console.log(process.permission.has("fs.write"));
39		- console.log(process.permission.has("fs.write", "/tmp/"));`,
	39	+ console.log(process.permission.has("fs.write", "./tmp/"));`,
40	40	]
41	41	);
42	42	const [fs, fsIn, fsOut, fsOutAllowed] = stdout.toString().split('\n');
@@ -138,6 +138,9 @@ const path = require('path');
138	138	if (firstPath.startsWith('/etc')) {
139	139	common.skip('/etc as firstPath');
140	140	}
	141	+ if (firstPath.startsWith('/tmp')) {
	142	+ common.skip('/tmp as firstPath');
	143	+ }
141	144	const file = fixtures.path('permission', 'loader', 'index.js');
142	145	const { status, stderr } = spawnSync(
143	146	process.execPath,

Collapse file

‎test/parallel/test-cli-permission-multiple-allow.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-cli-permission-multiple-allow.js

+10-10Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
@@ -7,8 +7,8 @@ const assert = require('assert');
7	7	const path = require('path');
8	8
9	9	{
10		- const tmpPath = path.resolve('/tmp/');
11		- const otherPath = path.resolve('/other-path/');
	10	+ const tmpPath = path.resolve('./tmp/');
	11	+ const otherPath = path.resolve('./other-path/');
12	12	const { status, stdout } = spawnSync(
13	13	process.execPath,
14	14	[
@@ -17,8 +17,8 @@ const path = require('path');
17	17	`console.log(process.permission.has("fs"));
18	18	console.log(process.permission.has("fs.read"));
19	19	console.log(process.permission.has("fs.write"));
20		- console.log(process.permission.has("fs.write", "/tmp/"));
21		- console.log(process.permission.has("fs.write", "/other-path/"));`,
	20	+ console.log(process.permission.has("fs.write", "./tmp/"));
	21	+ console.log(process.permission.has("fs.write", "./other-path/"));`,
22	22	]
23	23	);
24	24	const [fs, fsIn, fsOut, fsOutAllowed1, fsOutAllowed2] = stdout.toString().split('\n');
@@ -31,8 +31,8 @@ const path = require('path');
31	31	}
32	32
33	33	{
34		- const tmpPath = path.resolve('/tmp/');
35		- const pathWithComma = path.resolve('/other,path/');
	34	+ const tmpPath = path.resolve('./tmp/');
	35	+ const pathWithComma = path.resolve('./other,path/');
36	36	const { status, stdout } = spawnSync(
37	37	process.execPath,
38	38	[
@@ -45,8 +45,8 @@ const path = require('path');
45	45	`console.log(process.permission.has("fs"));
46	46	console.log(process.permission.has("fs.read"));
47	47	console.log(process.permission.has("fs.write"));
48		- console.log(process.permission.has("fs.write", "/tmp/"));
49		- console.log(process.permission.has("fs.write", "/other,path/"));`,
	48	+ console.log(process.permission.has("fs.write", "./tmp/"));
	49	+ console.log(process.permission.has("fs.write", "./other,path/"));`,
50	50	]
51	51	);
52	52	const [fs, fsIn, fsOut, fsOutAllowed1, fsOutAllowed2] = stdout.toString().split('\n');
@@ -59,7 +59,7 @@ const path = require('path');
59	59	}
60	60
61	61	{
62		- const filePath = path.resolve('/tmp/file,with,comma.txt');
	62	+ const filePath = path.resolve('./tmp/file,with,comma.txt');
63	63	const { status, stdout, stderr } = spawnSync(
64	64	process.execPath,
65	65	[
@@ -70,7 +70,7 @@ const path = require('path');
70	70	`console.log(process.permission.has("fs"));
71	71	console.log(process.permission.has("fs.read"));
72	72	console.log(process.permission.has("fs.write"));
73		- console.log(process.permission.has("fs.write", "/tmp/file,with,comma.txt"));`,
	73	+ console.log(process.permission.has("fs.write", "./tmp/file,with,comma.txt"));`,
74	74	]
75	75	);
76	76	const [fs, fsIn, fsOut, fsOutAllowed] = stdout.toString().split('\n');

0 commit comments

Comments

0 (0)