Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

More robust pkcs8 migration script

Chocobozzz0f46a98fa7a6
diff --git a/server/core/helpers/custom-validators/misc.ts b/server/core/helpers/custom-validators/misc.ts
index ba34dc7ff2..96d9036dc5 100644
--- a/server/core/helpers/custom-validators/misc.ts
+++ b/server/core/helpers/custom-validators/misc.ts
@@ -3,7 +3,6 @@ import { UploadFilesForCheck } from 'express'
import 'multer'
import { sep } from 'path'
import validator from 'validator'
-import { logger } from '../logger.js'
export function exists (value: any) {
return value !== undefined && value !== null
diff --git a/server/core/initializers/migrations/0975-pkcs8.ts b/server/core/initializers/migrations/0975-pkcs8.ts
index 89106ebf8f..1aee608635 100644
--- a/server/core/initializers/migrations/0975-pkcs8.ts
+++ b/server/core/initializers/migrations/0975-pkcs8.ts
@@ -1,3 +1,4 @@
+import { logger } from '@server/helpers/logger.js'
import { createPrivateKey } from 'crypto'
import * as Sequelize from 'sequelize'
@@ -12,12 +13,16 @@ async function up (utils: {
)
for (const { id, privateKey } of rows) {
- const newPrivateKey = toPKCS8(privateKey)
-
- await utils.sequelize.query('UPDATE "actor" SET "privateKey" = :newPrivateKey WHERE "id" = :id', {
- replacements: { newPrivateKey, id },
- transaction: utils.transaction
- })
+ try {
+ const newPrivateKey = toPKCS8(privateKey)
+
+ await utils.sequelize.query('UPDATE "actor" SET "privateKey" = :newPrivateKey WHERE "id" = :id', {
+ replacements: { newPrivateKey, id },
+ transaction: utils.transaction
+ })
+ } catch (err) {
+ logger.error(`Failed to convert private key of actor ${id} to PKCS8 format`, { err })
+ }
}
}