aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-20 11:44:57 +0100
committerGitHub <noreply@github.com>2017-03-20 11:44:57 +0100
commitac1aff7d9249523cc66a7cd890f95f0760f1016a (patch)
treeed2be7298b196f1b5aa8ac897287b75d969f956a /lib
parentc4b6ff0bab812ebda50406d630b171604fbaac72 (diff)
parent1e61c17932d3c0425c220507ce661ec94d14cb3c (diff)
downloadnextcloud-server-ac1aff7d9249523cc66a7cd890f95f0760f1016a.tar.gz
nextcloud-server-ac1aff7d9249523cc66a7cd890f95f0760f1016a.zip
Merge pull request #3950 from nextcloud/downstream-27149
Forbid to upload part files via web UI
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Template/JSConfigHelper.php1
-rw-r--r--lib/public/Files/FileInfo.php6
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index 6bf08dcdada..ca45bbee9c6 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -209,6 +209,7 @@ class JSConfigHelper {
'modRewriteWorking' => ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'),
'sharing.maxAutocompleteResults' => intval($this->config->getSystemValue('sharing.maxAutocompleteResults', 0)),
'sharing.minSearchStringLength' => intval($this->config->getSystemValue('sharing.minSearchStringLength', 0)),
+ 'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
]),
"oc_appconfig" => json_encode([
'core' => [
diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php
index b6718efba34..8eeb8df08ce 100644
--- a/lib/public/Files/FileInfo.php
+++ b/lib/public/Files/FileInfo.php
@@ -64,6 +64,12 @@ interface FileInfo {
const MIMETYPE_FOLDER = 'httpd/unix-directory';
/**
+ * @const \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX Return regular expression to test filenames against (blacklisting)
+ * @since 12.0.0
+ */
+ const BLACKLIST_FILES_REGEX = '\.(part|filepart)$';
+
+ /**
* Get the Etag of the file or folder
*
* @return string