mirror of
https://github.com/denoland/deno.git
synced 2025-02-01 12:16:11 -05:00
fix(ext/node): Fix fs.access
/fs.promises.access
with X_OK
mode parameter on Windows (#27407)
- Fixes an issue on Windows where the `fs.constants.X_OK` flag caused `fs.access` and `fs.promises.access` to incorrectly throw a "permission denied" error - Introduced formatting changes due to the formatting tool - Fixed the issue by always removing the `X_OK` bit from the mode variable m (not sure if it's necessary to check for the presence of it in the `mode` param first?) - Updated unit tests to handle the mentioned constant - `X_OK` bit is ignored in the Node implementation and should behave like `F_OK` fs constants Node documentation: https://nodejs.org/api/fs.html#fsconstants fixes https://github.com/denoland/deno/issues/27405
This commit is contained in:
parent
b1c685f4b7
commit
8fc4796ed5
2 changed files with 60 additions and 46 deletions
|
@ -30,22 +30,28 @@ export function access(
|
||||||
mode = getValidMode(mode, "access");
|
mode = getValidMode(mode, "access");
|
||||||
const cb = makeCallback(callback);
|
const cb = makeCallback(callback);
|
||||||
|
|
||||||
Deno.lstat(path).then((info) => {
|
Deno.lstat(path).then(
|
||||||
|
(info) => {
|
||||||
if (info.mode === null) {
|
if (info.mode === null) {
|
||||||
// If the file mode is unavailable, we pretend it has
|
// If the file mode is unavailable, we pretend it has
|
||||||
// the permission
|
// the permission
|
||||||
cb(null);
|
cb(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const m = +mode || 0;
|
let m = +mode || 0;
|
||||||
let fileMode = +info.mode || 0;
|
let fileMode = +info.mode || 0;
|
||||||
if (Deno.build.os !== "windows" && info.uid === Deno.uid()) {
|
|
||||||
|
if (Deno.build.os === "windows") {
|
||||||
|
m &= ~fs.X_OK; // Ignore the X_OK bit on Windows
|
||||||
|
} else if (info.uid === Deno.uid()) {
|
||||||
// If the user is the owner of the file, then use the owner bits of
|
// If the user is the owner of the file, then use the owner bits of
|
||||||
// the file permission
|
// the file permission
|
||||||
fileMode >>= 6;
|
fileMode >>= 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(kt3k): Also check the case when the user belong to the group
|
// TODO(kt3k): Also check the case when the user belong to the group
|
||||||
// of the file
|
// of the file
|
||||||
|
|
||||||
if ((m & fileMode) === m) {
|
if ((m & fileMode) === m) {
|
||||||
// all required flags exist
|
// all required flags exist
|
||||||
cb(null);
|
cb(null);
|
||||||
|
@ -59,7 +65,8 @@ export function access(
|
||||||
e.code = "EACCES";
|
e.code = "EACCES";
|
||||||
cb(e);
|
cb(e);
|
||||||
}
|
}
|
||||||
}, (err) => {
|
},
|
||||||
|
(err) => {
|
||||||
if (err instanceof Deno.errors.NotFound) {
|
if (err instanceof Deno.errors.NotFound) {
|
||||||
// deno-lint-ignore no-explicit-any
|
// deno-lint-ignore no-explicit-any
|
||||||
const e: any = new Error(
|
const e: any = new Error(
|
||||||
|
@ -73,7 +80,8 @@ export function access(
|
||||||
} else {
|
} else {
|
||||||
cb(err);
|
cb(err);
|
||||||
}
|
}
|
||||||
});
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const accessPromise = promisify(access) as (
|
export const accessPromise = promisify(access) as (
|
||||||
|
@ -91,9 +99,11 @@ export function accessSync(path: string | Buffer | URL, mode?: number) {
|
||||||
// the permission
|
// the permission
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const m = +mode! || 0;
|
let m = +mode! || 0;
|
||||||
let fileMode = +info.mode! || 0;
|
let fileMode = +info.mode! || 0;
|
||||||
if (Deno.build.os !== "windows" && info.uid === Deno.uid()) {
|
if (Deno.build.os === "windows") {
|
||||||
|
m &= ~fs.X_OK; // Ignore the X_OK bit on Windows
|
||||||
|
} else if (info.uid === Deno.uid()) {
|
||||||
// If the user is the owner of the file, then use the owner bits of
|
// If the user is the owner of the file, then use the owner bits of
|
||||||
// the file permission
|
// the file permission
|
||||||
fileMode >>= 6;
|
fileMode >>= 6;
|
||||||
|
|
|
@ -28,6 +28,8 @@ Deno.test(
|
||||||
try {
|
try {
|
||||||
await fs.promises.access(file, fs.constants.R_OK);
|
await fs.promises.access(file, fs.constants.R_OK);
|
||||||
await fs.promises.access(file, fs.constants.W_OK);
|
await fs.promises.access(file, fs.constants.W_OK);
|
||||||
|
await fs.promises.access(file, fs.constants.X_OK);
|
||||||
|
await fs.promises.access(file, fs.constants.F_OK);
|
||||||
} finally {
|
} finally {
|
||||||
await Deno.remove(file);
|
await Deno.remove(file);
|
||||||
}
|
}
|
||||||
|
@ -60,6 +62,8 @@ Deno.test(
|
||||||
try {
|
try {
|
||||||
fs.accessSync(file, fs.constants.R_OK);
|
fs.accessSync(file, fs.constants.R_OK);
|
||||||
fs.accessSync(file, fs.constants.W_OK);
|
fs.accessSync(file, fs.constants.W_OK);
|
||||||
|
fs.accessSync(file, fs.constants.X_OK);
|
||||||
|
fs.accessSync(file, fs.constants.F_OK);
|
||||||
} finally {
|
} finally {
|
||||||
Deno.removeSync(file);
|
Deno.removeSync(file);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue