mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Improve nested path detection across app

Browse source
This commit is contained in:
Evan Hahn 2020-08-27 13:08:37 -05:00 • committed by Josh Perez
parent 57d206a344
commit f8fc23a7a3
5 changed files with 169 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/updater/common.ts
View file

@ -26,6 +26,7 @@ import { Dialogs } from '../types/Dialogs';
// @ts-ignore
import * as packageJson from '../../package.json';
import { getSignatureFileName } from './signature';
import { isPathInside } from '../util/isPathInside';
import { LocaleType } from '../types/I18N';
import { LoggerType } from '../types/Logging';
@ -71,7 +72,7 @@ export async function checkForUpdates(
export function validatePath(basePath: string, targetPath: string) {
const normalized = normalize(targetPath);
if (!normalized.startsWith(basePath)) {
if (!isPathInside(normalized, basePath)) {
throw new Error(
`validatePath: Path ${normalized} is not under base path ${basePath}`
);
@ -352,7 +353,7 @@ export async function deleteTempDir(targetDir: string) {
}
const baseTempDir = getBaseTempDir();
if (!targetDir.startsWith(baseTempDir)) {
if (!isPathInside(targetDir, baseTempDir)) {
throw new Error(
`deleteTempDir: Cannot delete path '${targetDir}' since it is not within base temp dir`
);