Merge branch 'fix-pipstrap-on-windows' into no-keyauthorization-windows

This is not intended for merge, it's just going to be used
in a branch for pebble integration tests.

acme/acme/challenges.py

@@ -105,7 +105,6 @@ class KeyAuthorizationChallengeResponse(ChallengeResponse):
     :param unicode key_authorization:
 
     """
-    key_authorization = jose.Field("keyAuthorization")
     thumbprint_hash_function = hashes.SHA256
 
     def verify(self, chall, account_public_key):
@@ -115,29 +114,10 @@ class KeyAuthorizationChallengeResponse(ChallengeResponse):
             this response.
         :param JWK account_public_key:
 
-        :return: ``True`` iff verification of the key authorization was
-            successful.
+        :return: ``True``
         :rtype: bool
 
         """
-        parts = self.key_authorization.split('.')  # pylint: disable=no-member
-        if len(parts) != 2:
-            logger.debug("Key authorization (%r) is not well formed",
-                         self.key_authorization)
-            return False
-
-        if parts[0] != chall.encode("token"):
-            logger.debug("Mismatching token in key authorization: "
-                         "%r instead of %r", parts[0], chall.encode("token"))
-            return False
-
-        thumbprint = jose.b64encode(account_public_key.thumbprint(
-            hash_function=self.thumbprint_hash_function)).decode()
-        if parts[1] != thumbprint:
-            logger.debug("Mismatching thumbprint in key authorization: "
-                         "%r instead of %r", parts[0], thumbprint)
-            return False
-
         return True
 
 
@@ -175,8 +155,7 @@ class KeyAuthorizationChallenge(_TokenChallenge):
         :rtype: KeyAuthorizationChallengeResponse
 
         """
-        return self.response_cls(
-            key_authorization=self.key_authorization(account_key))
+        return self.response_cls()
 
     @abc.abstractmethod
     def validation(self, account_key, **kwargs):

letsencrypt-auto-source/letsencrypt-auto

@@ -1219,7 +1219,7 @@ anything goes wrong, it will exit with a non-zero status code.
 from __future__ import print_function
 from distutils.version import StrictVersion
 from hashlib import sha256
-from os import environ
+from os import environ, name
 from os.path import join
 from pipes import quote
 from shutil import rmtree
@@ -1354,12 +1354,13 @@ def main():
                                      temp,
                                      digest)
                      for path, digest in PACKAGES]
-        check_output('pip install --no-index --no-deps -U ' +
-                     # Disable cache since we're not using it and it otherwise
-                     # sometimes throws permission warnings:
-                     ('--no-cache-dir ' if has_pip_cache else '') +
-                     ' '.join(quote(d) for d in downloads),
-                     shell=True)
+        # On Windows, pip self-upgrade is not possible, it must be done through python interpreter.
+        command = ['pip'] if name != 'nt' else ['python', '-m', 'pip']
+        command.extend(['install', '--no-index', '--no-deps', '-U'])
+        # Disable cache since it is not used and it otherwise sometimes throws permission warnings:
+        command.extend(['--no-cache-dir'] if has_pip_cache else [])
+        command.extend(downloads)
+        check_output(command)
     except HashError as exc:
         print(exc)
     except Exception:

letsencrypt-auto-source/pieces/pipstrap.py

@@ -21,7 +21,7 @@ anything goes wrong, it will exit with a non-zero status code.
 from __future__ import print_function
 from distutils.version import StrictVersion
 from hashlib import sha256
-from os import environ
+from os import environ, name
 from os.path import join
 from pipes import quote
 from shutil import rmtree
@@ -156,12 +156,13 @@ def main():
                                      temp,
                                      digest)
                      for path, digest in PACKAGES]
-        check_output('pip install --no-index --no-deps -U ' +
-                     # Disable cache since we're not using it and it otherwise
-                     # sometimes throws permission warnings:
-                     ('--no-cache-dir ' if has_pip_cache else '') +
-                     ' '.join(quote(d) for d in downloads),
-                     shell=True)
+        # On Windows, pip self-upgrade is not possible, it must be done through python interpreter.
+        command = ['pip'] if name != 'nt' else ['python', '-m', 'pip']
+        command.extend(['install', '--no-index', '--no-deps', '-U'])
+        # Disable cache since it is not used and it otherwise sometimes throws permission warnings:
+        command.extend(['--no-cache-dir'] if has_pip_cache else [])
+        command.extend(downloads)
+        check_output(command)
     except HashError as exc:
         print(exc)
     except Exception:

tools/_venv_common.py

@@ -156,8 +156,6 @@ def main(venv_name, venv_args, args):
     new_environ['PATH'] = os.pathsep.join([get_venv_bin_path(venv_name), new_environ['PATH']])
     subprocess_with_print('python {0}'.format('./letsencrypt-auto-source/pieces/pipstrap.py'),
                           env=new_environ, shell=True)
-    subprocess_with_print('python -m pip install --upgrade "setuptools>=30.3"',
-                          env=new_environ, shell=True)
     subprocess_with_print('python {0} {1}'.format('./tools/pip_install.py', ' '.join(args)),
                           env=new_environ, shell=True)