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.

Sign up for GitHub

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

Jump to bottom

fix(filesystem): allow copy if from is not parent of to #546

Merged
merged 8 commits into from
Aug 23, 2021
Merged

fix(filesystem): allow copy if from is not parent of to #546

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d99655
(fix: filesystem): pseudo error when running .copy "./path" -> "./path2"
tachibana-shin Aug 15, 2021
916a256
Merge branch 'main' into main
tachibana-shin Aug 17, 2021
f1e4e15
(fix): removed depends
tachibana-shin Aug 17, 2021
5925c78
Merge branch 'main' of https://github.com/Shin-Tachibana/capacitor-pl…
tachibana-shin Aug 17, 2021
cfbb13f
Merge branch 'main' into main
tachibana-shin Aug 18, 2021
58a999e
delete yarn.lock
jcesarmobile Aug 23, 2021
dd1e25e
Merge branch 'main' into main
jcesarmobile Aug 23, 2021
926c897
fmt
jcesarmobile Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion filesystem/src/web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,36 @@ import type {
Directory,
} from './definitions';

function resolve(path: string): string {
const posix = path.split('/').filter(item => item !== '.');
const newPosix: string[] = [];

posix.forEach(item => {
if (
item === '..' &&
newPosix.length > 0 &&
newPosix[newPosix.length - 1] !== '..'
) {
newPosix.pop();
} else {
newPosix.push(item);
}
});

return newPosix.join('/');
}
function isPathParent(parent: string, children: string): boolean {
parent = resolve(parent);
children = resolve(children);
const pathsA = parent.split('/');
const pathsB = children.split('/');

return (
parent !== children &&
pathsA.every((value, index) => value === pathsB[index])
);
}

export class FilesystemWeb extends WebPlugin implements FilesystemPlugin {
DB_VERSION = 1;
DB_NAME = 'Disc';
Expand Down Expand Up @@ -431,7 +461,7 @@ export class FilesystemWeb extends WebPlugin implements FilesystemPlugin {
return;
}

if (toPath.startsWith(fromPath)) {
if (isPathParent(fromPath, toPath)) {
throw Error('To path cannot contain the from path');
}

Expand Down