Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: manager generates mTLS certificates for arbitrary IP addresses #2615

Merged
merged 1 commit into from
Aug 9, 2023
Merged

fix: manager generates mTLS certificates for arbitrary IP addresses #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 7 additions & 30 deletions manager/rpcserver/security_server_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ import (
"crypto/x509"
"fmt"
"math/big"
"net"
"time"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/peer"
"google.golang.org/grpc/status"

securityv1 "d7y.io/api/v2/pkg/apis/security/v1"
Expand All @@ -53,57 +51,36 @@ func (s *securityServerV1) IssueCertificate(ctx context.Context, req *securityv1
return nil, status.Errorf(codes.Unavailable, "ca is missing for this manager instance")
}

var (
ip string
err error
)
p, ok := peer.FromContext(ctx)
if !ok {
return nil, status.Errorf(codes.InvalidArgument, "invalid grpc peer info")
}

if addr, ok := p.Addr.(*net.TCPAddr); ok {
ip = addr.IP.String()
} else {
ip, _, err = net.SplitHostPort(p.Addr.String())
if err != nil {
return nil, err
}
}

// Parse csr.
csr, err := x509.ParseCertificateRequest(req.Csr)
if err != nil {
return nil, status.Errorf(codes.InvalidArgument, "invalid csr format: %s", err.Error())
}

// Check csr signature.
// TODO check csr common name and so on.
if err = csr.CheckSignature(); err != nil {
return nil, err
}
logger.Infof("valid csr: %#v", csr.Subject)

// Check csr ip address.
if len(csr.IPAddresses) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "invalid csr ip address")
}

// Generate serial number.
serial, err := rand.Int(rand.Reader, (&big.Int{}).Exp(big.NewInt(2), big.NewInt(159), nil))
if err != nil {
return nil, err
}

// TODO only valid for peer ip
// BTW we need support both of ipv4 and ipv6.
ips := csr.IPAddresses
if len(ips) == 0 {
// Add default connected ip.
ips = []net.IP{net.ParseIP(ip)}
}

now := time.Now()
template := x509.Certificate{
SerialNumber: serial,
Subject: csr.Subject,
DNSNames: csr.DNSNames,
EmailAddresses: csr.EmailAddresses,
IPAddresses: ips,
IPAddresses: csr.IPAddresses,
URIs: csr.URIs,
NotBefore: now.Add(-10 * time.Minute).UTC(),
NotAfter: now.Add(req.ValidityPeriod.AsDuration()).UTC(),
Expand Down
13 changes: 2 additions & 11 deletions manager/rpcserver/security_server_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (

testifyassert "github.com/stretchr/testify/assert"
testifyrequire "github.com/stretchr/testify/require"
"google.golang.org/grpc/peer"
"google.golang.org/protobuf/types/known/durationpb"

securityv1 "d7y.io/api/v2/pkg/apis/security/v1"
Expand Down Expand Up @@ -60,6 +59,7 @@ func TestIssueCertificate(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
template := &x509.CertificateRequest{
IPAddresses: []net.IP{net.ParseIP(tc.peerIP)},
Subject: pkix.Name{
Country: []string{"China"},
Organization: []string{"Dragonfly"},
Expand Down Expand Up @@ -88,17 +88,8 @@ func TestIssueCertificate(t *testing.T) {
})
require.Nilf(err, "newServer should be ok")

ctx := peer.NewContext(
context.Background(),
&peer.Peer{
Addr: &net.TCPAddr{
IP: net.ParseIP(tc.peerIP),
Port: 65008,
},
})

resp, err := securityServerV1.IssueCertificate(
ctx,
context.Background(),
&securityv1.CertificateRequest{
Csr: csr,
ValidityPeriod: durationpb.New(time.Hour),
Expand Down