* chore(deps): bump the go group across 7 directories with 5 updates Bumps the go group with 4 updates in the / directory: [github.com/coder/websocket](https://github.com/coder/websocket), [github.com/docker/docker](https://github.com/docker/docker), [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) and [mvdan.cc/gofumpt](https://github.com/mvdan/gofumpt). Bumps the go group with 2 updates in the /api directory: [github.com/coder/websocket](https://github.com/coder/websocket) and [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/aws directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/azure directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/gcp directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /plugins/boundary/mains/minio directory: [github.com/hashicorp/boundary/sdk](https://github.com/hashicorp/boundary). Bumps the go group with 1 update in the /sdk directory: [github.com/coder/websocket](https://github.com/coder/websocket). Updates `github.com/coder/websocket` from 1.8.13 to 1.8.14 - [Release notes](https://github.com/coder/websocket/releases) - [Commits](https://github.com/coder/websocket/compare/v1.8.13...v1.8.14) Updates `github.com/docker/docker` from 28.3.3+incompatible to 28.4.0+incompatible - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v28.3.3...v28.4.0) Updates `github.com/prometheus/client_golang` from 1.23.0 to 1.23.2 - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.23.0...v1.23.2) Updates `mvdan.cc/gofumpt` from 0.8.0 to 0.9.0 - [Release notes](https://github.com/mvdan/gofumpt/releases) - [Changelog](https://github.com/mvdan/gofumpt/blob/master/CHANGELOG.md) - [Commits](https://github.com/mvdan/gofumpt/compare/v0.8.0...v0.9.0) Updates `github.com/coder/websocket` from 1.8.13 to 1.8.14 - [Release notes](https://github.com/coder/websocket/releases) - [Commits](https://github.com/coder/websocket/compare/v1.8.13...v1.8.14) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/hashicorp/boundary/sdk` from 0.0.54 to 0.0.55 - [Release notes](https://github.com/hashicorp/boundary/releases) - [Changelog](https://github.com/hashicorp/boundary/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/boundary/compare/api/v0.0.54...api/v0.0.55) Updates `github.com/coder/websocket` from 1.8.13 to 1.8.14 - [Release notes](https://github.com/coder/websocket/releases) - [Commits](https://github.com/coder/websocket/compare/v1.8.13...v1.8.14) --- updated-dependencies: - dependency-name: github.com/coder/websocket dependency-version: 1.8.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/docker/docker dependency-version: 28.4.0+incompatible dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/prometheus/client_golang dependency-version: 1.23.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: mvdan.cc/gofumpt dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/coder/websocket dependency-version: 1.8.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/hashicorp/boundary/sdk dependency-version: 0.0.55 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/coder/websocket dependency-version: 1.8.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * Format files with latest gofumpt --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
154 lines
4.5 KiB
Go
154 lines
4.5 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package vault
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/hashicorp/boundary/internal/credential/vault/store"
|
|
"github.com/hashicorp/boundary/internal/db"
|
|
"github.com/hashicorp/boundary/internal/errors"
|
|
"github.com/hashicorp/boundary/internal/libs/crypto"
|
|
"github.com/hashicorp/boundary/internal/oplog"
|
|
wrapping "github.com/hashicorp/go-kms-wrapping/v2"
|
|
"github.com/hashicorp/go-kms-wrapping/v2/extras/structwrapping"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
// ClientCertificate contains a client certificate and a private key for
|
|
// the certificate. It is owned by a credential store.
|
|
type ClientCertificate struct {
|
|
*store.ClientCertificate
|
|
tableName string `gorm:"-"`
|
|
}
|
|
|
|
// NewClientCertificate creates a new in memory ClientCertificate.
|
|
func NewClientCertificate(ctx context.Context, certificate []byte, key KeySecret) (*ClientCertificate, error) {
|
|
const op = "vault.NewClientCertificate"
|
|
if len(certificate) == 0 {
|
|
return nil, errors.New(ctx, errors.InvalidParameter, op, "no certificate")
|
|
}
|
|
|
|
certificateCopy := make([]byte, len(certificate))
|
|
copy(certificateCopy, certificate)
|
|
|
|
var keyCopy KeySecret
|
|
if len(key) > 0 {
|
|
keyCopy = make(KeySecret, len(key))
|
|
copy(keyCopy, key)
|
|
}
|
|
|
|
c := &ClientCertificate{
|
|
ClientCertificate: &store.ClientCertificate{
|
|
Certificate: certificateCopy,
|
|
CertificateKey: keyCopy,
|
|
},
|
|
}
|
|
return c, nil
|
|
}
|
|
|
|
func allocClientCertificate() *ClientCertificate {
|
|
return &ClientCertificate{
|
|
ClientCertificate: &store.ClientCertificate{},
|
|
}
|
|
}
|
|
|
|
func (c *ClientCertificate) clone() *ClientCertificate {
|
|
cp := proto.Clone(c.ClientCertificate)
|
|
return &ClientCertificate{
|
|
ClientCertificate: cp.(*store.ClientCertificate),
|
|
}
|
|
}
|
|
|
|
// TableName returns the table name.
|
|
func (c *ClientCertificate) TableName() string {
|
|
if c.tableName != "" {
|
|
return c.tableName
|
|
}
|
|
return "credential_vault_client_certificate"
|
|
}
|
|
|
|
// SetTableName sets the table name.
|
|
func (c *ClientCertificate) SetTableName(n string) {
|
|
c.tableName = n
|
|
}
|
|
|
|
func (c *ClientCertificate) encrypt(ctx context.Context, cipher wrapping.Wrapper) error {
|
|
const op = "vault.(ClientCertificate).encrypt"
|
|
if len(c.CertificateKey) == 0 {
|
|
return errors.New(ctx, errors.InvalidParameter, op, "no certificate key defined")
|
|
}
|
|
if err := structwrapping.WrapStruct(ctx, cipher, c.ClientCertificate, nil); err != nil {
|
|
return errors.Wrap(ctx, err, op, errors.WithCode(errors.Encrypt))
|
|
}
|
|
keyId, err := cipher.KeyId(ctx)
|
|
if err != nil {
|
|
return errors.Wrap(ctx, err, op, errors.WithCode(errors.Encrypt), errors.WithMsg("error reading cipher key id"))
|
|
}
|
|
c.KeyId = keyId
|
|
if err := c.hmacCertificateKey(ctx, cipher); err != nil {
|
|
return errors.Wrap(ctx, err, op)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (c *ClientCertificate) decrypt(ctx context.Context, cipher wrapping.Wrapper) error {
|
|
const op = "vault.(ClientCertificate).decrypt"
|
|
if err := structwrapping.UnwrapStruct(ctx, cipher, c.ClientCertificate, nil); err != nil {
|
|
return errors.Wrap(ctx, err, op, errors.WithCode(errors.Decrypt))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (c *ClientCertificate) hmacCertificateKey(ctx context.Context, cipher wrapping.Wrapper) error {
|
|
const op = "vault.(ClientCertificate).hmacCertificateKey"
|
|
if cipher == nil {
|
|
return errors.New(ctx, errors.InvalidParameter, op, "missing cipher")
|
|
}
|
|
// this operation currently uses the legacy WithEd25519 option for hmac'ing.
|
|
// we should likely deprecate this and introduce a new "crypto version" of
|
|
// this attribute.
|
|
hm, err := crypto.HmacSha256(ctx, c.CertificateKey, cipher, []byte(c.StoreId), nil, crypto.WithEd25519())
|
|
if err != nil {
|
|
return errors.Wrap(ctx, err, op)
|
|
}
|
|
c.CertificateKeyHmac = []byte(hm)
|
|
return nil
|
|
}
|
|
|
|
func (c *ClientCertificate) insertQuery() (query string, queryValues []any) {
|
|
query = upsertClientCertQuery
|
|
queryValues = []any{
|
|
sql.Named("store_id", c.StoreId),
|
|
sql.Named("certificate", c.Certificate),
|
|
sql.Named("certificate_key", c.CtCertificateKey),
|
|
sql.Named("certificate_key_hmac", c.CertificateKeyHmac),
|
|
sql.Named("key_id", c.KeyId),
|
|
}
|
|
return query, queryValues
|
|
}
|
|
|
|
func (c *ClientCertificate) deleteQuery() (query string, queryValues []any) {
|
|
query = deleteClientCertQuery
|
|
queryValues = []any{
|
|
c.StoreId,
|
|
}
|
|
return query, queryValues
|
|
}
|
|
|
|
func (c *ClientCertificate) oplogMessage(opType db.OpType) *oplog.Message {
|
|
msg := oplog.Message{
|
|
Message: c.clone(),
|
|
TypeName: c.TableName(),
|
|
}
|
|
switch opType {
|
|
case db.CreateOp, db.UpdateOp:
|
|
msg.OpType = oplog.OpType_OP_TYPE_CREATE
|
|
case db.DeleteOp:
|
|
msg.OpType = oplog.OpType_OP_TYPE_DELETE
|
|
}
|
|
return &msg
|
|
}
|