Skip to content

keep mount path in allowed path #643

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

Open
trim21 wants to merge 6 commits into
base: master
Choose a base branch
from
+4 −1
Open

keep mount path in allowed path #643

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5b90b5
keep mount path in allowed path
trim21 May 3, 2023
f4cbcb0
format code
trim21 May 3, 2023
f461363
logic
trim21 May 3, 2023
a5f5f17
prettier
trim21 May 3, 2023
cb116dc
Merge branch 'master' into allowed-path-show-disk-usage
trim21 Jun 11, 2023
09a38c4
Merge branch 'master' into allowed-path-show-disk-usage
trim21 Nov 15, 2023
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
5 changes: 4 additions & 1 deletion server/models/DiskUsage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {Disks} from '@shared/types/DiskUsage';
import {isPlatformSupported, diskUsage} from '../util/diskUsageUtil';

import type {SupportedPlatform} from '../util/diskUsageUtil';
import {isAllowedPath} from '../util/fileUtil';

export interface DiskUsageSummary {
id: number;
Expand Down Expand Up @@ -59,7 +60,9 @@ class DiskUsage extends (EventEmitter as new () => TypedEmitter<DiskUsageEvents>
return diskUsage[process.platform as SupportedPlatform](INTERVAL_UPDATE / 2)
.then((disks) => {
// Mountpoints with a very long path are unlikely to be useful.
return disks.filter((disk) => typeof disk.target === 'string' && disk.target.length < 30);
return disks.filter(
(disk) => typeof disk.target === 'string' && (disk.target.length < 30 || isAllowedPath(disk.target)),
);
})
.then((disks) => {
if (disks.length !== this.disks.length || disks.some((d, i) => d.used !== this.disks[i].used)) {
Expand Down