Skip to content

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

Fix root password generation

Chocobozzzd46cd0ffa9eb
diff --git a/packages/tests/src/api/notifications/notifications-api.ts b/packages/tests/src/api/notifications/notifications-api.ts
index 44a9145962..3509522913 100644
--- a/packages/tests/src/api/notifications/notifications-api.ts
+++ b/packages/tests/src/api/notifications/notifications-api.ts
@@ -61,8 +61,6 @@ describe('Test notifications API', function () {
typeOneOf: [ UserNotificationType.ABUSE_NEW_MESSAGE, UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION ]
})
- console.log(data)
-
expect(data).to.have.lengthOf(2)
expect(total).to.equal(10)
}
diff --git a/packages/tests/src/server-helpers/index.ts b/packages/tests/src/server-helpers/index.ts
index 40e678e1eb..d699c04582 100644
--- a/packages/tests/src/server-helpers/index.ts
+++ b/packages/tests/src/server-helpers/index.ts
@@ -4,6 +4,7 @@ import './crypto.js'
import './dns.js'
import './image.js'
import './markdown.js'
+import './password.js'
import './mentions.js'
import './request.js'
import './validator.js'
diff --git a/packages/tests/src/server-helpers/password.ts b/packages/tests/src/server-helpers/password.ts
new file mode 100644
index 0000000000..a18d1958bb
--- /dev/null
+++ b/packages/tests/src/server-helpers/password.ts
@@ -0,0 +1,12 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import { ADMIN_MEMORABLE_PASSWORD_GENERATION_LENGTH } from '@peertube/peertube-server/core/initializers/constants.js'
+import { expect } from 'chai'
+import { generatePassword } from 'password-generator'
+
+describe('Password generation', function () {
+ it('Should correctly generate a password', async function () {
+ const password = await generatePassword(ADMIN_MEMORABLE_PASSWORD_GENERATION_LENGTH, true)
+
+ expect(password).to.have.lengthOf(20)
+ })
+})
diff --git a/server/core/initializers/constants.ts b/server/core/initializers/constants.ts
index 4c1f8e3bff..d68edb9924 100644
--- a/server/core/initializers/constants.ts
+++ b/server/core/initializers/constants.ts
@@ -909,6 +909,7 @@ export const ENCRYPTION = {
ENCODING: 'hex' as Encoding
}
+export const ADMIN_MEMORABLE_PASSWORD_GENERATION_LENGTH = 20
export const USER_PASSWORD_RESET_LIFETIME = 60000 * 60 // 60 minutes
export const USER_PASSWORD_CREATE_LIFETIME = 60000 * 60 * 24 * 7 // 7 days
diff --git a/server/core/initializers/installer.ts b/server/core/initializers/installer.ts
index b77b2cb325..4ae8a2f630 100644
--- a/server/core/initializers/installer.ts
+++ b/server/core/initializers/installer.ts
@@ -14,7 +14,7 @@ import { ApplicationModel } from '../models/application/application.js'
import { OAuthClientModel } from '../models/oauth/oauth-client.js'
import { applicationExist, clientsExist, usersExist } from './checker-after-init.js'
import { CONFIG } from './config.js'
-import { DIRECTORIES, FILES_CACHE, LAST_MIGRATION_VERSION } from './constants.js'
+import { ADMIN_MEMORABLE_PASSWORD_GENERATION_LENGTH, DIRECTORIES, FILES_CACHE, LAST_MIGRATION_VERSION } from './constants.js'
import { sequelizeTypescript } from './database.js'
async function installApplication () {
@@ -144,7 +144,7 @@ async function createOAuthAdminIfNotExist () {
} else if (process.env.PT_INITIAL_ROOT_PASSWORD) {
password = process.env.PT_INITIAL_ROOT_PASSWORD
} else {
- password = await generatePassword(16, true)
+ password = await generatePassword(ADMIN_MEMORABLE_PASSWORD_GENERATION_LENGTH, true)
}
const user = buildUser({