starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 08:08:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

update client to send hashcash per-name

Browse Source
This commit is contained in:
Seth Schoen
2012-10-10 17:19:00 -07:00
parent 4dfd31a315
commit 90944557bf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trustify/client/client.py
+5 -5
View File
@@ -174,11 +174,11 @@ def drop_privs():
os.setgroups([]) os.setgroups([])
os.setuid(nobody) os.setuid(nobody)
def make_request(server, m, csr, quiet=False): def make_request(server, m, csr, names, quiet=False):
m.request.recipient = server m.request.recipient = server
m.request.timestamp = int(time.time()) m.request.timestamp = int(time.time())
m.request.csr = csr m.request.csr = csr
hashcash_cmd = ["hashcash", "-P", "-m", "-z", "12", "-b", `difficulty`, "-r", server] hashcash_cmd = ["hashcash", "-P", "-m", "-z", "12", "-b", `difficulty*len(names)`, "-r", server]
if quiet: if quiet:
hashcash = subprocess.Popen(hashcash_cmd, preexec_fn=drop_privs, shell= False, stdout=subprocess.PIPE, stderr=open("/dev/null", "w")).communicate()[0].rstrip() hashcash = subprocess.Popen(hashcash_cmd, preexec_fn=drop_privs, shell= False, stdout=subprocess.PIPE, stderr=open("/dev/null", "w")).communicate()[0].rstrip()
else: else:
@@ -287,7 +287,7 @@ def challenge_factory(r, req_filepath, key_filepath, config):
return challenges, dn return challenges, dn
def send_request(key_pem, csr_pem, quiet=curses): def send_request(key_pem, csr_pem, names, quiet=curses):
global server global server
upstream = "https://%s/chocolate.py" % server upstream = "https://%s/chocolate.py" % server
k=chocolatemessage() k=chocolatemessage()
@@ -295,7 +295,7 @@ def send_request(key_pem, csr_pem, quiet=curses):
init(k) init(k)
init(m) init(m)
logger.info("Creating request; generating hashcash...") logger.info("Creating request; generating hashcash...")
make_request(server, m, csr_pem, quiet=curses) make_request(server, m, csr_pem, names, quiet=curses)
sign(key_pem, m) sign(key_pem, m)
logger.info("Created request; sending to server...") logger.info("Created request; sending to server...")
logger.debug(m) logger.debug(m)
@@ -437,7 +437,7 @@ def authenticate():
logger.info("Generating key: " + key_file) logger.info("Generating key: " + key_file)
logger.info("Creating CSR: " + req_file) logger.info("Creating CSR: " + req_file)
r, k = send_request(key_pem, csr_pem) r, k = send_request(key_pem, csr_pem, names)
challenges, dn = challenge_factory(r, os.path.abspath(req_file), os.path.abspath(key_file), config) challenges, dn = challenge_factory(r, os.path.abspath(req_file), os.path.abspath(key_file), config)