Detect aborted connection in OC\Files\View and stop writing data to the output buffer

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 5b543ad55b939b2896c56c2eb48c942db397e162..229d7054fe484ba4cb56892b6f3a3e2f638ce3e5 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -291,6 +291,7 @@ return array(
     'OCP\\Files\\Config\\IMountProviderCollection' => $baseDir . '/lib/public/Files/Config/IMountProviderCollection.php',
     'OCP\\Files\\Config\\IRootMountProvider' => $baseDir . '/lib/public/Files/Config/IRootMountProvider.php',
     'OCP\\Files\\Config\\IUserMountCache' => $baseDir . '/lib/public/Files/Config/IUserMountCache.php',
+    'OCP\\Files\\ConnectionLostException' => $baseDir . '/lib/public/Files/ConnectionLostException.php',
     'OCP\\Files\\DavUtil' => $baseDir . '/lib/public/Files/DavUtil.php',
     'OCP\\Files\\EmptyFileNameException' => $baseDir . '/lib/public/Files/EmptyFileNameException.php',
     'OCP\\Files\\EntityTooLargeException' => $baseDir . '/lib/public/Files/EntityTooLargeException.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 19e2f3393d6fef8d0a5cc5ae8364122094c365e1..e790fd19584123860ec78c37deb8ea216d2f1997 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -324,6 +324,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Files\\Config\\IMountProviderCollection' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IMountProviderCollection.php',
         'OCP\\Files\\Config\\IRootMountProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IRootMountProvider.php',
         'OCP\\Files\\Config\\IUserMountCache' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IUserMountCache.php',
+        'OCP\\Files\\ConnectionLostException' => __DIR__ . '/../../..' . '/lib/public/Files/ConnectionLostException.php',
         'OCP\\Files\\DavUtil' => __DIR__ . '/../../..' . '/lib/public/Files/DavUtil.php',
         'OCP\\Files\\EmptyFileNameException' => __DIR__ . '/../../..' . '/lib/public/Files/EmptyFileNameException.php',
         'OCP\\Files\\EntityTooLargeException' => __DIR__ . '/../../..' . '/lib/public/Files/EntityTooLargeException.php',

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 05b4b2e21b8a24f3030619f1c09d9428a2e578bd..e5476c77b2a1aba116debd98d4b71c161c02c2f6 100644 (file)
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -56,6 +56,7 @@ use OC\User\Manager as UserManager;
 use OCA\Files_Sharing\SharedMount;
 use OCP\Constants;
 use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\ConnectionLostException;
 use OCP\Files\EmptyFileNameException;
 use OCP\Files\FileNameTooLongException;
 use OCP\Files\InvalidCharacterInPathException;
@@ -397,10 +398,11 @@ class View {
                }
                $handle = $this->fopen($path, 'rb');
                if ($handle) {
-                       $chunkSize = 524288; // 512 kB chunks
+                       $chunkSize = 524288; // 512 kiB chunks
                        while (!feof($handle)) {
                                echo fread($handle, $chunkSize);
                                flush();
+                               $this->checkConnectionStatus();
                        }
                        fclose($handle);
                        return $this->filesize($path);
@@ -423,7 +425,7 @@ class View {
                }
                $handle = $this->fopen($path, 'rb');
                if ($handle) {
-                       $chunkSize = 524288; // 512 kB chunks
+                       $chunkSize = 524288; // 512 kiB chunks
                        $startReading = true;
 
                        if ($from !== 0 && $from !== '0' && fseek($handle, $from) !== 0) {
@@ -453,6 +455,7 @@ class View {
                                        }
                                        echo fread($handle, $len);
                                        flush();
+                                       $this->checkConnectionStatus();
                                }
                                return ftell($handle) - $from;
                        }
@@ -462,6 +465,13 @@ class View {
                return false;
        }
 
+       private function checkConnectionStatus(): void {
+               $connectionStatus = \connection_status();
+               if ($connectionStatus !== CONNECTION_NORMAL) {
+                       throw new ConnectionLostException("Connection lost. Status: $connectionStatus");
+               }
+       }
+
        /**
         * @param string $path
         * @return mixed

diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php
index 5655139b24a5723cf5a383cbb562a5251b283126..d38f45545dba77f3a0b1a7526e463dad564a70ee 100644 (file)
--- a/lib/private/legacy/OC_Files.php
+++ b/lib/private/legacy/OC_Files.php
@@ -230,6 +230,10 @@ class OC_Files {
                        OC::$server->getLogger()->logException($ex);
                        $l = \OC::$server->getL10N('lib');
                        \OC_Template::printErrorPage($l->t('Cannot download file'), $ex->getMessage(), 200);
+               } catch (\OCP\Files\ConnectionLostException $ex) {
+                       self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+                       OC::$server->getLogger()->logException($ex, ['level' => \OCP\ILogger::DEBUG]);
+                       \OC_Template::printErrorPage('Connection lost', $ex->getMessage(), 200);
                } catch (\Exception $ex) {
                        self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
                        OC::$server->getLogger()->logException($ex);

diff --git a/lib/public/Files/ConnectionLostException.php b/lib/public/Files/ConnectionLostException.php
new file mode 100644 (file)
index 0000000..8e5deb9
--- /dev/null
+++ b/lib/public/Files/ConnectionLostException.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Côme Chilliet <come.chilliet@nextcloud.com>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Files;
+
+/**
+ * Exception for lost connection with the
+ * @since 25.0.11
+ */
+class ConnectionLostException extends \RuntimeException {
+}