fix bug by convert the password to bytes

Packs/CommonScripts/ReleaseNotes/1_11_85.md

@@ -0,0 +1,7 @@
+
+#### Scripts
+
+##### UnzipFile
+
+- Fixed an issue where run the script failed when used with `zipfile` tool.
+- Updated the Docker image to: *demisto/unzip:1.0.0.61858*.

Packs/CommonScripts/Scripts/UnzipFile/UnzipFile.py

@@ -87,7 +87,7 @@
         excluded_files: the excludedfiles which are in dir_path
     """
     # remembering which files and dirs we currently have so we add them later as newly extracted files.
     file_path = file_info['path']
     file_name = file_info['name']
     excluded_files = [f for f in os.listdir('.') if isfile(f)]
     excluded_dirs = [d for d in os.listdir('.') if isdir(d)]
@@ -105,6 +105,8 @@
         if zip_tool == '7z':
             stdout = extract_using_7z(file_path, dir_path, password=password)
         elif zip_tool == 'zipfile':
+            if password:
+                password = bytes(password, 'utf-8')
             extract_using_zipfile(file_path, dir_path, password=password)
         else:
             return_error(f'There is no zipTool named: {zip_tool}')
@@ -226,7 +228,7 @@
         })
     else:
         results = []
         # extracted files can be in sub directories so we save the base names of
         # the files and also the full path of the file
         files_base_names = [os.path.basename(file_path) for file_path in filenames]  # noqa[F812]
         files_dic = {file_path: os.path.basename(file_path) for file_path in filenames}

Packs/CommonScripts/Scripts/UnzipFile/UnzipFile.yml

@@ -60,7 +60,7 @@ tags:
 - file
 timeout: '0'
 type: python
-dockerimage: demisto/unzip:1.0.0.44723
+dockerimage: demisto/unzip:1.0.0.61858
 runonce: false
 tests:
 - ZipFile-Test

Packs/CommonScripts/Scripts/UnzipFile/UnzipFile_test.py

@@ -46,21 +46,25 @@
 
 
 data_test_unzip_with_password = [
-    ('fix_unzip.png', 'demisto'),
+    ('fix_unzip.png', 'demisto', '7z'),
+    ('fix_unzip.png', 'demisto', 'zipfile')
 ]
 
 
-@pytest.mark.parametrize('file_name, password', data_test_unzip_with_password)
-def test_unzip_with_password(file_name, password):
+@pytest.mark.parametrize('file_name, password, zip_tool', data_test_unzip_with_password)
+def test_unzip_with_password(file_name, password, zip_tool):
     """
     Given
     - valid zip file - with password required
     - empty folder _dir
+    - the tool to extract files
     When
     - run extract on that zip file and export the internal files to _dir
     Then
     - ensure zip file content have be saved at _dir directory with the original filename
     - ensure that the saved file has expected content
+    - the extraction worked as expected with the password converted from str to bytes
+      when the extraction tool is `zipfile`
     """
     # Given
     # - valid zip file - no password required
@@ -76,7 +80,7 @@
     _dir = mkdtemp()
     # When
     # - run extract on that zip file and export the internal files to _dir
-    extract(zipped_file_object, _dir, password=password)
+    extract(zipped_file_object, _dir, password=password, zip_tool=zip_tool)
     # Then
     # - ensure zip file content have been saved at _dir directory with the original filename
     with open(_dir + '/' + file_name, 'rb') as f:
@@ -230,7 +234,7 @@
     - arguments for the script
     When
     - running the script on a password locked file
     Then
     - ensure that only one of the arguments 'password' or 'nonsensitive_password' is given or if they are identical.
     """
     with pytest.raises(ValueError) as e:

Packs/CommonScripts/pack_metadata.json

@@ -2,7 +2,7 @@
     "name": "Common Scripts",
     "description": "Frequently used scripts pack.",
     "support": "xsoar",
-    "currentVersion": "1.11.84",
+    "currentVersion": "1.11.85",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",