From 20489f13463af7c8da6f63bbd75425f25f67082c Mon Sep 17 00:00:00 2001
From: Joshua Lund <josh@joshlund.com>
Date: Fri, 27 Sep 2013 14:37:21 -0600
Subject: [PATCH] * Updated SHA-256 functionality in the get_url module  
 (fixes issue #4277)

* The sha256sum error message now displays the invalid
  destination checksum if it doesn't match the one that
  is specified in the arguments. This is useful for
  debugging purposes.

* Non-alphanumeric characters, including the infamous
  Unicode zero-width space, are removed from the sha256sum
  argument prior to the check.
---
 library/network/get_url | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/library/network/get_url b/library/network/get_url
index cab322747f..35d724febe 100644
--- a/library/network/get_url
+++ b/library/network/get_url
@@ -22,6 +22,7 @@
 
 import shutil
 import datetime
+import re
 import tempfile
 
 DOCUMENTATION = '''
@@ -295,12 +296,19 @@ def main():
     # Check the digest of the destination file and ensure that it matches the 
     # sha256sum parameter if it is present
     if sha256sum != '':
+        # Remove any non-alphanumeric characters, including the infamous
+        # Unicode zero-width space
+        stripped_sha256sum = re.sub(r'\W+', '', sha256sum)
+
         if not HAS_HASHLIB:
             os.remove(dest)
             module.fail_json(msg="The sha256sum parameter requires hashlib, which is available in Python 2.5 and higher")
-        if sha256sum != module.sha256(dest):
+        else:
+            destination_checksum = module.sha256(dest)
+
+        if stripped_sha256sum != destination_checksum:
             os.remove(dest)
-            module.fail_json(msg="The SHA-256 checksum for %s did not match %s" % (dest, sha256sum))
+            module.fail_json(msg="The SHA-256 checksum for %s did not match %s; it was %s." % (dest, sha256sum, destination_checksum))
 
     os.remove(tmpsrc)