From 4c55305a49bf5e298a15ed5c594daffdb26c2f84 Mon Sep 17 00:00:00 2001 From: irenarindos Date: Mon, 6 Jun 2022 11:20:04 -0400 Subject: [PATCH] Remove nonce encryption for workerAuth --- internal/servers/repository_workerauth.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/internal/servers/repository_workerauth.go b/internal/servers/repository_workerauth.go index ef5db2bb9d..61970dec47 100644 --- a/internal/servers/repository_workerauth.go +++ b/internal/servers/repository_workerauth.go @@ -125,6 +125,7 @@ func StoreNodeInformationTx(ctx context.Context, writer db.Writer, databaseWrapp nodeAuth.WorkerKeyIdentifier = node.Id nodeAuth.WorkerEncryptionPubKey = node.EncryptionPublicKeyBytes nodeAuth.WorkerSigningPubKey = node.CertificatePublicKeyPkix + nodeAuth.Nonce = node.RegistrationNonce var err error nodeAuth.KeyId, err = databaseWrapper.KeyId(ctx) @@ -135,10 +136,6 @@ func StoreNodeInformationTx(ctx context.Context, writer db.Writer, databaseWrapp if err != nil { return errors.Wrap(ctx, err, op) } - nodeAuth.Nonce, err = encrypt(ctx, node.RegistrationNonce, databaseWrapper) - if err != nil { - return errors.Wrap(ctx, err, op) - } // Get workerId from state passed in var result workerAuthWorkerId @@ -383,6 +380,7 @@ func (r *WorkerAuthRepositoryStorage) loadNodeInformation(ctx context.Context, n node.EncryptionPublicKeyBytes = authorizedWorker.WorkerEncryptionPubKey node.CertificatePublicKeyPkix = authorizedWorker.WorkerSigningPubKey + node.RegistrationNonce = authorizedWorker.Nonce // Default values are used for key types node.EncryptionPublicKeyType = types.KEYTYPE_X25519 @@ -398,10 +396,6 @@ func (r *WorkerAuthRepositoryStorage) loadNodeInformation(ctx context.Context, n if err != nil { return errors.Wrap(ctx, err, op) } - node.RegistrationNonce, err = decrypt(ctx, authorizedWorker.Nonce, databaseWrapper) - if err != nil { - return errors.Wrap(ctx, err, op) - } // Get cert bundles from the other table certBundles, err := r.findCertBundles(ctx, node.Id)