Files
ziti/router/handler_edge_ctrl/extendEnrollmentCerts.go
T
Andrew Martinez 3e5f08c99f adds cert authenticator extension endpoint
- adds endpoint POST /edge/management/v1/authenticator/{id}/extend
- adds endpoint POST /edge/management/v1/authenticator/{id}/extend-verify
- adds endpoint POST /edge/client/v1/authenticator/{id}/extend
- adds endpoint POST /edge/client/v1/authenticator/{id}/extend-verify
- add logic that allows a client endpoint to extend the valid period for
  their current certificate authenticator
- requires clients to use their existing client cetificate for extension
- requires clients to verify they have received the new public key
- allows clients to use a new private key if desired
- allows only 1st party certificate authenticators to extend
- adds authenticatorId to apiSession for persistence, model, api model
- add session cert to already authenticated session on extend
- removes empty test stub
2022-03-02 09:20:08 -05:00

132 lines
4.0 KiB
Go

/*
Copyright NetFoundry, 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
https://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 handler_edge_ctrl
import (
"crypto/sha1"
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel"
"github.com/openziti/channel/protobufs"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/edge/pb/edge_ctrl_pb"
"github.com/openziti/foundation/identity/identity"
nfpem "github.com/openziti/foundation/util/pem"
"time"
)
type extendEnrollmentCertsHandler struct {
id *identity.TokenId
notifyCertUpdate func()
}
func NewExtendEnrollmentCertsHandler(id *identity.TokenId, notifyCertUpdate func()) *extendEnrollmentCertsHandler {
return &extendEnrollmentCertsHandler{
id: id,
notifyCertUpdate: notifyCertUpdate,
}
}
func (h *extendEnrollmentCertsHandler) ContentType() int32 {
return env.EnrollmentCertsResponseType
}
func (h *extendEnrollmentCertsHandler) HandleReceive(msg *channel.Message, ch channel.Channel) {
go func() {
certs := ch.Underlay().Certificates()
fingerprint := "none"
if len(certs) > 0 {
fingerprint = cert.NewFingerprintGenerator().FromCert(certs[0])
}
log := pfxlog.Logger().WithFields(map[string]interface{}{
"channel": ch.LogicalName(),
"fingerprint": fingerprint,
})
enrollmentCerts := &edge_ctrl_pb.EnrollmentCertsResponse{}
if err := proto.Unmarshal(msg.Body, enrollmentCerts); err == nil {
if enrollmentCerts.ClientCertPem == "" {
log.Error("expected enrollment certs response to contain a client cert")
return
}
if enrollmentCerts.ServerCertPem == "" {
log.Error("expected enrollment certs response to contain a server cert")
return
}
certs := nfpem.PemStringToCertificates(enrollmentCerts.ClientCertPem)
if len(certs) == 0 {
log.Error("could not parse client certificate during enrollment extension")
return
}
if err != nil {
log.WithError(err).Error("error during enrollment extension, could not sign client certificate")
return
}
verifyRequest := &edge_ctrl_pb.EnrollmentExtendRouterVerifyRequest{
ClientCertPem: enrollmentCerts.ClientCertPem,
}
replyMsg, err := protobufs.MarshalTyped(verifyRequest).WithTimeout(30 * time.Second).SendForReply(ch)
reply := &edge_ctrl_pb.Error{}
err = protobufs.TypedResponse(reply).Unmarshall(replyMsg, err)
if err != nil {
log.WithError(err).Errorf("error during enrollment extension, verification reply produced an error")
return
}
if reply.Code != "" {
log.WithError(err).WithFields(map[string]interface{}{
"replyCode": reply.Code,
"replyMessage": reply.Message,
}).Errorf("error during enrollment extension, verification reply resulted in an error")
return
}
if err := h.id.SetCert(enrollmentCerts.ClientCertPem); err != nil {
log.WithError(err).Error("enrollment extension could not set client pem")
}
if err := h.id.SetServerCert(enrollmentCerts.ServerCertPem); err != nil {
pfxlog.Logger().WithError(err).Error("enrollment extension could not set server pem")
}
if err := h.id.Reload(); err == nil {
h.notifyCertUpdate()
} else {
log.WithError(err).Errorf("could not reload extended certificates, please manually restart the router")
}
newFingerprint := fmt.Sprintf("%x", sha1.Sum(h.id.Cert().Certificate[0]))
log.WithField("newFingerprint", newFingerprint).Info("enrollment extension done")
} else {
log.Error("could not convert message as enrollment certs response")
}
}()
}