From 11f838f9e4302154ebbcf5bad51faca4a0e28607 Mon Sep 17 00:00:00 2001 From: Felix Heidecke Date: Mon, 13 Feb 2017 16:51:23 +0100 Subject: Add ignore_files to config, test files against ignore_files list on upload fix typo and indentation Move blacklist declaration to lib/public/Files/FileInfo.php, Rename *ignored to *blacklisted Mocked blacklist_files for testing Mocked blacklist_files for testing Signed-off-by: Morris Jobke --- core/js/js.js | 8 ++++++++ core/js/tests/specHelper.js | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 5c737d41793..8c6fc0d9c07 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -224,6 +224,14 @@ var OCP = {}, return link; }, + /** + * Check if a user file is allowed to be handled. + * @param {string} file to check + */ + fileIsBlacklisted: function(file) { + return !!(file.match(oc_config.blacklist_files_regex)); + }, + /** * Redirect to the target URL, can also be used for downloads. * @param {string} targetURL URL to redirect to diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index f9bdeae0d64..d940cf068f9 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -94,7 +94,8 @@ window.oc_appswebroots = { }; window.oc_config = { session_lifetime: 600 * 1000, - session_keepalive: false + session_keepalive: false, + blacklist_files_regex: '\.(part|filepart)$', }; window.oc_appconfig = { core: {} -- cgit v1.2.3