throw exception if encryption was disabled but files are still encrypted to prevent...

diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 06ab73e3e4d11c95d9dd1e2f9958e3da24739e60..61bdcd5e0ae297f37eeadf067f6667a99b524cd5 100644 (file)
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -50,6 +50,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
                        throw new \Sabre_DAV_Exception_Forbidden();
                }
 
+               // throw an exception if encryption was disabled but the files are still encrypted
+               if (\OC_Util::encryptedFiles()) {
+                       throw new \Sabre_DAV_Exception_ServiceUnavailable();
+               }
+               
                // mark file as partial while uploading (ignored by the scanner)
                $partpath = $this->path . '.part';
 
@@ -89,7 +94,12 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
         */
        public function get() {
 
-               return \OC\Files\Filesystem::fopen($this->path, 'rb');
+               //throw execption if encryption is disabled but files are still encrypted
+               if (\OC_Util::encryptedFiles()) {
+                       throw new \Sabre_DAV_Exception_ServiceUnavailable();
+               } else {
+                       return \OC\Files\Filesystem::fopen($this->path, 'rb');
+               }
 
        }