From 7866d004c2755fb18d87d99c4367850b221688a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20P=C3=A9rez?= Date: Tue, 17 Jul 2018 12:36:34 +0200 Subject: [PATCH 1/2] FIXED: FTP user and password strings urldecoded --- lib/internal/Magento/Framework/System/Ftp.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php index 4b6432a863ebe..3a062651e0db1 100644 --- a/lib/internal/Magento/Framework/System/Ftp.php +++ b/lib/internal/Magento/Framework/System/Ftp.php @@ -105,6 +105,11 @@ public function validateConnectionString($string) if ($data['scheme'] != 'ftp') { throw new \Exception("Support for scheme unsupported: '{$data['scheme']}'"); } + + // Decode user & password strings from URL + if ( array_key_exists('user', $data) ) $data['user'] = urldecode($data['user']); + if ( array_key_exists('pass', $data) ) $data['pass'] = urldecode($data['pass']); + return $data; } From a1ebbeeb00566865345f32a046d0ca48f63f919a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20P=C3=A9rez?= Date: Wed, 18 Jul 2018 14:10:33 +0200 Subject: [PATCH 2/2] Fixed: urldecode user & pass from FTP connection string recoding to pass travis coding standards --- lib/internal/Magento/Framework/System/Ftp.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php index 3a062651e0db1..8bf898965cbc3 100644 --- a/lib/internal/Magento/Framework/System/Ftp.php +++ b/lib/internal/Magento/Framework/System/Ftp.php @@ -107,8 +107,9 @@ public function validateConnectionString($string) } // Decode user & password strings from URL - if ( array_key_exists('user', $data) ) $data['user'] = urldecode($data['user']); - if ( array_key_exists('pass', $data) ) $data['pass'] = urldecode($data['pass']); + foreach (array_intersect(array_keys($data), ['user','pass']) as $key) { + $data[$key] = urldecode($data[$key]); + } return $data; }