starred/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-08-03 08:03:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix zip content filtering in unarchive module (#76069)

Browse Source 
When we introduced an include parameter to the unarchive module, we
inadvertenly flipped the exclusion logic. This flip meant that the
unarchive module started rejecting files that should be extracted.

This commit flips the bad logic and adds some tests that will make
sure things do not go bad again.
This commit is contained in:
Tadej Borovšak
2021-10-29 15:12:24 -04:00
committed by GitHub
parent 173550f932
commit f92830d16e
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/fragments/76069-fix-unarchive-file-listing-in-zip.yaml
+3
View File
@@ -0,0 +1,3 @@
bugfixes:
- unarchive - Fix zip archive file listing that caused issues with content
postprocessing (https://github.com/ansible/ansible/issues/76067).
lib/ansible/modules/unarchive.py
+1 -1
View File
@@ -386,7 +386,7 @@ class ZipArchive(object):
exclude_flag = False exclude_flag = False
if self.excludes: if self.excludes:
for exclude in self.excludes: for exclude in self.excludes:
if not fnmatch.fnmatch(member, exclude): if fnmatch.fnmatch(member, exclude):
exclude_flag = True exclude_flag = True
break break
if not exclude_flag: if not exclude_flag:
test/integration/targets/unarchive/tasks/test_exclude.yml
+15
View File
@@ -11,13 +11,28 @@
src: "{{ remote_tmp_dir }}/unarchive-00.{{item}}" src: "{{ remote_tmp_dir }}/unarchive-00.{{item}}"
dest: "{{ remote_tmp_dir }}/exclude-{{item}}" dest: "{{ remote_tmp_dir }}/exclude-{{item}}"
remote_src: yes remote_src: yes
list_files: yes
exclude: exclude:
- "exclude/exclude-*.txt" - "exclude/exclude-*.txt"
- "other/exclude-1.ext" - "other/exclude-1.ext"
register: result_of_unarchive
with_items: with_items:
- zip - zip
- tar - tar
- name: Make sure unarchive module reported back extracted files
assert:
that:
- "'include/include-1.txt' in item.files"
- "'include/include-2.txt' in item.files"
- "'include/include-3.txt' in item.files"
- "'other/include-1.ext' in item.files"
- "'other/include-2.ext' in item.files"
- "'other/exclude-2.ext' in item.files"
- "'other/other-1.ext' in item.files"
- "'other/other-2.ext' in item.files"
loop: "{{ result_of_unarchive.results }}"
- name: verify that the file was unarchived - name: verify that the file was unarchived
shell: find {{ remote_tmp_dir }}/exclude-{{item}} chdir={{ remote_tmp_dir }} shell: find {{ remote_tmp_dir }}/exclude-{{item}} chdir={{ remote_tmp_dir }}
register: unarchive00 register: unarchive00