Show More
@@ -68,6 +68,7 b' from . import (' | |||||
68 | setdiscovery, |
|
68 | setdiscovery, | |
69 | simplemerge, |
|
69 | simplemerge, | |
70 | sshserver, |
|
70 | sshserver, | |
|
71 | sslutil, | |||
71 | streamclone, |
|
72 | streamclone, | |
72 | templatekw, |
|
73 | templatekw, | |
73 | templater, |
|
74 | templater, | |
@@ -2703,6 +2704,25 b' def debuginstall(ui, **opts):' | |||||
2703 | fm.write('pythonlib', _("checking Python lib (%s)...\n"), |
|
2704 | fm.write('pythonlib', _("checking Python lib (%s)...\n"), | |
2704 | os.path.dirname(os.__file__)) |
|
2705 | os.path.dirname(os.__file__)) | |
2705 |
|
2706 | |||
|
2707 | security = set(sslutil.supportedprotocols) | |||
|
2708 | if sslutil.hassni: | |||
|
2709 | security.add('sni') | |||
|
2710 | ||||
|
2711 | fm.write('pythonsecurity', _("checking Python security support (%s)\n"), | |||
|
2712 | fm.formatlist(sorted(security), name='protocol', | |||
|
2713 | fmt='%s', sep=',')) | |||
|
2714 | ||||
|
2715 | # These are warnings, not errors. So don't increment problem count. This | |||
|
2716 | # may change in the future. | |||
|
2717 | if 'tls1.2' not in security: | |||
|
2718 | fm.plain(_(' TLS 1.2 not supported by Python install; ' | |||
|
2719 | 'network connections lack modern security\n')) | |||
|
2720 | if 'sni' not in security: | |||
|
2721 | fm.plain(_(' SNI not supported by Python install; may have ' | |||
|
2722 | 'connectivity issues with some servers\n')) | |||
|
2723 | ||||
|
2724 | # TODO print CA cert info | |||
|
2725 | ||||
2706 | # hg version |
|
2726 | # hg version | |
2707 | hgver = util.version() |
|
2727 | hgver = util.version() | |
2708 | fm.write('hgver', _("checking Mercurial version (%s)\n"), |
|
2728 | fm.write('hgver', _("checking Mercurial version (%s)\n"), |
@@ -4,6 +4,9 b' hg debuginstall' | |||||
4 | checking Python executable (*) (glob) |
|
4 | checking Python executable (*) (glob) | |
5 | checking Python version (2.*) (glob) |
|
5 | checking Python version (2.*) (glob) | |
6 | checking Python lib (*lib*)... (glob) |
|
6 | checking Python lib (*lib*)... (glob) | |
|
7 | checking Python security support (*) (glob) | |||
|
8 | TLS 1.2 not supported by Python install; network connections lack modern security (?) | |||
|
9 | SNI not supported by Python install; may have connectivity issues with some servers (?) | |||
7 | checking Mercurial version (*) (glob) |
|
10 | checking Mercurial version (*) (glob) | |
8 | checking Mercurial custom build (*) (glob) |
|
11 | checking Mercurial custom build (*) (glob) | |
9 | checking module policy (*) (glob) |
|
12 | checking module policy (*) (glob) | |
@@ -33,6 +36,7 b' hg debuginstall JSON' | |||||
33 | "problems": 0, |
|
36 | "problems": 0, | |
34 | "pythonexe": "*", (glob) |
|
37 | "pythonexe": "*", (glob) | |
35 | "pythonlib": "*", (glob) |
|
38 | "pythonlib": "*", (glob) | |
|
39 | "pythonsecurity": [*], (glob) | |||
36 | "pythonver": "*.*.*", (glob) |
|
40 | "pythonver": "*.*.*", (glob) | |
37 | "templatedirs": "*mercurial?templates", (glob) |
|
41 | "templatedirs": "*mercurial?templates", (glob) | |
38 | "username": "test", |
|
42 | "username": "test", | |
@@ -47,6 +51,9 b' hg debuginstall with no username' | |||||
47 | checking Python executable (*) (glob) |
|
51 | checking Python executable (*) (glob) | |
48 | checking Python version (2.*) (glob) |
|
52 | checking Python version (2.*) (glob) | |
49 | checking Python lib (*lib*)... (glob) |
|
53 | checking Python lib (*lib*)... (glob) | |
|
54 | checking Python security support (*) (glob) | |||
|
55 | TLS 1.2 not supported by Python install; network connections lack modern security (?) | |||
|
56 | SNI not supported by Python install; may have connectivity issues with some servers (?) | |||
50 | checking Mercurial version (*) (glob) |
|
57 | checking Mercurial version (*) (glob) | |
51 | checking Mercurial custom build (*) (glob) |
|
58 | checking Mercurial custom build (*) (glob) | |
52 | checking module policy (*) (glob) |
|
59 | checking module policy (*) (glob) | |
@@ -71,6 +78,9 b' path variables are expanded (~ is the sa' | |||||
71 | checking Python executable (*) (glob) |
|
78 | checking Python executable (*) (glob) | |
72 | checking Python version (*) (glob) |
|
79 | checking Python version (*) (glob) | |
73 | checking Python lib (*lib*)... (glob) |
|
80 | checking Python lib (*lib*)... (glob) | |
|
81 | checking Python security support (*) (glob) | |||
|
82 | TLS 1.2 not supported by Python install; network connections lack modern security (?) | |||
|
83 | SNI not supported by Python install; may have connectivity issues with some servers (?) | |||
74 | checking Mercurial version (*) (glob) |
|
84 | checking Mercurial version (*) (glob) | |
75 | checking Mercurial custom build (*) (glob) |
|
85 | checking Mercurial custom build (*) (glob) | |
76 | checking module policy (*) (glob) |
|
86 | checking module policy (*) (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now