status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a bug in asset server when using relative project roots 

Summary:This PR fixes a bug where when using relative roots for the packager server, asset paths would be deemed invalid by the recently introduced security check. Resolving the root to an absolute path fixes that problem.

I'd be happy to write a regression test for this but I had a hard time setting up a mock file system with relative paths. If it is required, some help would be appreciated...
Closes https://github.com/facebook/react-native/pull/7161

Differential Revision: D3214840

fb-gh-sync-id: 08e13fb9f94a98206fd2d090f74a8b63ba2bf80f
fbshipit-source-id: 08e13fb9f94a98206fd2d090f74a8b63ba2bf80f
This commit is contained in:
Alexander Micklewright 2016-04-22 16:05:46 -07:00 committed by Facebook Github Bot 5
parent bdc9749ba0
commit 05871df2a9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
react-packager/src/AssetServer/index.js vendored
View File

@ -129,13 +129,14 @@ class AssetServer {
_findRoot(roots, dir) { _findRoot(roots, dir) {
return Promise.all( return Promise.all(
roots.map(root => { roots.map(root => {
const absRoot = path.resolve(root);
// important: we want to resolve root + dir // important: we want to resolve root + dir
// to ensure the requested path doesn't traverse beyond root // to ensure the requested path doesn't traverse beyond root
const absPath = path.resolve(root, dir); const absPath = path.resolve(root, dir);
return stat(absPath).then(fstat => { return stat(absPath).then(fstat => {
// keep asset requests from traversing files // keep asset requests from traversing files
// up from the root (e.g. ../../../etc/hosts) // up from the root (e.g. ../../../etc/hosts)
if (!absPath.startsWith(root)) { if (!absPath.startsWith(absRoot)) {
return {path: absPath, isValid: false}; return {path: absPath, isValid: false};
} }
return {path: absPath, isValid: fstat.isDirectory()}; return {path: absPath, isValid: fstat.isDirectory()};