configwizard: add new sha256 fingerprint (Bug 1670031) r=dhouse,zeid
authorConnor Sheehan <sheehan@mozilla.com>
Thu, 08 Oct 2020 18:12:20 +0000
changeset 7618 4a21d2b1439250c80b9cdf02ce07055644b04824
parent 7617 b039eb38411e46120adccb8f9fc9232e4e4276b8
child 7619 237f1bfdb0518bf58c69fedd485e94a0b0d901ad
push id3798
push usercosheehan@mozilla.com
push dateThu, 08 Oct 2020 19:17:45 +0000
treeherderversion-control-tools@237f1bfdb051 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdhouse, zeid
bugs1670031
configwizard: add new sha256 fingerprint (Bug 1670031) r=dhouse,zeid Add the new certificate to `configwizard`, so users can run `mach vcs-setup` and have the new cert pinned in their hgrc. Differential Revision: https://phabricator.services.mozilla.com/D92968
hgext/configwizard/__init__.py
hgext/configwizard/tests/test-security.t
--- a/hgext/configwizard/__init__.py
+++ b/hgext/configwizard/__init__.py
@@ -37,17 +37,20 @@ HOST_FINGERPRINTS = {
     'bitbucket.org': '3f:d3:c5:17:23:3c:cd:f5:2d:17:76:06:93:7e:ee:97:42:21:14:aa',
     'bugzilla.mozilla.org': '7c:7a:c4:6c:91:3b:6b:89:cf:f2:8c:13:b8:02:c4:25:bd:1e:25:17',
     'hg.mozilla.org': '1c:a5:7d:a1:28:db:78:f6:52:4d:c0:e6:38:9b:08:43:ec:1f:ef:64',
 }
 
 MODERN_FINGERPRINTS = {
     'bitbucket.org': 'sha256:4e:65:3e:76:0f:81:59:85:5b:50:06:0c:c2:4d:3c:56:53:8b:83:3e:9b:fa:55:26:98:9a:ca:e2:25:03:92:47',
     'bugzilla.mozilla.org': 'sha256:95:BA:0F:F2:C4:28:75:9D:B5:DB:4A:50:5F:29:46:A3:A9:4E:1B:56:A5:AE:10:50:C3:DD:3A:AC:73:BF:4A:D9',
-    'hg.mozilla.org': 'sha256:17:38:aa:92:0b:84:3e:aa:8e:52:52:e9:4c:2f:98:a9:0e:bf:6c:3e:e9:15:ff:0a:29:80:f7:06:02:5b:e8:48',
+    'hg.mozilla.org': ', '.join([
+        'sha256:FF:E7:8D:93:E9:56:3C:C0:19:FC:00:4C:18:B9:86:E5:08:E5:10:F5:E2:EA:48:E8:22:D3:A3:3A:CA:99:C3:4C',
+        'sha256:17:38:aa:92:0b:84:3e:aa:8e:52:52:e9:4c:2f:98:a9:0e:bf:6c:3e:e9:15:ff:0a:29:80:f7:06:02:5b:e8:48',
+    ]),
 }
 
 INITIAL_MESSAGE = b'''
 This wizard will guide you through configuring Mercurial for an optimal
 experience contributing to Mozilla projects.
 
 The wizard makes no changes without your permission.
 
--- a/hgext/configwizard/tests/test-security.t
+++ b/hgext/configwizard/tests/test-security.t
@@ -112,17 +112,17 @@ Modern Mercurial doesn't need to pin fin
   Your config file needs updating.
   Would you like to see a diff of the changes first (Yn)?  y
   --- hgrc.old
   +++ hgrc.new
   @@ -1,2 +1,2 @@
   -[hostfingerprints]
   -hg.mozilla.org = aa:bb:cc:dd
   +[hostsecurity]
-  +hg.mozilla.org:fingerprints = sha256:17:38:aa:92:0b:84:3e:aa:8e:52:52:e9:4c:2f:98:a9:0e:bf:6c:3e:e9:15:ff:0a:29:80:f7:06:02:5b:e8:48
+  +hg.mozilla.org:fingerprints = sha256:FF:E7:8D:93:E9:56:3C:C0:19:FC:00:4C:18:B9:86:E5:08:E5:10:F5:E2:EA:48:E8:22:D3:A3:3A:CA:99:C3:4C, sha256:17:38:aa:92:0b:84:3e:aa:8e:52:52:e9:4c:2f:98:a9:0e:bf:6c:3e:e9:15:ff:0a:29:80:f7:06:02:5b:e8:48
   
   Write changes to hgrc file (Yn)?  y
 
 
 #endif
 
 #if hg39
 Old fingerprint in [hostsecurity] is updated
@@ -142,13 +142,13 @@ Old fingerprint in [hostsecurity] is upd
    <RETURN>
   Your config file needs updating.
   Would you like to see a diff of the changes first (Yn)?  y
   --- hgrc.old
   +++ hgrc.new
   @@ -1,2 +1,2 @@
    [hostsecurity]
   -hg.mozilla.org:fingerprints = sha256:aa:bb:cc:dd
-  +hg.mozilla.org:fingerprints = sha256:17:38:aa:92:0b:84:3e:aa:8e:52:52:e9:4c:2f:98:a9:0e:bf:6c:3e:e9:15:ff:0a:29:80:f7:06:02:5b:e8:48
+  +hg.mozilla.org:fingerprints = sha256:FF:E7:8D:93:E9:56:3C:C0:19:FC:00:4C:18:B9:86:E5:08:E5:10:F5:E2:EA:48:E8:22:D3:A3:3A:CA:99:C3:4C, sha256:17:38:aa:92:0b:84:3e:aa:8e:52:52:e9:4c:2f:98:a9:0e:bf:6c:3e:e9:15:ff:0a:29:80:f7:06:02:5b:e8:48
   
   Write changes to hgrc file (Yn)?  y
 
 #endif