lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Block any nonpacked content by default if unsafe is not allowed

This commit is contained in:
Jiiks 2018-08-27 19:36:06 +03:00
parent cfbafffe46
commit 6b3cb712c7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/modules/contentmanager.js
View File

@ -19,6 +19,7 @@ import { Utils, FileUtils, ClientLogger as Logger } from 'common';
import { SettingsSet, ErrorEvent } from 'structs'; import { SettingsSet, ErrorEvent } from 'structs';
import { Modals } from 'ui'; import { Modals } from 'ui';
import Combokeys from 'combokeys'; import Combokeys from 'combokeys';
import Settings from './settings';
/** /**
* Base class for managing external content * Base class for managing external content
@ -131,6 +132,8 @@ export default class {
const directories = await FileUtils.listDirectory(this.contentPath); const directories = await FileUtils.listDirectory(this.contentPath);
for (const dir of directories) { for (const dir of directories) {
const packed = dir.endsWith('.bd');
// If content is already loaded this should resolve // If content is already loaded this should resolve
if (this.getContentByDirName(dir)) continue; if (this.getContentByDirName(dir)) continue;
@ -219,7 +222,14 @@ export default class {
*/ */
static async preloadContent(dirName, reload = false, index) { static async preloadContent(dirName, reload = false, index) {
try { try {
const unsafeAllowed = Settings.getSetting('core', 'advanced', 'unsafe-content').value;
const packed = typeof dirName === 'object' && dirName.packed; const packed = typeof dirName === 'object' && dirName.packed;
// Block any unpacked content as they can't be verified
if (!packed && !unsafeAllowed) {
throw 'Blocked unsafe content';
}
const contentPath = packed ? dirName.contentPath : path.join(this.contentPath, dirName); const contentPath = packed ? dirName.contentPath : path.join(this.contentPath, dirName);
await FileUtils.directoryExists(contentPath); await FileUtils.directoryExists(contentPath);