Ensure we have a seekable stream when we need one.

horde · Feb 3, 2017 · 503f48f · 503f48f
1 parent 1929f39
commit 503f48f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/framework/Vfs/lib/Horde/Vfs/Base.php b/framework/Vfs/lib/Horde/Vfs/Base.php
@@ -793,6 +793,23 @@ protected function _getDataSize($data)
         return strlen($data);
     }
 
+    protected function _ensureSeekable($stream)
+    {
+        if (!is_resource($stream)) {
+            return $stream;
+        }
+
+        $meta = stream_get_meta_data($stream);
+        if (!$meta['seekable']) {
+            $temp = new Horde_Stream_Temp();
+            $temp->add($stream, true);
+            return $temp->stream;
+        }
+
+        rewind($stream);
+        return $stream;
+    }
+
     /**
      * Checks the quota when preparing to delete data.
      *

diff --git a/framework/Vfs/lib/Horde/Vfs/File.php b/framework/Vfs/lib/Horde/Vfs/File.php
@@ -309,6 +309,9 @@ public function writeData($path, $name, $data, $autocreate = false)
             }
         }
 
+        // Ensure we have either a string or seekable stream.
+        $data = $this->_ensureSeekable($data);
+
         // Treat an attempt to write an empty file as a touch() call,
         // since otherwise the file will not be created at all.
         if (!$this->_getDataSize($data)) {
@@ -321,10 +324,6 @@ public function writeData($path, $name, $data, $autocreate = false)
         $this->_checkQuotaWrite('string', $data, $path, $name);
 
         // Otherwise we go ahead and try to write out the file.
-        if (is_resource($data)) {
-            rewind($data);
-        }
-
         if (!@file_put_contents($this->_getNativePath($path, $name), $data)) {
             $this->_throwException(new Horde_Vfs_Exception(sprintf('Unable to write data to VFS file %s/%s.', $path, $name)));
         }

diff --git a/framework/Vfs/lib/Horde/Vfs/Ftp.php b/framework/Vfs/lib/Horde/Vfs/Ftp.php
@@ -251,9 +251,7 @@ public function write($path, $name, $tmpFile, $autocreate = false)
     public function writeData($path, $name, $data, $autocreate = false)
     {
         $tmpFile = Horde_Util::getTempFile('vfs');
-        if (is_resource($data)) {
-            rewind($data);
-        }
+        $data = $this->_ensureSeekable($data);
         file_put_contents($tmpFile, $data);
         try {
             $this->write($path, $name, $tmpFile, $autocreate);

diff --git a/framework/Vfs/lib/Horde/Vfs/Mongo.php b/framework/Vfs/lib/Horde/Vfs/Mongo.php
@@ -203,8 +203,8 @@ protected function _write($type, $path, $name, $data, $autocreate)
                 // MONGO currently has no ability to stream data TO the
                 // server. I.e., there is no opposite version of
                 // MongoGridFSFile::getResource().
+                $data = $this->_ensureSeekable($data);
                 if (is_resource($data)) {
-                    rewind($data);
                     $data = stream_get_contents($data);
                 }
                 $this->_files->storeBytes($data, $mdata);

diff --git a/framework/Vfs/lib/Horde/Vfs/Sql.php b/framework/Vfs/lib/Horde/Vfs/Sql.php
@@ -226,6 +226,7 @@ public function write($path, $name, $tmpFile, $autocreate = false)
      */
     public function writeData($path, $name, $data, $autocreate = false)
     {
+        $data = $this->_ensureSeekable($data);
         $this->_checkQuotaWrite('string', $data, $path, $name);
 
         $path = $this->_convertPath($path);

diff --git a/framework/Vfs/lib/Horde/Vfs/SqlFile.php b/framework/Vfs/lib/Horde/Vfs/SqlFile.php
@@ -75,6 +75,7 @@ public function write($path, $name, $tmpFile, $autocreate = false)
      */
     public function writeData($path, $name, $data, $autocreate = false)
     {
+        $data = $this->_ensureSeekable($data);
         $this->_checkQuotaWrite('string', $data, $path, $name);
 
         $fp = @fopen($this->_getNativePath($path, $name), 'w');

diff --git a/framework/Vfs/lib/Horde/Vfs/Ssh2.php b/framework/Vfs/lib/Horde/Vfs/Ssh2.php
@@ -217,9 +217,7 @@ public function write($path, $name, $tmpFile, $autocreate = false)
     public function writeData($path, $name, $data, $autocreate = false)
     {
         $tmpFile = Horde_Util::getTempFile('vfs');
-        if (is_resource($data)) {
-            rewind($data);
-        }
+        $data = $this->_ensureSeekable($data);
         file_put_contents($tmpFile, $data);
         clearstatcache();
         $this->write($path, $name, $tmpFile, $autocreate);