mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3595 from jviotti/jviotti/fix/3512/execFile-override-exec-permissions

Browse source 
🐛 Fix missing execution permission bit in execFile override
This commit is contained in:
Cheng Zhao 2015-11-27 11:39:45 +08:00
commit 42454b07d0
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/common/api/atom_api_asar.cc
View file

@ -54,6 +54,7 @@ class Archive : public mate::Wrappable {
mate::Dictionary dict(isolate, v8::Object::New(isolate)); mate::Dictionary dict(isolate, v8::Object::New(isolate));
dict.Set("size", stats.size); dict.Set("size", stats.size);
dict.Set("offset", stats.offset); dict.Set("offset", stats.offset);
dict.Set("executable", stats.executable);
dict.Set("isFile", stats.is_file); dict.Set("isFile", stats.is_file);
dict.Set("isDirectory", stats.is_directory); dict.Set("isDirectory", stats.is_directory);
dict.Set("isLink", stats.is_link); dict.Set("isLink", stats.is_link);

3
atom/common/asar/archive.cc
View file

@ -107,6 +107,9 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
return false; return false;
info->offset += header_size; info->offset += header_size;
info->executable = false;
node->GetBoolean("executable", &info->executable);
return true; return true;
} }

1
atom/common/asar/archive.h
View file

@ -27,6 +27,7 @@ class Archive {
struct FileInfo { struct FileInfo {
FileInfo() : size(0), offset(0) {} FileInfo() : size(0), offset(0) {}
bool unpacked; bool unpacked;
bool executable;
uint32 size; uint32 size;
uint64 offset; uint64 offset;
}; };

11
atom/common/lib/asar.coffee
View file

@ -1,5 +1,6 @@
asar = process.binding 'atom_common_asar' asar = process.binding 'atom_common_asar'
child_process = require 'child_process' child_process = require 'child_process'
fs = require 'fs'
path = require 'path' path = require 'path'
util = require 'util' util = require 'util'
@ -83,6 +84,11 @@ overrideAPISync = (module, name, arg = 0) ->
newPath = archive.copyFileOut filePath newPath = archive.copyFileOut filePath
notFoundError asarPath, filePath unless newPath notFoundError asarPath, filePath unless newPath
stat = archive.stat filePath
if stat.executable
fs.chmodSync(newPath, 0o755)
arguments[arg] = newPath arguments[arg] = newPath
old.apply this, arguments old.apply this, arguments
@ -102,6 +108,11 @@ overrideAPI = (module, name, arg = 0) ->
newPath = archive.copyFileOut filePath newPath = archive.copyFileOut filePath
return notFoundError asarPath, filePath, callback unless newPath return notFoundError asarPath, filePath, callback unless newPath
stat = archive.stat filePath
if stat.executable
fs.chmodSync(newPath, 0o755)
arguments[arg] = newPath arguments[arg] = newPath
old.apply this, arguments old.apply this, arguments