display individual challenges in curses mode

This commit is contained in:
Seth Schoen
2012-08-10 18:21:20 -07:00
parent ebe5e36152
commit 7099ac8c8f
+5 -3
View File
@@ -205,7 +205,7 @@ def authenticate():
while r.proceed.IsInitialized(): while r.proceed.IsInitialized():
if r.proceed.polldelay > 60: r.proceed.polldelay = 60 if r.proceed.polldelay > 60: r.proceed.polldelay = 60
if curses: if curses:
shower.add("Waiting %d...\n" % r.proceed.polldelay) shower.add("Waiting %d seconds...\n" % r.proceed.polldelay)
else: else:
print "waiting", r.proceed.polldelay print "waiting", r.proceed.polldelay
time.sleep(r.proceed.polldelay) time.sleep(r.proceed.polldelay)
@@ -220,11 +220,13 @@ def authenticate():
sni_todo = [] sni_todo = []
dn = [] dn = []
if curses: if curses:
shower.add("Received %s challenges.\n" % len(r.challenge)) shower.add("Received %s challenges from server.\n" % len(r.challenge))
for chall in r.challenge: for chall in r.challenge:
if not curses: print chall if not curses: print chall
if chall.type == r.DomainValidateSNI: if chall.type == r.DomainValidateSNI:
dvsni_nonce, dvsni_y, dvsni_ext = chall.data if curses:
shower.add("\tDomainValidateSNI challenge for name %s.\n" % chall.name)
dvsni_nonce, dvsni_y, dvsni_ext = chall.data
sni_todo.append( (chall.name, dvsni_y, dvsni_nonce, dvsni_ext) ) sni_todo.append( (chall.name, dvsni_y, dvsni_nonce, dvsni_ext) )
dn.append(chall.name) dn.append(chall.name)