Fix issues

faassupervisor/storage/config.py

@@ -234,7 +234,8 @@ def upload_output(self, output_dir_path):
             provider_type = StrUtils.get_storage_type(output['storage_provider'])
             provider_id = StrUtils.get_storage_id(output['storage_provider'])
             for file_path in output_files:
-                file_name = file_path.replace(f'{output_dir_path}/', '')
+                # Make sure the file name does not contain new lines or starting slashes
+                file_name = file_path.replace(f'{output_dir_path}/', '').strip().lstrip('/')
                 prefix_ok = False
                 suffix_ok = False
                 # Check prefixes

faassupervisor/storage/providers/s3.py

@@ -15,13 +15,13 @@
 related with the S3 storage provider. """
 
 import boto3
-from requests.packages import urllib3
+import urllib3
 from faassupervisor.logger import get_logger
 from faassupervisor.storage.providers import DefaultStorageProvider, \
     get_bucket_name, get_file_key
 from faassupervisor.utils import SysUtils
 
-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) 
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 class S3(DefaultStorageProvider):
     """Class that manages downloads and uploads from S3."""

test/unit/faassupervisor/storage.py

@@ -259,7 +259,8 @@ def test_upload_output(self, mock_minio, mock_s3, mock_get_files):
                 '/tmp/test/result-file.txt',
                 '/tmp/test/result-file.out',
                 '/tmp/test/file2.txt',
-                '/tmp/test/file2.out'
+                '/tmp/test/file2.out',
+                '/tmp/test/\n/file3.out'
             ]
             mock_get_files.return_value = files
             StorageConfig().upload_output('/tmp/test')
@@ -268,10 +269,12 @@ def test_upload_output(self, mock_minio, mock_s3, mock_get_files):
                              call('/tmp/test/result-file.txt',
                                   'result-file.txt',
                                   'bucket'))
-            self.assertEqual(mock_s3.call_count, 6)
-            for i, f in enumerate(files):
+            self.assertEqual(mock_s3.call_count, 7)
+            for i, f in enumerate(files[:-1]):
                 self.assertEqual(mock_s3.call_args_list[i],
                                  call(f, f.split('/')[3], 'bucket/folder'))
+            self.assertEqual(mock_s3.call_args_list[6],
+                             call('/tmp/test/\n/file3.out', 'file3.out', 'bucket/folder'))
 
 #    def test_upload_real_output(self):
 #        with mock.patch.dict('os.environ',