summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-08-21 14:09:40 +0200
committerRobin Appelman <icewind@owncloud.com>2014-08-31 10:47:50 +0200
commite64aa330fdd6ce6180a0ffcf3634dbcae31abfff (patch)
tree6455536bdfbaa484b0915e04a4b394d7b9ec9872
parent2fcedcc50382127492ca0bf071e8e1bbe5736b16 (diff)
downloadnextcloud-server-e64aa330fdd6ce6180a0ffcf3634dbcae31abfff.tar.gz
nextcloud-server-e64aa330fdd6ce6180a0ffcf3634dbcae31abfff.zip
check for blacklisted file certificate filenames
-rw-r--r--lib/private/security/certificatemanager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index 2888fecd239..64a1d6431a4 100644
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -78,7 +78,7 @@ class CertificateManager implements ICertificateManager {
* @return bool | \OCP\ICertificate
*/
public function addCertificate($certificate, $name) {
- if (!\OC\Files\Filesystem::isValidPath($name)) {
+ if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
return false;
}
$isValid = openssl_pkey_get_public($certificate);