From 84f3dd15a63fb80f33e61f6056e142b0443329d5 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 28 Nov 2013 11:45:26 +0100 Subject: [PATCH] Add trailing slash in FTP root path when missing Fixes #6093 --- apps/files_external/lib/ftp.php | 3 +++ apps/files_external/tests/ftp.php | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index ca6c635eb2b..1f3ebd14b39 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -35,6 +35,9 @@ class FTP extends \OC\Files\Storage\StreamWrapper{ if ( ! $this->root || $this->root[0]!='/') { $this->root='/'.$this->root; } + if (substr($this->root, -1) !== '/') { + $this->root .= '/'; + } } else { throw new \Exception(); } diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php index 94ed5630d91..3037793120a 100644 --- a/apps/files_external/tests/ftp.php +++ b/apps/files_external/tests/ftp.php @@ -48,5 +48,17 @@ class FTP extends Storage { $config['secure'] = 'true'; $instance = new \OC\Files\Storage\FTP($config); $this->assertEquals('ftps://ftp:ftp@localhost/', $instance->constructUrl('')); + + $config['root'] = ''; + $instance = new \OC\Files\Storage\FTP($config); + $this->assertEquals('ftps://ftp:ftp@localhost/somefile.txt', $instance->constructUrl('somefile.txt')); + + $config['root'] = '/abc'; + $instance = new \OC\Files\Storage\FTP($config); + $this->assertEquals('ftps://ftp:ftp@localhost/abc/somefile.txt', $instance->constructUrl('somefile.txt')); + + $config['root'] = '/abc/'; + $instance = new \OC\Files\Storage\FTP($config); + $this->assertEquals('ftps://ftp:ftp@localhost/abc/somefile.txt', $instance->constructUrl('somefile.txt')); } } -- 2.39.5