Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: relative link error #308

Merged
merged 12 commits into from
May 2, 2024
5 changes: 3 additions & 2 deletions lib/filesystem.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,10 @@ class Filesystem {

insertLink (p) {
const symlink = fs.readlinkSync(p)
const parentPath = path.dirname(p)
// /var => /private/var
const parentPath = fs.realpathSync(path.dirname(p))
const link = path.relative(fs.realpathSync(this.src), path.join(parentPath, symlink))
if (link.substr(0, 2) === '..') {
if (link.startsWith('..')) {
throw new Error(`${p}: file "${link}" links out of the package`)
}
const node = this.searchNodeFromPath(p)
Expand Down
42 changes: 42 additions & 0 deletions test/filesystem-spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
'use strict'

const assert = require('assert')
const fs = require('../lib/wrapped-fs')
const path = require('path')
const rimraf = require('rimraf')

const Filesystem = require('../lib/filesystem')

describe('filesystem', function () {
beforeEach(() => { rimraf.sync(path.join(__dirname, '..', 'tmp'), fs) })

it('should does not throw error when src path include symbol link', async () => {
erickzhao marked this conversation as resolved.
Show resolved Hide resolved
/* eslint-disable no-irregular-whitespace */
/**
* Directory structure:
* tmp
* ├── private
* │   └── var
* │   ├── app
* │   │   └── file.txt -> ../file.txt
* │   └── file.txt
* └── var -> private/var
*/
erickzhao marked this conversation as resolved.
Show resolved Hide resolved
const tmpPath = path.join(__dirname, '..', 'tmp')
const privateVarPath = path.join(tmpPath, 'private', 'var')
const varPath = path.join(tmpPath, 'var')
fs.mkdirSync(privateVarPath, { recursive: true })
fs.symlinkSync(path.relative(tmpPath, privateVarPath), varPath)

const originFilePath = path.join(varPath, 'file.txt')
fs.writeFileSync(originFilePath, 'hello world')
const appPath = path.join(varPath, 'app')
fs.mkdirpSync(appPath)
fs.symlinkSync('../file.txt', path.join(appPath, 'file.txt'))

const filesystem = new Filesystem(varPath)
assert.doesNotThrow(() => {
filesystem.insertLink(path.join(appPath, 'file.txt'))
})
})
})