mirror of
https://github.com/gravitational/teleport
synced 2024-10-22 02:03:24 +00:00
Parse all CAs in CertPoolFromCertAuthorities
Returning certPool prematurely omits all but the first CA cert.
This commit is contained in:
parent
826ed676fa
commit
7be86582de
|
@ -305,7 +305,6 @@ func CertPoolFromCertAuthorities(cas []CertAuthority) (*x509.CertPool, error) {
|
|||
}
|
||||
certPool.AddCert(cert)
|
||||
}
|
||||
return certPool, nil
|
||||
}
|
||||
return certPool, nil
|
||||
}
|
||||
|
|
78
lib/services/authority_test.go
Normal file
78
lib/services/authority_test.go
Normal file
|
@ -0,0 +1,78 @@
|
|||
/*
|
||||
Copyright 2021 Gravitational, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package services
|
||||
|
||||
import (
|
||||
"crypto/x509/pkix"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/gravitational/teleport/api/types"
|
||||
"github.com/gravitational/teleport/lib/tlsca"
|
||||
)
|
||||
|
||||
func TestCertPoolFromCertAuthorities(t *testing.T) {
|
||||
// CA for cluster1 with 1 key pair.
|
||||
key, cert, err := tlsca.GenerateSelfSignedCA(pkix.Name{CommonName: "cluster1"}, nil, time.Minute)
|
||||
require.NoError(t, err)
|
||||
ca1 := types.NewCertAuthority(types.CertAuthoritySpecV2{
|
||||
Type: types.HostCA,
|
||||
ClusterName: "cluster1",
|
||||
TLSKeyPairs: []types.TLSKeyPair{{
|
||||
Cert: cert,
|
||||
Key: key,
|
||||
}},
|
||||
})
|
||||
// CA for cluster2 with 2 key pairs.
|
||||
key, cert, err = tlsca.GenerateSelfSignedCA(pkix.Name{CommonName: "cluster2"}, nil, time.Minute)
|
||||
require.NoError(t, err)
|
||||
key2, cert2, err := tlsca.GenerateSelfSignedCA(pkix.Name{CommonName: "cluster2"}, nil, time.Minute)
|
||||
require.NoError(t, err)
|
||||
ca2 := types.NewCertAuthority(types.CertAuthoritySpecV2{
|
||||
Type: types.HostCA,
|
||||
ClusterName: "cluster2",
|
||||
TLSKeyPairs: []types.TLSKeyPair{
|
||||
{
|
||||
Cert: cert,
|
||||
Key: key,
|
||||
},
|
||||
{
|
||||
Cert: cert2,
|
||||
Key: key2,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
t.Run("ca1 with 1 cert", func(t *testing.T) {
|
||||
pool, err := CertPoolFromCertAuthorities([]CertAuthority{ca1})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, pool.Subjects(), 1)
|
||||
})
|
||||
t.Run("ca2 with 2 certs", func(t *testing.T) {
|
||||
pool, err := CertPoolFromCertAuthorities([]CertAuthority{ca2})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, pool.Subjects(), 2)
|
||||
})
|
||||
|
||||
t.Run("ca1 + ca2 with 3 certs total", func(t *testing.T) {
|
||||
pool, err := CertPoolFromCertAuthorities([]CertAuthority{ca1, ca2})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, pool.Subjects(), 3)
|
||||
})
|
||||
}
|
Loading…
Reference in a new issue