Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-28 11:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): normalize asset windows paths

Browse Source
This commit is contained in:
Charles Lyding 2018-01-16 20:37:42 -05:00 committed by Mike Brocchi
parent 5f73a75193
commit 14b3743599
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/@angular/cli/models/webpack-configs/common.ts
View File

@ -83,16 +83,21 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
asset = typeof asset === 'string' ? { glob: asset } : asset; asset = typeof asset === 'string' ? { glob: asset } : asset;
// Add defaults. // Add defaults.
// Input is always resolved relative to the appRoot. // Input is always resolved relative to the appRoot.
asset.input = path.resolve(appRoot, asset.input || ''); asset.input = path.resolve(appRoot, asset.input || '').replace(/\\/g, '/');
asset.output = asset.output || ''; asset.output = asset.output || '';
asset.glob = asset.glob || ''; asset.glob = asset.glob || '';
// Prevent asset configurations from writing outside of the output path, except if the user // Prevent asset configurations from writing outside of the output path, except if the user
// specify a configuration flag. // specify a configuration flag.
// Also prevent writing outside the project path. That is not overridable. // Also prevent writing outside the project path. That is not overridable.
const fullOutputPath = path.resolve(buildOptions.outputPath, asset.output); const absoluteOutputPath = path.resolve(buildOptions.outputPath);
if (!fullOutputPath.startsWith(path.resolve(buildOptions.outputPath))) { const absoluteAssetOutput = path.resolve(absoluteOutputPath, asset.output);
if (!fullOutputPath.startsWith(projectRoot)) { const outputRelativeOutput = path.relative(absoluteOutputPath, absoluteAssetOutput);
if (outputRelativeOutput.startsWith('..') || path.isAbsolute(outputRelativeOutput)) {
const projectRelativeOutput = path.relative(projectRoot, absoluteAssetOutput);
if (projectRelativeOutput.startsWith('..') || path.isAbsolute(projectRelativeOutput)) {
const message = 'An asset cannot be written to a location outside the project.'; const message = 'An asset cannot be written to a location outside the project.';
throw new SilentError(message); throw new SilentError(message);
} }
@ -106,7 +111,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
} }
// Prevent asset configurations from reading files outside of the project. // Prevent asset configurations from reading files outside of the project.
if (!asset.input.startsWith(projectRoot)) { const projectRelativeInput = path.relative(projectRoot, asset.input);
if (projectRelativeInput.startsWith('..') || path.isAbsolute(projectRelativeInput)) {
const message = 'An asset cannot be read from a location outside the project.'; const message = 'An asset cannot be read from a location outside the project.';
throw new SilentError(message); throw new SilentError(message);
} }