From 79f7d259e9a3705fc7a50fab552359a43c47a409 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 15 Feb 2023 13:55:33 +0000 Subject: [PATCH] Merge pull request #11833 from overleaf/jpa-v2-fallback [access-token-encryptor] scripts: fallback version to v2 GitOrigin-RevId: 232e6b1f6b8667a58c5fd0f5caf604209f100809 --- .../scripts/helpers/re-encrypt-tokens.js | 3 ++- services/web/scripts/count_encrypted_access_tokens.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/access-token-encryptor/scripts/helpers/re-encrypt-tokens.js b/libraries/access-token-encryptor/scripts/helpers/re-encrypt-tokens.js index 2d75620ce9..abf4d53c12 100644 --- a/libraries/access-token-encryptor/scripts/helpers/re-encrypt-tokens.js +++ b/libraries/access-token-encryptor/scripts/helpers/re-encrypt-tokens.js @@ -70,7 +70,8 @@ async function reEncryptTokensInCollection({ if (!blob) continue // Schema: LABEL-VERSION:SALT:CIPHERTEXT:IV const [label] = blob.split(':') - const [, version] = label.split('-') + let [, version] = label.split('-') + version = version || 'v2' const key = [name, version, collectionName, path, label].join(':') stats[key] = (stats[key] || 0) + 1 diff --git a/services/web/scripts/count_encrypted_access_tokens.js b/services/web/scripts/count_encrypted_access_tokens.js index d53bbe9824..f41bdf38a1 100644 --- a/services/web/scripts/count_encrypted_access_tokens.js +++ b/services/web/scripts/count_encrypted_access_tokens.js @@ -42,7 +42,8 @@ async function count(collectionName, paths) { if (!blob) continue // Schema: LABEL-VERSION:SALT:CIPHERTEXT:IV const [label] = blob.split(':') - const [, version] = label.split('-') + let [, version] = label.split('-') + version = version || 'v2' const key = [name, version, collectionName, path, label].join(':') stats[key] = (stats[key] || 0) + 1