diff --git a/api/server/sdk/sdk_test.go b/api/server/sdk/sdk_test.go index d2bdc88b3..e24543677 100644 --- a/api/server/sdk/sdk_test.go +++ b/api/server/sdk/sdk_test.go @@ -50,7 +50,7 @@ import ( "github.com/portworx/kvdb" "github.com/portworx/kvdb/mem" "github.com/sirupsen/logrus" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -91,7 +91,7 @@ func setupMockDriver(tester *testServer, t *testing.T) { // Register mock driver err = volumedrivers.Register(mockDriverName, nil) - assert.Nil(t, err) + require.Nil(t, err) } func setupMockBucketDriver(tester *testServer, t *testing.T) { @@ -99,7 +99,7 @@ func setupMockBucketDriver(tester *testServer, t *testing.T) { driverMap := make(map[string]bucket.BucketDriver) driverMap[DefaultDriverName] = tester.b tester.server.UseBucketDrivers(driverMap) - assert.Nil(t, err) + require.Nil(t, err) } func newTestServer(t *testing.T) *testServer { @@ -116,12 +116,12 @@ func newTestServer(t *testing.T) *testServer { setupMockDriver(tester, t) kv, err := kvdb.New(mem.Name, "policy", []string{}, nil, kvdb.LogFatalErrorCB) - assert.NoError(t, err) + require.NoError(t, err) kvdb.SetInstance(kv) // Init storage policy manager _, err = policy.Init() sp, err := policy.Inst() - assert.NotNil(t, sp) + require.NotNil(t, sp) // Setup simple driver os.Remove(testUds) @@ -145,7 +145,7 @@ func newTestServer(t *testing.T) *testServer { RoundRobinBalancer: loadbalancer.NewNullBalancer(), }) - assert.Nil(t, err) + require.Nil(t, err) tester.m.EXPECT().StartVolumeWatcher().Return().Times(1) tester.m.EXPECT().GetVolumeWatcher(&api.VolumeLocator{}, make(map[string]string)).DoAndReturn(func(a *api.VolumeLocator, l map[string]string) (chan *api.Volume, error) { @@ -155,24 +155,24 @@ func newTestServer(t *testing.T) *testServer { }).Times(1) err = tester.server.Start() - assert.Nil(t, err) + require.Nil(t, err) // Read the CA cert data caCertdata, err := ioutil.ReadFile("test_certs/insecure_ca.crt") - assert.Nil(t, err) + require.Nil(t, err) // Get TLS dial options dopts, err := grpcserver.GetTlsDialOptions(caCertdata) - assert.Nil(t, err) + require.Nil(t, err) // Setup a connection to the driver tester.conn, err = grpcserver.Connect("localhost:"+tester.port, dopts) - assert.Nil(t, err) + require.Nil(t, err) // Setup REST gateway mux, err := tester.server.restGateway.restServerSetupHandlers() - assert.NoError(t, err) - assert.NotNil(t, mux) + require.NoError(t, err) + require.NotNil(t, mux) tester.gw = httptest.NewServer(mux) // Add mock bucket driver to the server @@ -194,15 +194,15 @@ func newTestServerAuth(t *testing.T) *testServer { setupMockDriver(tester, t) kv, err := kvdb.New(mem.Name, "policy", []string{}, nil, kvdb.LogFatalErrorCB) - assert.NoError(t, err) + require.NoError(t, err) kvdb.SetInstance(kv) // Init storage policy manager _, err = policy.Init() sp, err := policy.Inst() - assert.NotNil(t, sp) + require.NotNil(t, sp) rm, err := role.NewSdkRoleManager(kv) - assert.NoError(t, err) + require.NoError(t, err) selfsignedJwt, err := auth.NewJwtAuth(&auth.JwtAuthConfig{ SharedSecret: []byte(testSharedSecret), @@ -233,7 +233,7 @@ func newTestServerAuth(t *testing.T) *testServer { }, }, }) - assert.Nil(t, err) + require.Nil(t, err) tester.m.EXPECT().StartVolumeWatcher().Return().Times(1) tester.m.EXPECT().GetVolumeWatcher(&api.VolumeLocator{}, make(map[string]string)).DoAndReturn(func(a *api.VolumeLocator, l map[string]string) (chan *api.Volume, error) { ch := make(chan *api.Volume, 1) @@ -242,24 +242,24 @@ func newTestServerAuth(t *testing.T) *testServer { }).Times(1) err = tester.server.Start() - assert.Nil(t, err) + require.Nil(t, err) // Read the CA cert data caCertdata, err := ioutil.ReadFile("test_certs/insecure_ca.crt") - assert.Nil(t, err) + require.Nil(t, err) // Get TLS dial options dopts, err := grpcserver.GetTlsDialOptions(caCertdata) - assert.Nil(t, err) + require.Nil(t, err) // Setup a connection to the driver tester.conn, err = grpcserver.Connect("localhost:"+tester.port, dopts) - assert.Nil(t, err) + require.Nil(t, err) // Setup REST gateway mux, err := tester.server.restGateway.restServerSetupHandlers() - assert.NoError(t, err) - assert.NotNil(t, mux) + require.NoError(t, err) + require.NotNil(t, mux) tester.gw = httptest.NewServer(mux) return tester } @@ -359,18 +359,18 @@ func TestSdkGateway(t *testing.T) { // Check we can get the swagger.json file res, err := http.Get(s.GatewayURL() + "/swagger.json") - assert.NoError(t, err) - assert.Equal(t, http.StatusOK, res.StatusCode) + require.NoError(t, err) + require.Equal(t, http.StatusOK, res.StatusCode) // Check we get the swagger-ui res, err = http.Get(s.GatewayURL() + "/swagger-ui") - assert.NoError(t, err) - assert.Equal(t, http.StatusOK, res.StatusCode) + require.NoError(t, err) + require.Equal(t, http.StatusOK, res.StatusCode) // Check unhandled address res, err = http.Get(s.GatewayURL() + "/this-should-not-work") - assert.NoError(t, err) - assert.Equal(t, http.StatusNotFound, res.StatusCode) + require.NoError(t, err) + require.Equal(t, http.StatusNotFound, res.StatusCode) // Check the gateway works // First setup the mock @@ -386,8 +386,8 @@ func TestSdkGateway(t *testing.T) { // Then send the request res, err = http.Get(s.GatewayURL() + "/v1/clusters/inspectcurrent") - assert.NoError(t, err) - assert.Equal(t, http.StatusOK, res.StatusCode) + require.NoError(t, err) + require.Equal(t, http.StatusOK, res.StatusCode) // Setup mock for CORS request s.MockCluster().EXPECT().Enumerate().Return(cluster, nil).Times(1) @@ -396,12 +396,12 @@ func TestSdkGateway(t *testing.T) { // Try cross-origin reqeuest, should get allowed reqOrigin := "openstorage.io" req, err := http.NewRequest("GET", s.GatewayURL()+"/v1/clusters/inspectcurrent", nil) - assert.NoError(t, err) + require.NoError(t, err) req.Header.Add("origin", reqOrigin) resp, err := http.DefaultClient.Do(req) - assert.NoError(t, err) - assert.Equal(t, "*", resp.Header.Get("Access-Control-Allow-Origin")) + require.NoError(t, err) + require.Equal(t, "*", resp.Header.Get("Access-Control-Allow-Origin")) } @@ -431,7 +431,7 @@ func TestSdkWithNoVolumeDriverThenAddOne(t *testing.T) { // Setup SDK Server with no volume driver alert, err := alerts.NewFilterDeleter() - assert.NoError(t, err) + require.NoError(t, err) sp, err := policy.Inst() os.Remove(testUds) @@ -456,25 +456,25 @@ func TestSdkWithNoVolumeDriverThenAddOne(t *testing.T) { }, }, }) - assert.Nil(t, err) + require.Nil(t, err) err = server.Start() - assert.Nil(t, err) + require.Nil(t, err) defer func() { server.Stop() }() // Read the CA cert data caCertdata, err := ioutil.ReadFile("test_certs/insecure_ca.crt") - assert.Nil(t, err) + require.Nil(t, err) // Get TLS dial options dopts, err := grpcserver.GetTlsDialOptions(caCertdata) - assert.Nil(t, err) + require.Nil(t, err) // Setup a connection to the driver conn, err := grpc.Dial("localhost:"+tester.port, dopts...) - assert.Nil(t, err) + require.Nil(t, err) // Setup API names that depend on the volume driver // To get the names, look at api.pb.go and search for grpc.Invoke or c.cc.Invoke @@ -519,29 +519,29 @@ func TestSdkWithNoVolumeDriverThenAddOne(t *testing.T) { // does not panic using a nil point to a driver for _, api := range apis { err = conn.Invoke(context.Background(), api, nil, nil) - assert.Error(t, err) + require.Error(t, err) serverError, ok := status.FromError(err) - assert.True(t, ok) - assert.Equal(t, serverError.Code(), codes.Unavailable) - assert.Contains(t, serverError.Message(), "Resource") + require.True(t, ok) + require.Equal(t, serverError.Code(), codes.Unavailable) + require.Contains(t, serverError.Message(), "Resource") } // Check the driver is not loaded identities := api.NewOpenStorageIdentityClient(conn) id, err := identities.Version(context.Background(), &api.SdkIdentityVersionRequest{}) - assert.NoError(t, err) - assert.Contains(t, id.GetVersion().GetDriver(), "no driver") + require.NoError(t, err) + require.Contains(t, id.GetVersion().GetDriver(), "no driver") // Now add the volume driver d, err := volumedrivers.Get("fake") - assert.NoError(t, err) + require.NoError(t, err) driverMap := map[string]volume.VolumeDriver{"fake": d, DefaultDriverName: d} server.UseVolumeDrivers(driverMap) // Identify that the driver is now running id, err = identities.Version(context.Background(), &api.SdkIdentityVersionRequest{}) - assert.NoError(t, err) - assert.Equal(t, "fake", id.GetVersion().GetDriver()) + require.NoError(t, err) + require.Equal(t, "fake", id.GetVersion().GetDriver()) // This part of the test we cannot simply send nils for request and response // because real data is being passed. Therefore, a single call will satisfy that @@ -554,6 +554,6 @@ func TestSdkWithNoVolumeDriverThenAddOne(t *testing.T) { HaLevel: 1, }, }) - assert.NoError(t, err) - assert.True(t, len(r.GetVolumeId()) != 0) + require.NoError(t, err) + require.True(t, len(r.GetVolumeId()) != 0) } diff --git a/api/server/sdk/test_certs/insecure_ca.crt b/api/server/sdk/test_certs/insecure_ca.crt index 558a4e435..f850646e9 100644 --- a/api/server/sdk/test_certs/insecure_ca.crt +++ b/api/server/sdk/test_certs/insecure_ca.crt @@ -1,21 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIDdTCCAl2gAwIBAgIJAI6emGCW7kplMA0GCSqGSIb3DQEBCwUAMFExCzAJBgNV -BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg -Q29tcGFueSBMdGQxDTALBgNVBAMMBHB4dXAwHhcNMTkwODI0MDEyMzE1WhcNNDcw -MTA4MDEyMzE1WjBRMQswCQYDVQQGEwJYWDEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5 -MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBhbnkgTHRkMQ0wCwYDVQQDDARweHVwMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmzy8sygifVaoFFbxpNIk39n -ybtiYBOIGa/AacACDw3opBnRLBd+uSY8P/nPFg3s3ZSs4b/kykHo+kMfK8m1BT7a -3d4e4COcansb3qtp62ipEnp58e0dcJis0kTcvovStLN0gTin+IHfQtfQrVzw51KL -134dNUeon0A6oSaXvnx0p3gMg9cS8L6l9Ih09/8hNVxm1KTYam1XXHf8vdi3RI5B -9ClbDdiFvNjYvDJP//Bao+4yJrbyasRgmJBACLWbTxxp6Ph04WnxHdE2HYcxDmcP -Esn3R/x5bQSQJr3gILS75sh3Xr0djbmdpKwi8zG7jzOuLeRdRu4uYWOzP6xJ+QID -AQABo1AwTjAdBgNVHQ4EFgQUf7e2yL163c1SafdrzORVTEGDU4AwHwYDVR0jBBgw -FoAUf7e2yL163c1SafdrzORVTEGDU4AwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B -AQsFAAOCAQEAX9gOeYdP/hbuTDJVRR4ipQrjhAW496vW0FIcSGG11H/P8PNidAQx -veOXWEwKRZbSO+TxMbXw+fE+URstDq8eEQK7ns0yZve4GbeB+PVMyjRuc1hI/uR3 -wzTuYsEtGhXlojLkLaS8O6ARMwg11maBca3N4V7IlD/eNNtTqMiSNvYimpIEOKUj -lvkx32Wi2bcSyAdqHkRGN3AArrzEz+ybtoSFC9M6/Xsduc/68bIZztZveuacmt9T -jCUt3FvwQhhoN2Ax6F60864QiMiPE5y9iFcoCQWz9yPb47qSr79SlqhOzKNAgE6R -x/sTw+ZJP3ucSLJ5Fkxp5H8EzXv0HsS1fA== +MIIFazCCA1OgAwIBAgIUVS/Aw6irbOH1D9CH6CE1Jc03Zy4wDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDA2MDUyMjEzNTZaFw0yNTA2 +MDUyMjEzNTZaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQC/drW5RzHQfw4Miauxd3beAmKJ9uRYO3PxZdLPGa64 +qlGtG6KUe9OQ7S+L6t2zfODrDsN4tio0oZxO4yIhHBvUoQfZvGpSFNG2TNDfHENT +NjWn43CoE4poNKwxi/X40FYovhDs21exgoirVcD9l4HE9hWiiC6gjri18nD82j68 +fsEy+7IMVlOrH1wCr2oFLzYB0/gKIfrScCmiJ4tHwyZ1Yz3gR5eZjQbAVRH0Q71t +FkY/Cn2hlMD7JnUuzbPhVDX4PKw9lnF50zd1S2l50M6L3EEhB3zNCiFGqCYBiJIm +a8X3SHfH2KfN7pr6y5wbX9q82w2nhwM6O8bVFv82tk1mvUAFABK/gcDnyuPS34cu +9E3+0f8V0wafWq0j0+k0XXVfdWqxf81zdvUIO/NlON4TOquWZZhdS29SrHHFhmxx +ASWzkgEo9yMh7KMFUYRPk5yyswytO3pirfb38ZI+zlxrllTenCIKXjomvfgiEtUw +HpdynJpP9+WKEiLOxp0ku729viHcXtjDWFwBfZmn6JsYj7Z+kQxHPlwj8ZouIQGE +OsWiqyZcosZP2nwztFJJxR32Nir/F/c3RCOGXn7Yib9BtFuYmubQ/gSs+gMTIlfO +vYII71VwtKRAZNqMCLlbC1CdlMwa0iTifBdMJoCKlCiCkHqo+UqctReGgaLGmpc9 +lQIDAQABo1MwUTAdBgNVHQ4EFgQUciihBrmFuLSgedhOIqLL71VedRowHwYDVR0j +BBgwFoAUciihBrmFuLSgedhOIqLL71VedRowDwYDVR0TAQH/BAUwAwEB/zANBgkq +hkiG9w0BAQsFAAOCAgEAn2lsOLx1p1ushZf37TZZ7KrDyLS2RWUWY07U1RGp9YiR +xDxiHYzpZdK6b5KPRvxEGUgYKcbQjlH+3O51Y0ORWnj4xjvlF+5uveH+bVYOChsR +Oyu2d24lgDGENwPvVtnzXzYPlIXalEWQVv/BR0c5H+yUwrHEzqavS7gafiQ+LqhQ +Gzo+NuIUdNusEt4Dcna8WcEf4CwgLgbV7wtl4/z/jCWjYc+CDEpmpNdzRIzSbVP2 +jrN29G0BlIkO9FGtVNYAQ8wd3dhU0tbzfhXnou8Dju0nyyjCYXBxOGd7ME1JjAFV +nRFcSMh9NjqFcJSMjrLu7CCey0FSSF87q5Bct4VkI99t0Z3Sa7MQyOgA8pNCjPcc +thLwPNa+1faWiv7tDQ6UriwZoWQEKVHogRS6qTVPXL0crXKGIaZAOdKYc6aJ7lqe +NJT3eezb9o6Mduvc3ssj8o0lxAx46uyKr951Haapv7GL+blJ6IZXWWs+rL87+W7a +w26vsaFUSwzvhF0UYEzyO7kAMRKHvtdDCeV7659cpRiDI+PfOsTiaTcfYp1CMj68 +LiXOrMRd03tqd2RZjnBTvwZYAOvCwLPE1gaGUb/CMynQkqq63cmPq+TYzS1bgPbc +UFX9IBZMKRMZfKlranMNEAnIcf766RY3p2E3fSATfySlEsBw1/d1JltCYs/bGdw= -----END CERTIFICATE----- diff --git a/api/server/sdk/test_certs/insecure_ca.key b/api/server/sdk/test_certs/insecure_ca.key index 66f7ee8bd..3945aade1 100644 --- a/api/server/sdk/test_certs/insecure_ca.key +++ b/api/server/sdk/test_certs/insecure_ca.key @@ -1,27 +1,52 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAlmzy8sygifVaoFFbxpNIk39nybtiYBOIGa/AacACDw3opBnR -LBd+uSY8P/nPFg3s3ZSs4b/kykHo+kMfK8m1BT7a3d4e4COcansb3qtp62ipEnp5 -8e0dcJis0kTcvovStLN0gTin+IHfQtfQrVzw51KL134dNUeon0A6oSaXvnx0p3gM -g9cS8L6l9Ih09/8hNVxm1KTYam1XXHf8vdi3RI5B9ClbDdiFvNjYvDJP//Bao+4y -JrbyasRgmJBACLWbTxxp6Ph04WnxHdE2HYcxDmcPEsn3R/x5bQSQJr3gILS75sh3 -Xr0djbmdpKwi8zG7jzOuLeRdRu4uYWOzP6xJ+QIDAQABAoIBAFgUNzVgB+h/167j -tJ9Tgj2LblQ6+mFTTm/r7vh8yzfRZxUfYNE2eKck8kZrmYxKXxVnhsswt2COs0JG -pyvWkb4ejb034FBRyba3mxwItp52y/jb6id0NbbGTvtYAwE3kgrowSEg8YmbUgUr -pS69qvln5iYp3CRkbyHAVBQkKtoH09cbJYXXg4w3t2MouSflBSYvf7gCturg4YUR -CfzdP0vyMVnTDyqKEUyXfHm3rd/elKXsRElKkb0CFUPp4+WhnqyRLX6mYdD53klI -HnVBE1cFWiZ28jaBqhK9ZrslHdTetlp7Nj14rA7xF1cvslvYs/ZRqypddU2Fcv0B -Tvo/0TkCgYEAx4X83GBQdGKKx9rXzntvxyG4MbV5Qw3UQjaEOBgFO0XRwZqnwA0N -198ezxGGmbWiG9BktpcKD7UYrWjXDzxmBw+er2tkHZFrWuMY3EAqIOj47T3G5UQw -NFD/xA4A53AE5NPxbcW9ihraTyuLhwxMPPOmQXW8dbK6UvOCCPbKQAcCgYEAwQEz -DhUb84IUTVtEXJDTauuLFZ+q7h4rnoIeGLElQjbzfW1zS70f1Mt0rVDt0Bjvk+8V -Oq4kwofarTWFBfISrrfQRvygVS6WWQwE5d7Ov9noZM/eLJizFsufAwlvfF24bKkG -SpVxdMpgkMT/nclIXN8NzvIVkwxpix5VE6b+pf8CgYEAhslUPcfu8gDUAhkr6rhm -lZ6I4UPYDF1eQ/CyN3a6qgULo3+HzWzEKk33cSlExbf3MFUChHraeCv95L/LcOZ7 -gk+iAp1Iv9TKMlbyJ3BNRXg9GX+/SohbDCyf6+EN6Us6cx9enKqV1aM4UX14P54m -LpLmgJg53UUFLB6GfOnDTacCgYEAjGJH9YVLKGrEQ6QP7Fh3Pv0G1HqnxL1zMr8o -DwPCuw/nOaNDyqJMpeY6/tmvsL6CfJLZWS5TlJ9mYrhcAoAaMLWIrCmSoYLaXvjM -EztmHMvuKm28B6omEX2YMohJbCdrPrYO2m8q8C1H4eU4nFdM6ChiDdWt9aCAoG02 -qq276ZcCgYAyqJj1dPI1qfrq4FtGsKZ3FQBTEdnlOxjpQlHWNk6iV7RuPW3tchsU -xBhP97aCh1DiK4kEKD9IApZKFnN1dWcmt82s0HR7mg/gwJg/NS2upBIYafuFA+9D -6R+5SqTWd9kUMlRoATnkuTLfIe9ni7UnRv6z9ncVSJHdrOb43PT9zA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +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 +MCiR2lARiw0aWu20iPqbYJoTpOynnw== +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/api/server/sdk/test_certs/server.crt b/api/server/sdk/test_certs/server.crt index 3f2a6f564..524df714c 100644 --- a/api/server/sdk/test_certs/server.crt +++ b/api/server/sdk/test_certs/server.crt @@ -1,19 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/api/server/sdk/test_certs/server.csr b/api/server/sdk/test_certs/server.csr index a466e486c..35ca8b733 100644 --- a/api/server/sdk/test_certs/server.csr +++ b/api/server/sdk/test_certs/server.csr @@ -1,16 +1,16 @@ -----BEGIN CERTIFICATE REQUEST----- MIICiTCCAXECAQAwRDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQK DAtNeU9yZywgSW5jLjESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEAsVqpfPk53ax7z0NjPBWcLgrwi5crtFhu19cBBufR -LjFm720Nw7glYJCDHly78BeAWBUeHq0TVnY+f59DclUiHjDam0bctjCLOtMUjz7C -PXl6GFgkaGsxSv7K94rEJLJmHO8x+VbGRx2sE29uCSDSd1hRkAFLw7yzwajvLGln -q/s5Odaw+KPyWhMp82J0cgwGIj09bds1j+CeEfuh82Ruh9jgmBU4VO0VyX+W6bX3 -PTGyj3OKHkDW4cdhm2pBneICgpxHNb+FnKjwGlL7nktLXZuufT9+ZsV6sUiK0oyE -15rqZzoiArs2Hzr5W1X/ej/TCZGSMeVMwboCjO12aeGQkwIDAQABoAAwDQYJKoZI -hvcNAQELBQADggEBAEdHHmyqGMpT4vMDRLZUWU2uMa0n89qb3aF9lS8iQfOj7qCN -8bthUBTfU+cRHYZB8YKWyAjeuHoQzw00f4VyifCAgHTZuzQ8a/l1+7N0/o1GWjLI -g8yhgJvrXo2DScDL5lAjAfWgEsrsA/4oK/gpqcxmROvkQP5bz0vU6ObfuMjXECU/ -Xjc0ITFvvsSwdWIp/PGaWw66jAqst13U6AGlSzzYtLlyZVHR1nFEyN/tLEt154GX -8njmT7boLchbDixoayVSjYhPumYj1IINUiE782Y41qYSLiEQCcYTwW2QddsllPGx -WLXzBaYCNAI7DzduG/XOpX7z+Lxy7dHecw8ofH0= +AQEFAAOCAQ8AMIIBCgKCAQEAr+HR44FnMGzY5O3XZ8PaPsxtQgu0nyikWkcoSc9w +qQdtX3oTd5F/IBylzeeZVxrhnqloF9tlsrqeLX6qQQxLtqb0T1QbGb26kKJxd2nK +PdmFbXImDJS/6sVagfyjw/m/V5kTuJlOAwYcsFUkGFWIGxKntbJZ5OLAOrGuRdJo +ow7dkgsjgULAeWIY6ZSMd81j84aRgAfN7VclXYI8soMWStGanHTDIYT95yTY8+oi +ruYGTbngoRsKLRxCqF4Fvd07N7H6w9CmMr5l3RbIW4PfaZo8rf438sUGQcQMDQ/J +IW+4K5Phj2p9B8bNR4HN5msv6lKj/iy9nVDsuNX8J1HLhQIDAQABoAAwDQYJKoZI +hvcNAQELBQADggEBAEJ5HYaZHFrrOH0VUU8QRb88a9LAMTMJjK5ZPKOZ88uqNz84 ++XynHeDFoH+ZZrnAbO0cxYSBHh30rCV6e2og3lhKIOK3tu0Mu1bBrR97JghOSELN +BAKBGZVzdA9/GXOoYgv+JmYoaCdGEM5e28MRW25ggtDr9uxqCqts3ZYjPXXS+ioC +vDFsXurTLhImiG8Lr1XPEtJ1Pfq6MKkesVC8JEbIS/1vdWGKQ/ew+tu7wCXELJiD +l86dYQ9uqL/L/z2LwUkVus8rW7u5fP7vWTLERGru+vG1xKInDH26WA3Uhie5xPt5 +0qTB7wp1tH4VVLZ1kco2vS2EupmU4qFCIyvoz7o= -----END CERTIFICATE REQUEST----- diff --git a/api/server/sdk/test_certs/server.key b/api/server/sdk/test_certs/server.key index a60c76a23..88fb583bf 100644 --- a/api/server/sdk/test_certs/server.key +++ b/api/server/sdk/test_certs/server.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAsVqpfPk53ax7z0NjPBWcLgrwi5crtFhu19cBBufRLjFm720N -w7glYJCDHly78BeAWBUeHq0TVnY+f59DclUiHjDam0bctjCLOtMUjz7CPXl6GFgk -aGsxSv7K94rEJLJmHO8x+VbGRx2sE29uCSDSd1hRkAFLw7yzwajvLGlnq/s5Odaw -+KPyWhMp82J0cgwGIj09bds1j+CeEfuh82Ruh9jgmBU4VO0VyX+W6bX3PTGyj3OK -HkDW4cdhm2pBneICgpxHNb+FnKjwGlL7nktLXZuufT9+ZsV6sUiK0oyE15rqZzoi -Ars2Hzr5W1X/ej/TCZGSMeVMwboCjO12aeGQkwIDAQABAoIBAQCTG3hqSO9Oh7tK -d8LgG6yoJDrSDloaBSAruBMJ/07q2d9fyT0ZkqyuJDAeBx18UIIMjbemCjl4Bixg -/2GafDMIh81L7sMz+6AA8wSirJPBGfnEJ5hLZF5GroD8QwXeynsYlO8GuotMgbgx -hsPmnmr0wzUkFW8atHMFt3JrjCKJ6zzMWm5375+WOchmjPk0Dsz5d/VHHMgGiiBQ -QtJdTTvbCC6c0U4Y7uH8Y6g1sPlZLQUigvsima/LcX57pS/YpARMDRTS0HG4/xZq -PZyTlDCkETmsjwRoVk8GQTMk/R98cym7SK1eaIkiRJXnc/MPCepoVGhaXDvyQVjF -Hc/sgtTBAoGBAOn3lHjARLgBXlMsHuqbFxHlH+TiPKfXRNBsgD6bfnaBnAKRe/h0 -EiX4jX0JNWIoMToArkXcR+mHeIhGOgPeQ7jqHcuYMWiMggauYrYeziNuO00p9gF9 -GgNepiQ2/MvY9IhMi0GERL6pOr67trQyyY8YqJ+bTL75OCHD3/Uth1TPAoGBAMIO -RWifAcv4NwMByPvNDGIFjw3g3h1vSIwoDEXX60aJjY8S1+OQi/6RvRIvWZfvaP0Z -hrMu/89z2G2YrzBPEMumDO1RgK4RA8OXBP+HxhMP4Yo2gBL5cVZCsmfvT6eLPVrD -1Nmak/fX5AKBvMgU4QdjG5RLTNXmW8ZOp3U04UD9AoGBAJPk94pY51d1Lf3fTu+3 -955NOpsBU5w5HHuvimWI/yjEBy0sb7P/ExXDhxS5xG/2vh9PHNp2Q1LgWpWx5qxZ -TG/QNeNjoh/Xab31b9p1oJKO9JdzZdlNDiuBIf6Ub7ofu3uI/yH8DUSETukQWY6Q -6A43ZSf3EE1L1mqpmaEvFXPLAoGAeLz4YofMTmQ5lh1eN4z0z2g2AaSPjjDXKp0g -RbR6JoEfGo3W1TfyYom64b2kOOw0noVrUcFEWIbzef0twxjukkbWdDHppmPfu6oS -6gpIK0QOSDhwp12cLteAuTokjVIM8pQ1ss6Ckgo5S3X9R1/2QupfFn1jaRLStyfo -+PvVyuECgYAusWsyovrYrKigQIGAGflCjFQt9LxwAzcftDX9veyAgBxqS1OTSIdS -C3xQi4j4YquVCxRqC2RT4d8l/jqM3bsrzTxdIIOKeZC0KMLweFWAuwRSDrMCrFko -U+U/LvCk6zp8hvODaubYH6GwEcMgE+e/4vIfwMV+bWqmUzQCWzeNsg== +MIIEpAIBAAKCAQEAr+HR44FnMGzY5O3XZ8PaPsxtQgu0nyikWkcoSc9wqQdtX3oT +d5F/IBylzeeZVxrhnqloF9tlsrqeLX6qQQxLtqb0T1QbGb26kKJxd2nKPdmFbXIm +DJS/6sVagfyjw/m/V5kTuJlOAwYcsFUkGFWIGxKntbJZ5OLAOrGuRdJoow7dkgsj +gULAeWIY6ZSMd81j84aRgAfN7VclXYI8soMWStGanHTDIYT95yTY8+oiruYGTbng +oRsKLRxCqF4Fvd07N7H6w9CmMr5l3RbIW4PfaZo8rf438sUGQcQMDQ/JIW+4K5Ph +j2p9B8bNR4HN5msv6lKj/iy9nVDsuNX8J1HLhQIDAQABAoIBABJ7kZnt1FEzbwuH +rvY5j6q/ws+I+V8sXzEZfzNaeEVbAXRiGL+c65YNTKM5rlSH/6Ozu7ueE67Xi53O +TMfvKdm068GWXg6zcHKYj4Hz/QvI2wuoTjVOQGjEeoFkcjU6/o+PB5KDkb4hm0ww +dk2UV2w45qTibC3wYjEI0P6HYPWZgqc8OGXsYWIWKFONJZwNrUdiEInjNA2VEZNA +PZhzPOwcO2Pk0wssDNsXQZkfQPFXTMZVi+qSzu40JXbUqbwrnqnclzRuNjQaZUDY +OAXnxUylhlAnInByvnwshjk/RPOFtX7haiORfvtatLc0sIvYEt3Xk2xyd3VMW4al +fau/UUECgYEA4BwoYBKUFssWoGr0pfhVHdIEYI7EQdkYRx2O+MDmf3sda9joWpuT +dYaIW4owJP7qlovkToF0qaprYP8CW/RSPBXdUDubJTf8seMb/XuLq3hxU8T07zvS +jT05GiwaWfh3hwt9LRuSGTxO3xUGSF++AhpY5XGFWx8x1Ew+9T7zIFUCgYEAyOjT +ILo5E/lS7ULV1IliSxKNiAl42nHNOqVvbIJmmi5WMc6nnsGssKqBCB92okK55h/w +xWDu6sA09tAfiTGvK67QDe2F4dYx35HYQ90KaMjMUTAz+Nk/50V7Idak1s1Hs3a9 +HvMPRYrzTM1JYu/PwlpPtkvnu2pj6AbZ2XmsbnECgYEAza6KD8J9T34MwiXnavvD +gp7hjYz56kVI1tv1/69q3M0tb3GfrqjiaRaTxw/Ip+udeZXib3q4i47xBhCFJcfS +QXr/p0dNWJdNwCVj5vygbzsXJ364HWiWETKDWdXoSXKUoMiWlfOb3rVO3cb6ASp9 +xIhR1iKd9cdngCSKE6M2mBECgYEAmpwhrbPhrO9X0+J1L8Qx8lfqtt+jM2gUaada +YgTP9KLoDhhcgh3FSYdNGPUtlJ0I9oFqBlscQWd82ts7CZdEmLdEwRMizrLJWqWf +6km2cwDjyy7vL/fv54hew6Gs5OjA3ujnjWO7Quc1aMsqSIsINSbO5Rjw0heDntF2 +4Jd0DOECgYAVhoMTEUCG2FjwT5WqLKexIj+OMC9+YQiGjivQTZEBX9+sAjIdjOcs +B3XYV09N+yYkoy9zmlA+JxUQ1jphvRqEKLC9T80++IIPZbqUzBGO0FQ245QnsYRs +rHKclC8iEbjXbkuJ/NLtkhHO2HMQyqpgB7UsHJLvNDrKKOgwcM8Xdg== -----END RSA PRIVATE KEY-----