Address review comments

1 files changed, 39 insertions, 36 deletions

diff --git a/sign_csr.py b/sign_csr.py
index a6987ff..f6fe24c 100644
--- a/sign_csr.py
+++ b/sign_csr.py
@@ -3,41 +3,6 @@ import argparse, subprocess, json, os, urllib2, sys, base64, binascii, time, \
     hashlib, tempfile, re, copy, textwrap
 
 
-def host_token(domain, token, response_payload, user_step_number, file_based):
-    if file_based:
-        response_url = 'http://{}/.well-known/acme-challenge/{}'.format(domain, token)
-
-        # tell the user where to put a file
-        sys.stderr.write("""\
-STEP {}: You need to place a file on your webserver so that the URL {} will
-resolve to a file with the contents:
-
---------------
-{}
---------------
-
-""".format(user_step_number, response_url, response_payload))
-    else:
-        sys.stderr.write("""\
-STEP {}: You need to run this command on {} (don't stop the python command until the next step).
-
-openssl req -new -x509 -keyout server.pem -out server.pem -days 365 -nodes
-sudo python -c "import BaseHTTPServer; \\
-    import ssl; \\
-    h = BaseHTTPServer.BaseHTTPRequestHandler; \\
-    h.do_GET = lambda r: r.send_response(200) or r.end_headers() or r.wfile.write('{}'); \\
-    s = BaseHTTPServer.HTTPServer(('0.0.0.0', 443), h); \\
-    s.socket = ssl.wrap_socket(s.socket, certfile='server.pem', server_side=True); \\
-    s.serve_forever()"
-
-""".format(user_step_number, domain, response_payload.replace('"', '\\"')))
-
-    stdout = sys.stdout
-    sys.stdout = sys.stderr
-    raw_input("Press Enter when you've got the python command running on your server...")
-    sys.stdout = stdout
-
-
 def sign_csr(pubkey, csr, email=None, file_based=False):
     """Use the ACME protocol to get an ssl certificate signed by a
     certificate authority.
@@ -46,6 +11,10 @@ def sign_csr(pubkey, csr, email=None, file_based=False):
     :param string csr: Path to the certificate signing request.
     :param string email: An optional user account contact email
                          (defaults to webmaster@<shortest_domain>)
+    :param bool file_based: An optional flag indicating that the
+                            hosting should be file-based rather
+                            than providing a simple python HTTP
+                            server.
 
     :returns: Signed Certificate (PEM format)
     :rtype: string
@@ -323,7 +292,41 @@ STEP 3: You need to sign some more files (replace 'user.key' with your user priv
 
     # Step 11: Ask the user to host the token on their server
     for n, i in enumerate(ids):
-        host_token(i['domain'], challenge['token'], responses[n]['data'], n + 4, file_based)
+        if file_based:
+            sys.stderr.write("""\
+STEP {}: Please update your server to serve the following file at this URL:
+
+--------------
+URL: http://{}/.well-known/acme-challenge/{}
+File contents: \"{}\"
+--------------
+
+Notes:
+- Do not include the quotes in the file.
+- The file should be one line without any spaces.
+
+""".format(n + 4, i['domain'], challenge['token'], responses[n]['data']))
+
+            stdout = sys.stdout
+            sys.stdout = sys.stderr
+            raw_input("Press Enter when you've got the file hosted on your server...")
+            sys.stdout = stdout
+        else:
+            sys.stderr.write("""\
+STEP {}: You need to run this command on {} (don't stop the python command until the next step).
+
+sudo python -c "import BaseHTTPServer; \\
+    h = BaseHTTPServer.BaseHTTPRequestHandler; \\
+    h.do_GET = lambda r: r.send_response(200) or r.end_headers() or r.wfile.write('{}'); \\
+    s = BaseHTTPServer.HTTPServer(('0.0.0.0', 80), h); \\
+    s.serve_forever()"
+
+""".format(n + 4, i['domain'], responses[n]['data']))
+
+            stdout = sys.stdout
+            sys.stdout = sys.stderr
+            raw_input("Press Enter when you've got the python command running on your server...")
+            sys.stdout = stdout
 
         # Step 12: Let the CA know you're ready for the challenge
         sys.stderr.write("Requesting verification for {}...\n".format(i['domain']))