Merge pull request #2 from alex/use-requests

Switched from using urllib2 to requests.

letsencrypt/client/client.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 
 import M2Crypto
-import urllib2, json
+import json
-# XXX TODO: per https://docs.google.com/document/pub?
-#id=1roBIeSJsYq3Ntpf6N0PIeeAAvu4ddn7mGo6Qb7aL7ew
-# urllib2 is unsafe (!) and must be replaced
 import os, grp, pwd, sys, time, random, sys, shutil
 
 # This line suppresses the no logging found for module 'jose' warning
@@ -22,6 +19,8 @@ from Crypto.PublicKey import RSA
 from Crypto.Signature import PKCS1_v1_5
 from Crypto.Hash import SHA256
 
+import requests
+
 from letsencrypt.client.acme import acme_object_validate
 from letsencrypt.client.sni_challenge import SNI_Challenge
 from letsencrypt.client.payment_challenge import Payment_Challenge
@@ -477,11 +476,16 @@ class Client(object):
 
     def send(self, json_obj):
         try:
-            acme_object_validate(json.dumps(json_obj))
+            json_encoded = json.dumps(json_obj)
-            response = urllib2.urlopen(
+            acme_object_validate(json_encoded)
-                self.server_url, json.dumps(json_obj)).read()
+            response = requests.post(
-            acme_object_validate(response)
+                self.server_url,
-            return json.loads(response)
+                data=json_encoded,
+                headers={"Content-Type": "application/json"},
+            )
+            body = response.content
+            acme_object_validate(body)
+            return response.json()
         except:
             logger.fatal("Send() failed... may have lost connection to server")
             sys.exit(8)

letsencrypt/client/recovery_contact_challenge.py

@@ -1,8 +1,9 @@
+import requests
+
 from letsencrypt.client.challenge import Challenge
 from letsencrypt.client import logger
 from letsencrypt.client.CONFIG import RECOVERY_TOKEN_EXT
-# TODO: Replace urllib2 because of lack of certificate validation checks
+import dialog
-import dialog, urllib2
 
 class RecoveryContact(Challenge):
     
@@ -48,7 +49,7 @@ class RecoveryContact(Challenge):
         
     def poll(self, rounds = 10, quiet = True):
         for i in range(rounds):
-            if urllib2.urlopen(self.successURL).getcode() != 200:
+            if requests.get(self.successURL).status_code != 200:
                 time.sleep(self.poll_delay)
             else:
                 return True

setup.py

@@ -71,6 +71,7 @@ setup(
     ],
     install_requires=[
         #'dialog',
+        'requests',
         'protobuf',
         'python-augeas',
         'pycrypto',