starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-31 18:34:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Incorporated jdkasten's feedback

Browse Source
This commit is contained in:
Brad Warren
2015-06-24 18:24:54 -07:00
parent 76d12e5e34
commit d15a386f92
3 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/auth_handler.py
+28 -28
View File
@@ -487,32 +487,32 @@ def is_preferred(offered_challb, satisfied,
_ERROR_HELP_COMMON = (
'To fix these errors, please make sure that your domain name was entered '
'correctly and the DNS A/AAAA record(s) for that domain contains the '
'right IP address.')
"To fix these errors, please make sure that your domain name was entered "
"correctly and the DNS A/AAAA record(s) for that domain contains the "
"right IP address.")
_ERROR_HELP = {
'connection' :
_ERROR_HELP_COMMON + ' Additionally, please check that your computer '
'has publicly routable IP address and no firewalls are preventing the '
'server from communicating with the client.',
'dnssec' :
_ERROR_HELP_COMMON + ' Additionally, if you have DNSSEC enabled for '
'your domain, please ensure the signature is valid.',
'malformed' :
'To fix these errors, please make sure that you did not provide any '
'invalid information to the client and try running Let\'s Encrypt '
'again.',
'serverInternal' :
'Unfortunately, an error on the ACME server prevented you from completing '
'authorization. Please try again later.',
'tls' :
_ERROR_HELP_COMMON + ' Additionally, please check that you have an up '
'to date TLS configuration that allows the server to communicate with '
'the Let\'s Encrypt client.',
'unauthorized' : _ERROR_HELP_COMMON,
'unknownHost' : _ERROR_HELP_COMMON,}
"connection" :
_ERROR_HELP_COMMON + " Additionally, please check that your computer "
"has publicly routable IP address and no firewalls are preventing the "
"server from communicating with the client.",
"dnssec" :
_ERROR_HELP_COMMON + " Additionally, if you have DNSSEC enabled for "
"your domain, please ensure the signature is valid.",
"malformed" :
"To fix these errors, please make sure that you did not provide any "
"invalid information to the client and try running Let's Encrypt "
"again.",
"serverInternal" :
"Unfortunately, an error on the ACME server prevented you from completing "
"authorization. Please try again later.",
"tls" :
_ERROR_HELP_COMMON + " Additionally, please check that you have an up "
"to date TLS configuration that allows the server to communicate with "
"the Let's Encrypt client.",
"unauthorized" : _ERROR_HELP_COMMON,
"unknownHost" : _ERROR_HELP_COMMON,}
def _report_failed_challs(failed_achalls):
@@ -552,12 +552,12 @@ def _generate_failed_chall_msg(failed_achalls):
for achall in failed_achalls:
problems.setdefault(achall.error.description, set()).add(achall.domain)
for problem in problems:
msg.append('\n\nDomains: ')
msg.append(', '.join(sorted(problems[problem])))
msg.append('\nError: {0}'.format(problem))
msg.append("\n\nDomains: ")
msg.append(", ".join(sorted(problems[problem])))
msg.append("\nError: {0}".format(problem))
if typ in _ERROR_HELP:
msg.append('\n\n')
msg.append("\n\n")
msg.append(_ERROR_HELP[typ])
return ''.join(msg)
return "".join(msg)