| hg-reviewers |
Detected by fixing up test-url.py on Python 3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| CRLs is not handled. | CRLs is not handled. | ||||
| Returns error message if any problems are found and None on success. | Returns error message if any problems are found and None on success. | ||||
| ''' | ''' | ||||
| if not cert: | if not cert: | ||||
| return _('no certificate received') | return _('no certificate received') | ||||
| dnsnames = [] | dnsnames = [] | ||||
| san = cert.get('subjectAltName', []) | san = cert.get(r'subjectAltName', []) | ||||
| for key, value in san: | for key, value in san: | ||||
| if key == 'DNS': | if key == r'DNS': | ||||
| try: | try: | ||||
| if _dnsnamematch(value, hostname): | if _dnsnamematch(value, hostname): | ||||
| return | return | ||||
| except wildcarderror as e: | except wildcarderror as e: | ||||
| return stringutil.forcebytestr(e.args[0]) | return stringutil.forcebytestr(e.args[0]) | ||||
| dnsnames.append(value) | dnsnames.append(value) | ||||
| try: | try: | ||||
| if _dnsnamematch(value, hostname): | if _dnsnamematch(value, hostname): | ||||
| return | return | ||||
| except wildcarderror as e: | except wildcarderror as e: | ||||
| return stringutil.forcebytestr(e.args[0]) | return stringutil.forcebytestr(e.args[0]) | ||||
| dnsnames.append(value) | dnsnames.append(value) | ||||
| dnsnames = [pycompat.bytesurl(d) for d in dnsnames] | |||||
| if len(dnsnames) > 1: | if len(dnsnames) > 1: | ||||
| return _('certificate is for %s') % ', '.join(dnsnames) | return _('certificate is for %s') % ', '.join(dnsnames) | ||||
| elif len(dnsnames) == 1: | elif len(dnsnames) == 1: | ||||
| return _('certificate is for %s') % dnsnames[0] | return _('certificate is for %s') % dnsnames[0] | ||||
| else: | else: | ||||
| return _('no commonName or subjectAltName found in certificate') | return _('no commonName or subjectAltName found in certificate') | ||||
| def _plainapplepython(): | def _plainapplepython(): | ||||