[backport-2.7] Fix remote checksums when paths have leading dots (#45287) (#45501)

* Fix remote checksums when paths have leading dots (#45287)

* Fix remote checksums with paths have leading dots

* Fix result recorded from the wrong file

* Add changelog fragment

(cherry picked from commit 600c7ac108)
pull/45570/head
David Rodríguez 6 years ago committed by Toshio Kuratomi
parent 99171a9c6f
commit c41681b888

@ -0,0 +1,2 @@
bugfixes:
- get_url - support remote checksum files with paths specified with leading dots (`./path/to/file`)

@ -449,7 +449,7 @@ def main():
os.remove(checksum_tmpsrc) os.remove(checksum_tmpsrc)
lines = dict(s.split(None, 1) for s in lines) lines = dict(s.split(None, 1) for s in lines)
filename = url_filename(url) filename = url_filename(url)
[checksum] = (k for (k, v) in lines.items() if v == filename) [checksum] = (k for (k, v) in lines.items() if v.strip('./') == filename)
# Remove any non-alphanumeric characters, including the infamous # Remove any non-alphanumeric characters, including the infamous
# Unicode zero-width space # Unicode zero-width space
checksum = re.sub(r'\W+', '', checksum).lower() checksum = re.sub(r'\W+', '', checksum).lower()

@ -311,6 +311,19 @@
- '30949cc401e30ac494d695ab8764a9f76aae17c5d73c67f65e9b558f47eff892 not_target1.txt' - '30949cc401e30ac494d695ab8764a9f76aae17c5d73c67f65e9b558f47eff892 not_target1.txt'
- 'd0dbfc1945bc83bf6606b770e442035f2c4e15c886ee0c22fb3901ba19900b5b not_target2.txt' - 'd0dbfc1945bc83bf6606b770e442035f2c4e15c886ee0c22fb3901ba19900b5b not_target2.txt'
- name: create sha256 checksum file of src with a dot leading path
copy:
dest: '{{ files_dir }}/sha256sum_with_dot.txt'
content: "b1b6ce5073c8fac263a8fc5edfffdbd5dec1980c784e09c5bc69f8fb6056f006. ./27617.txt"
- name: add sha256 checksums with dot leading path not going to be downloaded
lineinfile:
dest: "{{ files_dir }}/sha256sum_with_dot.txt"
line: "{{ item }}"
loop:
- '30949cc401e30ac494d695ab8764a9f76aae17c5d73c67f65e9b558f47eff892 ./not_target1.txt'
- 'd0dbfc1945bc83bf6606b770e442035f2c4e15c886ee0c22fb3901ba19900b5b ./not_target2.txt'
- copy: - copy:
src: "testserver.py" src: "testserver.py"
dest: "{{ output_dir }}/testserver.py" dest: "{{ output_dir }}/testserver.py"
@ -342,13 +355,26 @@
path: "{{ output_dir }}/27617.txt" path: "{{ output_dir }}/27617.txt"
register: stat_result_sha256 register: stat_result_sha256
- name: download src with sha256 checksum url with dot leading paths
get_url:
url: 'http://localhost:{{ http_port }}/27617.txt'
dest: '{{ output_dir }}/27617sha256_with_dot.txt'
checksum: 'sha256:http://localhost:{{ http_port }}/sha256sum_with_dot.txt'
register: result_sha256_with_dot
- stat:
path: "{{ output_dir }}/27617sha256_with_dot.txt"
register: stat_result_sha256_with_dot
- name: Assert that the file was downloaded - name: Assert that the file was downloaded
assert: assert:
that: that:
- result_sha1 is changed - result_sha1 is changed
- result_sha256 is changed - result_sha256 is changed
- result_sha256_with_dot is changed
- "stat_result_sha1.stat.exists == true" - "stat_result_sha1.stat.exists == true"
- "stat_result_sha256.stat.exists == true" - "stat_result_sha256.stat.exists == true"
- "stat_result_sha256_with_dot.stat.exists == true"
#https://github.com/ansible/ansible/issues/16191 #https://github.com/ansible/ansible/issues/16191
- name: Test url split with no filename - name: Test url split with no filename

Loading…
Cancel
Save