Add controller-led worker auth flow (#2413)
This adds an action to the API that allows pulling out an activation token that can be given to a worker in its config (directly or via env or file). The worker can pass this along with its normal request in place of its normal nonce and the server will automatically accept it. Co-authored-by: Irena Rindos <irenarindos@users.noreply.github.com>
This commit is contained in:
1 parent
a1be125f5b
commit
01fb949d0b
55 files changed
+2728
-625
No files matched your search
@@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/fatih/structs"
|
||||
"google.golang.org/protobuf/types/known/structpb"
|
||||
"google.golang.org/protobuf/types/known/timestamppb"
|
||||
|
||||
"github.com/hashicorp/boundary/internal/db"
|
||||
"github.com/hashicorp/boundary/internal/db/timestamp"
|
||||
@@ -85,6 +86,7 @@ func (r *WorkerAuthRepositoryStorage) Store(ctx context.Context, msg nodee.Messa
|
||||
}); err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
|
||||
case *types.RootCertificates:
|
||||
err := r.storeRootCertificates(ctx, t)
|
||||
if err != nil {
|
||||
@@ -343,6 +345,9 @@ func (r *WorkerAuthRepositoryStorage) Load(ctx context.Context, msg nodee.Messag
|
||||
case *types.NodeInformation:
|
||||
err = r.loadNodeInformation(ctx, t)
|
||||
|
||||
case *types.ServerLedActivationToken:
|
||||
err = r.loadServerLedActivationToken(ctx, t)
|
||||
|
||||
case *types.RootCertificates:
|
||||
err = r.loadRootCertificates(ctx, t)
|
||||
|
||||
@@ -416,6 +421,48 @@ func (r *WorkerAuthRepositoryStorage) loadNodeInformation(ctx context.Context, n
|
||||
return nil
|
||||
}
|
||||
|
||||
// Node information is loaded in two parts:
|
||||
// * the workerAuth record
|
||||
// * its certificate bundles
|
||||
func (r *WorkerAuthRepositoryStorage) loadServerLedActivationToken(ctx context.Context, token *types.ServerLedActivationToken) error {
|
||||
const op = "server.(WorkerAuthRepositoryStorage).loadServerLedActivationToken"
|
||||
if token == nil {
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "missing ServerLedActivationToken")
|
||||
}
|
||||
|
||||
activationTokenEntry := allocWorkerAuthServerLedActivationToken()
|
||||
|
||||
err := r.reader.LookupWhere(ctx, activationTokenEntry, "token_id = ?", []any{token.Id})
|
||||
if err != nil {
|
||||
if errors.Is(err, dbw.ErrRecordNotFound) {
|
||||
return nodee.ErrNotFound
|
||||
}
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
|
||||
token.State, err = AttachWorkerIdToState(ctx, activationTokenEntry.WorkerId)
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
|
||||
// Decrypt marshaled creation time
|
||||
databaseWrapper, err := r.kms.GetWrapper(ctx, scope.Global.String(), kms.KeyPurposeDatabase, kms.WithKeyId(activationTokenEntry.KeyId))
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
if err := activationTokenEntry.decrypt(ctx, databaseWrapper); err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
token.CreationTimeMarshaled = activationTokenEntry.CreationTime
|
||||
|
||||
token.CreationTime = new(timestamppb.Timestamp)
|
||||
if err := proto.Unmarshal(token.CreationTimeMarshaled, token.CreationTime); err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *WorkerAuthRepositoryStorage) findCertBundles(ctx context.Context, workerKeyId string) ([]*types.CertificateBundle, error) {
|
||||
const op = "server.(WorkerAuthRepositoryStorage).findCertBundles"
|
||||
if workerKeyId == "" {
|
||||
@@ -537,9 +584,14 @@ func (r *WorkerAuthRepositoryStorage) Remove(ctx context.Context, msg nodee.Mess
|
||||
}
|
||||
|
||||
// Determine type of message to remove
|
||||
switch msg.(type) {
|
||||
switch t := msg.(type) {
|
||||
case *types.NodeInformation:
|
||||
err := r.removeNodeInformation(ctx, msg.GetId())
|
||||
err := r.removeNodeInformation(ctx, t)
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
case *types.ServerLedActivationToken:
|
||||
err := r.removeServerLedActivationToken(ctx, t)
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
@@ -555,9 +607,12 @@ func (r *WorkerAuthRepositoryStorage) Remove(ctx context.Context, msg nodee.Mess
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *WorkerAuthRepositoryStorage) removeNodeInformation(ctx context.Context, id string) error {
|
||||
func (r *WorkerAuthRepositoryStorage) removeNodeInformation(ctx context.Context, msg *types.NodeInformation) error {
|
||||
const op = "server.(WorkerAuthRepositoryStorage).removeNodeInformation"
|
||||
if id == "" {
|
||||
switch {
|
||||
case msg == nil:
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "nil node information")
|
||||
case msg.Id == "":
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "empty id")
|
||||
}
|
||||
|
||||
@@ -567,11 +622,11 @@ func (r *WorkerAuthRepositoryStorage) removeNodeInformation(ctx context.Context,
|
||||
db.ExpBackoff{},
|
||||
func(reader db.Reader, w db.Writer) error {
|
||||
var err error
|
||||
_, err = w.Exec(ctx, deleteWorkerAuthQuery, []interface{}{sql.Named("worker_key_identifier", id)})
|
||||
_, err = w.Exec(ctx, deleteWorkerAuthQuery, []interface{}{sql.Named("worker_key_identifier", msg.Id)})
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
_, err = w.Exec(ctx, deleteWorkerCertBundlesQuery, []interface{}{sql.Named("worker_key_identifier", id)})
|
||||
_, err = w.Exec(ctx, deleteWorkerCertBundlesQuery, []interface{}{sql.Named("worker_key_identifier", msg.Id)})
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op, errors.WithMsg("unable to delete workerAuth"))
|
||||
}
|
||||
@@ -585,6 +640,49 @@ func (r *WorkerAuthRepositoryStorage) removeNodeInformation(ctx context.Context,
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *WorkerAuthRepositoryStorage) removeServerLedActivationToken(ctx context.Context, msg *types.ServerLedActivationToken) error {
|
||||
const op = "server.(WorkerAuthRepositoryStorage).removeServerLedActivationToken"
|
||||
switch {
|
||||
case msg == nil:
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "nil node information")
|
||||
case msg.Id == "":
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "empty id")
|
||||
case msg.State == nil:
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "missing state")
|
||||
}
|
||||
|
||||
var workerInfo workerAuthWorkerId
|
||||
if err := mapstructure.Decode(msg.State.AsMap(), &workerInfo); err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
if workerInfo.WorkerId == "" {
|
||||
return errors.New(ctx, errors.InvalidParameter, op, "state missing worker id")
|
||||
}
|
||||
|
||||
actToken := allocWorkerAuthServerLedActivationToken()
|
||||
actToken.WorkerId = workerInfo.WorkerId
|
||||
_, err := r.writer.DoTx(
|
||||
ctx,
|
||||
db.StdRetryCnt,
|
||||
db.ExpBackoff{},
|
||||
func(reader db.Reader, w db.Writer) error {
|
||||
rowsDeleted, err := w.Delete(ctx, actToken)
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
if rowsDeleted != 1 {
|
||||
return errors.New(ctx, errors.UnexpectedRowsAffected, op, fmt.Sprintf("expected to delete one activation token, deleted %d", rowsDeleted))
|
||||
}
|
||||
return nil
|
||||
},
|
||||
)
|
||||
if err != nil {
|
||||
return errors.Wrap(ctx, err, op)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *WorkerAuthRepositoryStorage) removeCertificateAuthority(ctx context.Context, cert *types.RootCertificates) error {
|
||||
const op = "server.(WorkerAuthRepositoryStorage).removeCertificateAuthority"
|
||||
|
||||
|
||||
Reference in new issue
Block a user