From 90dae9fd880b7ff07ee3f1b76d862b8419eaf22a Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Thu, 18 Jun 2015 11:07:20 +0000
Subject: [PATCH] Update restified example script and rename to acme_client.py

---
 examples/acme_client.py | 45 +++++++++++++++++++++++++++++++++++++++++
 examples/restified.py   | 42 --------------------------------------
 2 files changed, 45 insertions(+), 42 deletions(-)
 create mode 100644 examples/acme_client.py
 delete mode 100644 examples/restified.py

diff --git a/examples/acme_client.py b/examples/acme_client.py
new file mode 100644
index 000000000..09ff2bfc3
--- /dev/null
+++ b/examples/acme_client.py
@@ -0,0 +1,45 @@
+"""Example script showing how to use acme client API."""
+import logging
+import os
+import pkg_resources
+
+import Crypto.PublicKey.RSA
+import M2Crypto
+
+from acme import client
+from acme import messages
+from acme import jose
+
+
+logging.basicConfig(level=logging.DEBUG)
+
+
+NEW_REG_URL = 'https://www.letsencrypt-demo.org/acme/new-reg'
+BITS = 2048  # minimum for Boulder
+DOMAIN = 'example1.com'  # example.com is ignored by Boulder
+
+key = jose.JWKRSA.load(
+    Crypto.PublicKey.RSA.generate(BITS).exportKey(format="PEM"))
+acme = client.Client(NEW_REG_URL, key)
+
+regr = acme.register(contact=())
+logging.info('Auto-accepting TOS: %s', regr.terms_of_service)
+acme.update_registration(regr.update(
+    body=regr.body.update(agreement=regr.terms_of_service)))
+logging.debug(regr)
+
+authzr = acme.request_challenges(
+    identifier=messages.Identifier(typ=messages.IDENTIFIER_FQDN, value=DOMAIN),
+    new_authzr_uri=regr.new_authzr_uri)
+logging.debug(authzr)
+
+authzr, authzr_response = acme.poll(authzr)
+
+csr = M2Crypto.X509.load_request_string(pkg_resources.resource_string(
+    'acme.jose', os.path.join('testdata', 'csr.der')),
+    M2Crypto.X509.FORMAT_DER)
+try:
+    acme.request_issuance(csr, (authzr,))
+except messages.Error as error:
+    print ("This script is doomed to fail as no authorization "
+           "challenges are ever solved. Error from server: {0}".format(error))
diff --git a/examples/restified.py b/examples/restified.py
deleted file mode 100644
index cfd7fa8dd..000000000
--- a/examples/restified.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import logging
-import os
-import pkg_resources
-
-import M2Crypto
-
-from acme import messages
-from acme import jose
-
-from letsencrypt import network
-
-
-logger = logging.getLogger()
-logger.setLevel(logging.DEBUG)
-
-NEW_REG_URL = 'https://www.letsencrypt-demo.org/acme/new-reg'
-
-key = jose.JWKRSA.load(pkg_resources.resource_string(
-    'acme.jose', os.path.join('testdata', 'rsa512_key.pem')))
-net = network.Network(NEW_REG_URL, key)
-
-regr = net.register(contact=(
-    'mailto:cert-admin@example.com', 'tel:+12025551212'))
-logging.info('Auto-accepting TOS: %s', regr.terms_of_service)
-net.update_registration(regr.update(
-    body=regr.body.update(agreement=regr.terms_of_service)))
-logging.debug(regr)
-
-authzr = net.request_challenges(
-    identifier=messages.Identifier(
-        typ=messages.IDENTIFIER_FQDN, value='example1.com'),
-    new_authzr_uri=regr.new_authzr_uri)
-logging.debug(authzr)
-
-authzr, authzr_response = net.poll(authzr)
-
-csr = M2Crypto.X509.load_request_string(pkg_resources.resource_string(
-    'letsencrypt.tests', os.path.join('testdata', 'csr.pem')))
-try:
-    net.request_issuance(csr, (authzr,))
-except messages.Error as error:
-    print error.detail