security: embed certs for a few hard-coded tenants

We already have tests that want to use more than one tenant.
These will need to have certs for each of the tenants that
they use soon, so pave the way for that by adding a few
hard-coded tenant IDs that have certs embedded.

Release note: None

pkg/ccl/backupccl/backup_test.go

@@ -4254,6 +4254,9 @@ func TestBackupRestoreTenant(t *testing.T) {
 	defer cleanupFn()
 	srv := tc.Server(0)
 
+	// NB: tenant certs for 10, 11, 20 are embedded. See:
+	_ = security.EmbeddedTenantIDs()
+
 	// Setup a few tenants, each with a different table.
 	conn10 := serverutils.StartTenant(t, srv, base.TestTenantArgs{TenantID: roachpb.MakeTenantID(10), TenantInfo: []byte("ten")})
 	defer conn10.Close()

pkg/ccl/serverccl/server_sql_test.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
+	"github.com/cockroachdb/cockroach/pkg/security"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
@@ -42,7 +43,11 @@ func TestSQLServer(t *testing.T) {
 	tc := serverutils.StartTestCluster(t, 3, base.TestClusterArgs{})
 	defer tc.Stopper().Stop(ctx)
 
-	db := serverutils.StartTenant(t, tc.Server(0), base.TestTenantArgs{TenantID: roachpb.MakeTenantID(10)})
+	db := serverutils.StartTenant(
+		t,
+		tc.Server(0),
+		base.TestTenantArgs{TenantID: roachpb.MakeTenantID(security.EmbeddedTenantIDs()[0])},
+	)
 	defer db.Close()
 	r := sqlutils.MakeSQLRunner(db)
 	r.QueryStr(t, `SELECT 1`)

pkg/security/certs_tenant_test.go

@@ -92,7 +92,7 @@ func testTenantCertificatesInner(t *testing.T, embedded bool) {
 		defer cleanup()
 	} else {
 		certsDir = security.EmbeddedCertsDir
-		tenant = fmt.Sprint(security.EmbeddedTenantID)
+		tenant = fmt.Sprint(security.EmbeddedTenantIDs()[0])
 	}
 
 	// Now set up the config a server would use. The client will trust it based on

pkg/security/securitytest/test_certs/ca-client-tenant.crt

@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDBjCCAe6gAwIBAgIQIx90jzYYGuem+REGEEh6njANBgkqhkiG9w0BAQsFADAr
-MRIwEAYDVQQKEwlDb2Nrcm9hY2gxFTATBgNVBAMTDENvY2tyb2FjaCBDQTAeFw0y
-MDA3MTUwODA5MDNaFw0zMDA3MjQwODA5MDNaMCsxEjAQBgNVBAoTCUNvY2tyb2Fj
-aDEVMBMGA1UEAxMMQ29ja3JvYWNoIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsQmetpp+pg0L4i2Xf6WtY/QtERR5QqOe1/r1cO9y9nUG63b+E0Y8
-AHtMEhBp53csLzOnSzLRqaUlJk/f0mShRYuyxSy4rMxjXur+EepDNYyZ3i4HX5Rr
-xVcscoeHwI8VfJJ/Gb9xoTVZWnSU0mxX/ycIgQJFY0ia80lZBHohD+dQeDlRc9RX
-m4PAQ0qRPDl847rv6wA8A0xwygCZQA/j23cfLuAteViMffKSW6HrSjjNT+kGs8P3
-MmKIDXYp+kpKLaLJUsyhGFEsPot96k5vzIA+oBdMpk44RblMwjrcz6RjcwY/9+VC
-fgg59yf6cRm+KOVURKQYSAEIPpvOpk3hrwIDAQABoyYwJDAOBgNVHQ8BAf8EBAMC
-AuQwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAQEABRety0p4
-Ls47vucZKy+l2qF3bX9OFBgIsdJ57WUjg38zA88xK/yGnacCxfdn4n2PxnxVjUwo
-w92rGXJ5LYDOOQR7ighyJvz/e2tnxurqR0KIr6kGPQOT5jYuW61WDmnY5benySBQ
-95WZ6n6pKhqDbZ5yRecq45yT8ftG0n1UbL4NdNUQnQdRYnivKKGkeTyHzxzb/Uu6
-6r2XFuqLKT6t5ovWH7dZiDn5Ov5C/+dw3Wc9W0cNk1pTkUhXBY2SNURikJ8uRl0x
-aCWH4BXgqfzFVhFp51MpDe7gVfB/chpLgrtEScl0Tv9g2SzHYXItdIou6ajk3gij
-1Ls/+FMIVEt+bQ==
+MIIDBzCCAe+gAwIBAgIRANLwrftZx5UZO8aWgz/QyEcwDQYJKoZIhvcNAQELBQAw
+KzESMBAGA1UEChMJQ29ja3JvYWNoMRUwEwYDVQQDEwxDb2Nrcm9hY2ggQ0EwHhcN
+MjAwNzE1MTE0NjI3WhcNMzAwNzI0MTE0NjI3WjArMRIwEAYDVQQKEwlDb2Nrcm9h
+Y2gxFTATBgNVBAMTDENvY2tyb2FjaCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOd05MFojEMacunbagcG5ETUYlCpeqEwBonboZCgAF0AjtZmFpYM
+pvf+T9ZML40kGedsSrZcnC64VuaZ4uJfz6nBHrNiF0QUhxWzn4mE4jJ61/YmzRGo
+ok8IczwoV3bGU436SlLzh+v8ERxMmQrJhzKY9GLkbwV3lLkI7tatZ9W5xeBhB0zx
+0IpHlC0ESD6H18cK9rlCCxXmtOJm1TZnvvMykwd7pwTzMUPcpM2CaUm9P45qoB/k
+Bjj5EedDFAakt7+bwiFL3714VDmfXHvs7xiX5gR9f0stfVWzP5yln8k4w3vEwEZr
+7n6jNVg53e8y4QYgAzxcKUhlCiu5CKLhq98CAwEAAaMmMCQwDgYDVR0PAQH/BAQD
+AgLkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDQYJKoZIhvcNAQELBQADggEBAMXS8wxt
+kVe6iMVsbyb2JWcOk3zTaIKmwRj2dDckocqQs2xxmqoL+hv20gBkUP/bxsxZtOpE
+5nJiQoGqE9xqIVEDAu0Pn4GoFmqHOttUxJX3JiXXeOGAj3nWCxTYbM9QLt8JCLjS
+N/K1owbIAJwJ14aIZ2/h+Z3HsSWp9r6Cvc1UWI5VXNxIcQC4e1vhbIiCvn2H15M1
+HnD+uLd7HV/AlmRRQrDmArbhgOWA8+FPXZi8uOeaRYZ8dvoxh2tPmTGCRQ1Efv4A
+iaHLaOD2M8WQXX9Ae+lHEjrL1mU/o5sU4Nlbv8avybtf697wPg5KxFfLg4iwvJ73
+VCgsZdYy4vsCRhQ=
 -----END CERTIFICATE-----

pkg/security/securitytest/test_certs/ca-client-tenant.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

pkg/security/securitytest/test_certs/ca-server-tenant.crt

@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDBjCCAe6gAwIBAgIQa5P91ovdazkoyfC8MnoayjANBgkqhkiG9w0BAQsFADAr
+MIIDBjCCAe6gAwIBAgIQdcYD8J5t+ouxKBAzVSXSWjANBgkqhkiG9w0BAQsFADAr
 MRIwEAYDVQQKEwlDb2Nrcm9hY2gxFTATBgNVBAMTDENvY2tyb2FjaCBDQTAeFw0y
-MDA3MTUwODA5MDNaFw0zMDA3MjQwODA5MDNaMCsxEjAQBgNVBAoTCUNvY2tyb2Fj
+MDA3MTUxMTQ2MjhaFw0zMDA3MjQxMTQ2MjhaMCsxEjAQBgNVBAoTCUNvY2tyb2Fj
 aDEVMBMGA1UEAxMMQ29ja3JvYWNoIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA3UxoWZoyTDklzDxDOGEqCC+MVDxysW3+xe0QUB834z6z23hFfyq4
-JkXJJXhGvWjNoV83rl7lmbV1phcKH2aMfbiQ0HKAyGnixsph+FeE1rxCNQMX6uto
-cFUV2F0kK/euCusHwLYU9Qd6BdvP9gRhtmFu1zC8VTmCIdH4n4KiKQuWE0eAXqQg
-MXLDxqSXPnkzZ1LygpF5GRa7Vyl3dC3iUk2H7rAQ40IwhvaYIRmYvEsK+yqRrd78
-A6dhXKX8vfUt6Vu9OTKd6ZaJamcIlbqi57xJkGjpkCTu+wZ9eqnlf2zYBgwCkG/D
-08sfooVGxf0/YRFkO4jnd5opqkT3erhlMwIDAQABoyYwJDAOBgNVHQ8BAf8EBAMC
-AuQwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAQEAOQRD9Nbo
-tZl5SdQBtwRkon4d2i1kZzgkTWniyF5+BZEN/BUW/6sLcNQHwJQh5DWsd7ioSYCw
-qFbPpJVoiH2IrSUzKUch9LxQijCEEyiUEtiEokFEBNO5IcXDwz2C56nDMqepAazg
-jenbdlzi0E/p7k3l+sYeemNFHY7+KEpZbb+OQE+0JpvtVq8Td0DeBOtVyp1qydEW
-TLwg/nMMakSLQ1MXiBLkJkqR3RMVvSK9uqEIjN4W6yqE7oe9EIGtvJtYb5sq29jV
-MrGzQuh+yuhji6prMGql2RJC3MZMVQLf6yPA/YbUwrRT1ihdyqZpGhLKomgJzyXv
-tPEu9ysjxwVDvQ==
+MIIBCgKCAQEA0BjgJIMEdvFLKUoi4pbrqRdB/AZgaZXu88fqqEp/1swYyXLc3MSA
+JUN3+SJDgYwcNr1iGqF+X456Y+1ya96M8VMLItBbkQYDBjh20skIrAgs04WfRb9C
+fRjVJGdKyyA2D3i9rnll8SH0srq6dUxsRVysghEcHA1BWp4nTTXtZ44fiJArABip
+pqw2aHHV0oqPIEHlVJnFJfRyWfD7Y83mf8lJ1YLa5sWQfbfKQoTiiOobATrVJttM
+6A1/C94xl7inwP/IARyPwgVkfZj63PMLi8LBdjFwmWFP1IwlelVkmyjMWU7ylTWx
+SqeyTVPC8CWQBInAARpItMY1dAjDyFiQRQIDAQABoyYwJDAOBgNVHQ8BAf8EBAMC
+AuQwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAQEAIiu3gYWL
+tH76mFGmXIkPoSxkaYf2AsLqQggsPvz6rXqYd8r+XB3ZXlUr3lLs505JtOYG7Obk
+7ZqhlTRRcKeTQZWPOvcPC/oB0cQHUuJEiB8oZaPRdH6yA9zpdG6U9SkPhim8+6Pz
+ha8YC+px4weQgnS/bjbBdlSTRcqllm2KoZXy55mzqKQ9/SAPtcZ6cFcE8prPVmLh
+XInRgQFqCWngKupPN01aKr2Wv+RUEkiCkE6d0QPBpc7j6VejtfXGOfyOSCSItP0p
+QsMe6/XjaDNIcRic1vhzavThNdw2KgIvcEFaTpQwSviKpogFGNDYFBMfMVZLec/k
+E0YN7oZEJbj48g==
 -----END CERTIFICATE-----

pkg/security/securitytest/test_certs/ca-server-tenant.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

pkg/security/securitytest/test_certs/ca.crt

@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDBjCCAe6gAwIBAgIQcO7c8woB7kFKAq5bnkirBTANBgkqhkiG9w0BAQsFADAr
-MRIwEAYDVQQKEwlDb2Nrcm9hY2gxFTATBgNVBAMTDENvY2tyb2FjaCBDQTAeFw0y
-MDA3MTUwODA5MDJaFw0zMDA3MjQwODA5MDJaMCsxEjAQBgNVBAoTCUNvY2tyb2Fj
-aDEVMBMGA1UEAxMMQ29ja3JvYWNoIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAv/nD8JthvBj6hOS71AIhpbBkh2L5xSMmHEaowCaDlYLG19X0DBiU
-FlfBt+g/Lelh3naLmYb/W4KlQCW3IBvcRwjFUcLdAeErgaNoygnDmeO+kxGl8maD
-DYiTTkQ5ttAQp39yrIZiSQnxG0wpd71nXzdCiD4nPW43o5EpyB4g+OVSzYiTjui5
-LLxvX9+owg2rNzDQtYB7cogQAG7d/YPA9YFRAybkc03pS+5E/gPG/y4p3LAkwn5P
-iHTVlHC4NZg78XE6lvQVkvYOLPyTHGN0IjTgy2CRA8lkxRIBFNshViBM6lSqTJrp
-2N7hSF3002R1CUGMjDIAB5OBv6FrynSKqQIDAQABoyYwJDAOBgNVHQ8BAf8EBAMC
-AuQwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAQEAfxDUg6CW
-/zQK2oEeqs+a9ORAILV/ByI7kWKv6exP1BwYvx6fdo3nvn5dTOu/aizjZXBj2JuA
-4G9rcRJUNV8x5vFwmsIKqr3zKXzE0ukIvousJpozyAz77qKwPp2nfZbk9YqupBuI
-y7Kp3ZRdLrkd77CBuMeVDjuvgFUc/EbTxRddnXW9aCa1L9RjaFFTHjmmOdleINxF
-8PGGlBoskSrLb8RbVLmZrn7uEAJVxWlxCuu0DxP/WPK/DyCkfI5v1IK7fLHTu3xg
-kfxNEAdYo8cLiRA6zR5rcU5b7JiYFc1XtynCsR1+IefOzIcQpM0ugyYIUQ1yhHDM
-4B0g9wn5LTS6Mg==
+MIIDBzCCAe+gAwIBAgIRAKqn804xfCG3Cq5XwYoRSiYwDQYJKoZIhvcNAQELBQAw
+KzESMBAGA1UEChMJQ29ja3JvYWNoMRUwEwYDVQQDEwxDb2Nrcm9hY2ggQ0EwHhcN
+MjAwNzE1MTE0NjI2WhcNMzAwNzI0MTE0NjI2WjArMRIwEAYDVQQKEwlDb2Nrcm9h
+Y2gxFTATBgNVBAMTDENvY2tyb2FjaCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALTBG5dyvKSld3VYf2uXe1FYlZdV6YaME31jycw1Z9tQ0DGJ9CRM
+gIoOYW/Jq94/wICm/CqlB830IgLnPkaVSg+853UlQ1P3eABGpWhUvI4OnuKV2OMz
+0Vp56Od9FVAKAFQ786UIkBOGyAXv1NdEjhE8x0izgk0aWyLZrTvFkpIbIl61ogDD
+2SR6vd0u9Kjsyfv5eu7caS0G8JXHJYN78RvZZK4+etR+qoOgdPErZj7I7stLDb9T
+crjc4Vj5D9bGp0fiJ3OsMB3v1mOLvAQO2VqIMKIMwHzERL23Qc2tGfUJam2qp7sU
+ZJnIK0bfLDXhPSdawgYPwKpQMxpB1o5YXIMCAwEAAaMmMCQwDgYDVR0PAQH/BAQD
+AgLkMBIGA1UdEwEB/wQIMAYBAf8CAQEwDQYJKoZIhvcNAQELBQADggEBAChnKRf2
+a5VeoWjUxScPClAHduMa99r9XvCu5i9RRTEfE+IGO8UuswSajb3uTpuN4tSs209B
+ZrWzskaI1cFZWhNMslszQuotUFcgzpqFrCF5EMioNpSVattAVWIYsiY8KPUMuUYO
+9RkOOdqeM3PrmYsVR3kicdLTOMVb/mWMxEWrMwbC966PtdXbBFDNsFOHXwMtB46i
+J2Yh7WGHjCOwOqmNOlZ/RQkSzqYo61HJ1Dlc0uO7s6n38Ud+P3d5K9Onqh0SmWin
+yipZLHZ9IUjCemirVytoC9o6PcxGufh66nEE3qG/L5kQvTfyYsPW+g/1bYK7Dm1h
+oO1otHyDZwmW+yE=
 -----END CERTIFICATE-----

pkg/security/securitytest/test_certs/ca.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

pkg/security/securitytest/test_certs/client-tenant.10.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/TCCAeWgAwIBAgIQNpOVxM/f/h4pveU5jxIigTANBgkqhkiG9w0BAQsFADAr
+MRIwEAYDVQQKEwlDb2Nrcm9hY2gxFTATBgNVBAMTDENvY2tyb2FjaCBDQTAeFw0y
+MDA3MTUxMTQ2MjdaFw0yNTA3MjAxMTQ2MjdaMCExEjAQBgNVBAoTCUNvY2tyb2Fj
+aDELMAkGA1UEAxMCMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP
+tJxmxWOvvzma22MTmchFVLkLq0N5i/RwM7NeWQ5t/z6NK01UDIT188lP2ngMWU3w
+WfvKFMiLn/AdFV9ksE0X39ISJcZDZmCgNOEnDdW327ZzWX4ZZ8Udz6DwcLjrzuGf
+6XEuN8BhLkvCBjkaGaag4Drw6yFXxe9zMupbabPx0RwfnSBEDT20lbNQ+KsLUufJ
+1WkUlZqp/LqefqgHqdVpXvAmc09GijoywOT2u9yJq7y1SN5ORRrogcZ3GF1/WzXq
+eAJj27Ll3xGNMKrYo1m1qLlVrO9ZiXoSGOzecp3PRPuKSaGpBFmLiYPOGGMnXGLe
+npTN6gy/tCP4CQ0vheuPAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUE
+DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAV1vsr3k41cv84ycOQtXu
+FewVW/SEmNNpuC8iqm92y8L+QLjoC0apGmz+iY3Deo1Q33H1WbgwEGDVZvepdNWD
+MIkxYu42IXfbexzdayHAcbmKFc++hT17fREepR7CHcwUxTKCh2Q/UQRm+pdhjG8S
+/Nh1raUDVBt6CP/Kj2H2XJCFEyKgBs0SA5KTZrgnpuEE206I7rAmjw2AK6xJEl4D
+ZBIiTBKTjpy+zaqgNSVOU9lk0t4FU5nMcGLdOfKIdKvcxuBW22JuxWQxQn9kUumx
+q3FKTW3klTA/HxXIahEfA3xJJeSBtLgFs5NxAwsDNeJxqY2Kh4KqwZ2A5QKKO77H
+Sw==
+-----END CERTIFICATE-----