LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #602: fix mode masking issues, correct X_OK case in fs.access

This commit is contained in:
David Humphrey 2018-12-21 22:58:55 -05:00
parent 4f427ed8d7
commit d4bfcd71c2
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/filesystem/implementation.js
View File

@ -451,17 +451,34 @@ function make_directory(context, path, callback) {
} }
function access_file(context, path, mode, callback) { function access_file(context, path, mode, callback) {
const { F_OK, R_OK, W_OK, X_OK, S_IXUSR, S_IXGRP, S_IXOTH } = Constants.fsConstants;
path = normalize(path); path = normalize(path);
find_node(context, path, function (err, node) { find_node(context, path, function (err, node) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
if(mode === Constants.F_OK){
// If we have a node, F_OK is true.
if(mode === F_OK) {
return callback(null); return callback(null);
} }
if (!(mode & Constants.X_OK) || (node.mode & (Constants.fsConstants.S_IXUSR | Constants.fsConstants.S_IXGRP | Constants.fsConstants.S_IXOTH))){
var st_mode = validateAndMaskMode(node.mode, callback);
if(!st_mode) return;
// For any other combo of F_OK, R_OK, W_OK, always allow. Filer user is a root user,
// so existing files are always OK, readable, and writable
if(mode & (R_OK | W_OK)) {
return callback(null); return callback(null);
} }
// For the case of X_OK, actually check if this file is executable
if ((mode & X_OK) && (st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) {
return callback(null);
}
// In any other case, the file isn't accessible
callback(new Errors.EACCES('permission denied',path)) ; callback(new Errors.EACCES('permission denied',path)) ;
}); });
} }
@ -2221,14 +2238,14 @@ function futimes(fs, context, fd, atime, mtime, callback) {
function chmod(fs, context, path, mode, callback) { function chmod(fs, context, path, mode, callback) {
if(!pathCheck(path, callback)) return; if(!pathCheck(path, callback)) return;
mode = validateAndMaskMode(mode, 'mode', callback); mode = validateAndMaskMode(mode, callback);
if(!mode) return; if(!mode) return;
chmod_file(context, path, mode, callback); chmod_file(context, path, mode, callback);
} }
function fchmod(fs, context, fd, mode, callback) { function fchmod(fs, context, fd, mode, callback) {
mode = validateAndMaskMode(mode, 'mode', callback); mode = validateAndMaskMode(mode, callback);
if(!mode) return; if(!mode) return;
var ofd = fs.openFiles[fd]; var ofd = fs.openFiles[fd];

7
tests/spec/fs.access.spec.js
View File

@ -62,15 +62,14 @@ describe('fs.access', function () {
}); });
}); });
// See bug https://github.com/filerjs/filer/issues/602 it('should return an error if file is not executable and mode = X_OK', function (done) {
it.skip('should return an error if file is not executable and mode = X_OK', function (done) {
var fs = util.fs(); var fs = util.fs();
var contents = 'This is a file.'; var contents = 'This is a file.';
fs.writeFile('/myfile', contents, function (error) { fs.writeFile('/myfile', contents, function (error) {
if (error) throw error; if (error) throw error;
fs.chmod('/myfile', 0o644, function(error){ fs.chmod('/myfile', '644', function(error){
if (error) throw error; if (error) throw error;
fs.access('/myfile', fs.constants.X_OK, function (error) { fs.access('/myfile', fs.constants.X_OK, function (error) {
@ -89,7 +88,7 @@ describe('fs.access', function () {
fs.writeFile('/myfile', contents, function (error) { fs.writeFile('/myfile', contents, function (error) {
if (error) throw error; if (error) throw error;
fs.chmod('/myfile', 0o777, function(error){ fs.chmod('/myfile', 0o777, function(error) {
if (error) throw error; if (error) throw error;
fs.access('/myfile', fs.constants.X_OK, function (error) { fs.access('/myfile', fs.constants.X_OK, function (error) {