From 88156c8cd8cd1dee9f1a5c95aecdf5517c951018 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Wed, 19 Jun 2024 09:12:22 -0400 Subject: [PATCH] small k8s bug patch --- .../v1/identity-kubernetes-auth-router.ts | 2 +- .../identity-kubernetes-auth-service.ts | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts b/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts index d20ea0edc..227345916 100644 --- a/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts +++ b/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts @@ -198,7 +198,7 @@ export const registerIdentityKubernetesRouter = async (server: FastifyZodProvide }), response: { 200: z.object({ - identityKubernetesAuth: IdentityKubernetesAuthsSchema + identityKubernetesAuth: IdentityKubernetesAuthResponseSchema }) } }, diff --git a/backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts b/backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts index 8ee8c36bd..f1e1c6be0 100644 --- a/backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts +++ b/backend/src/services/identity-kubernetes-auth/identity-kubernetes-auth-service.ts @@ -442,7 +442,34 @@ export const identityKubernetesAuthServiceFactory = ({ const updatedKubernetesAuth = await identityKubernetesAuthDAL.updateById(identityKubernetesAuth.id, updateQuery); - return { ...updatedKubernetesAuth, orgId: identityMembershipOrg.orgId }; + const updatedCACert = + updatedKubernetesAuth.encryptedCaCert && updatedKubernetesAuth.caCertIV && updatedKubernetesAuth.caCertTag + ? decryptSymmetric({ + ciphertext: updatedKubernetesAuth.encryptedCaCert, + iv: updatedKubernetesAuth.caCertIV, + tag: updatedKubernetesAuth.caCertTag, + key + }) + : ""; + + const updatedTokenReviewerJwt = + updatedKubernetesAuth.encryptedTokenReviewerJwt && + updatedKubernetesAuth.tokenReviewerJwtIV && + updatedKubernetesAuth.tokenReviewerJwtTag + ? decryptSymmetric({ + ciphertext: updatedKubernetesAuth.encryptedTokenReviewerJwt, + iv: updatedKubernetesAuth.tokenReviewerJwtIV, + tag: updatedKubernetesAuth.tokenReviewerJwtTag, + key + }) + : ""; + + return { + ...updatedKubernetesAuth, + orgId: identityMembershipOrg.orgId, + caCert: updatedCACert, + tokenReviewerJwt: updatedTokenReviewerJwt + }; }; const getKubernetesAuth = async ({