TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-22 11:16:01 +03:00
Code Issues Projects Releases Wiki Activity

Updated uuid to crypto.randomUUID() (#20821)

Browse Source 
The uuid package README suggests using the node builtin `crypto` library if
we're only using uuid.v4, which we are.
This commit is contained in:
Sirichai Chulee 2024-09-12 09:09:30 +07:00 committed by GitHub
parent 2cb9cf8b8b
commit 58ca6f3d95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 52 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghost/core/core/server/data/importer/import-manager.js
View File

@ -3,7 +3,7 @@ const fs = require('fs-extra');
const path = require('path');
const os = require('os');
const glob = require('glob');
const uuid = require('uuid');
const crypto = require('crypto');
const config = require('../../../shared/config');
const {extract} = require('@tryghost/zip');
const tpl = require('@tryghost/tpl');
@ -220,7 +220,7 @@ class ImportManager {
* @returns {Promise<string>} full path to the extracted folder
*/
async extractZip(filePath) {
const tmpDir = path.join(os.tmpdir(), uuid.v4());
const tmpDir = path.join(os.tmpdir(), crypto.randomUUID());
this.fileToDelete = tmpDir;
try {

4
ghost/core/core/server/data/importer/importers/data/PostsImporter.js
View File

@ -1,6 +1,6 @@
const debug = require('@tryghost/debug')('importer:posts');
const _ = require('lodash');
const uuid = require('uuid');
const crypto = require('crypto');
const BaseImporter = require('./Base');
const mobiledocLib = require('../../../../lib/mobiledoc');
const validator = require('@tryghost/validator');
@ -29,7 +29,7 @@ class PostsImporter extends BaseImporter {
sanitizeAttributes() {
_.each(this.dataToImport, (obj) => {
if (!validator.isUUID(obj.uuid || '')) {
obj.uuid = uuid.v4();
obj.uuid = crypto.randomUUID();
}
// we used to have post.page=true/false

4
ghost/core/core/server/data/migrations/versions/4.46/2022-04-13-12-58-fill-uuid-for-newsletters.js
View File

@ -1,5 +1,5 @@
const logging = require('@tryghost/logging');
const uuid = require('uuid');
const crypto = require('crypto');
const {createTransactionalMigration} = require('../../utils');
module.exports = createTransactionalMigration(
@ -10,7 +10,7 @@ module.exports = createTransactionalMigration(
// eslint-disable-next-line no-restricted-syntax
for (const newsletter of newslettersWithoutUUID) {
await knex('newsletters').update('uuid', uuid.v4()).where('id', newsletter.id);
await knex('newsletters').update('uuid', crypto.randomUUID()).where('id', newsletter.id);
}
},
async function down() {

4
ghost/core/core/server/data/migrations/versions/4.46/2022-04-13-13-00-add-default-newsletter.js
View File

@ -1,5 +1,5 @@
const ObjectId = require('bson-objectid').default;
const uuid = require('uuid');
const crypto = require('crypto');
const logging = require('@tryghost/logging');
const startsWith = require('lodash/startsWith');
const {createTransactionalMigration} = require('../../utils');
@ -9,7 +9,7 @@ module.exports = createTransactionalMigration(
// This uses the default settings from core/server/data/schema/default-settings/default-settings.json
const newsletter = {
id: (new ObjectId()).toHexString(),
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
name: 'Ghost',
description: '',
slug: 'default-newsletter',

4
ghost/core/core/server/models/email.js
View File

@ -1,4 +1,4 @@
const uuid = require('uuid');
const crypto = require('crypto');
const ghostBookshelf = require('./base');
const Email = ghostBookshelf.Model.extend({
@ -6,7 +6,7 @@ const Email = ghostBookshelf.Model.extend({
defaults: function defaults() {
return {
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
status: 'pending',
recipient_filter: 'status:-free',
track_opens: false,

6
ghost/core/core/server/models/member.js
View File

@ -1,5 +1,5 @@
const ghostBookshelf = require('./base');
const uuid = require('uuid');
const crypto = require('crypto');
const _ = require('lodash');
const config = require('../../shared/config');
const {gravatar} = require('../lib/image');
@ -10,8 +10,8 @@ const Member = ghostBookshelf.Model.extend({
defaults() {
return {
status: 'free',
uuid: uuid.v4(),
transient_id: uuid.v4(),
uuid: crypto.randomUUID(),
transient_id: crypto.randomUUID(),
email_count: 0,
email_opened_count: 0,
enable_comment_notifications: true

4
ghost/core/core/server/models/newsletter.js
View File

@ -1,6 +1,6 @@
const ghostBookshelf = require('./base');
const ObjectID = require('bson-objectid').default;
const uuid = require('uuid');
const crypto = require('crypto');
const urlUtils = require('../../shared/url-utils');
const Newsletter = ghostBookshelf.Model.extend({
@ -8,7 +8,7 @@ const Newsletter = ghostBookshelf.Model.extend({
defaults: function defaults() {
return {
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
sender_reply_to: 'newsletter',
status: 'active',
visibility: 'members',

4
ghost/core/core/server/models/post.js
View File

@ -1,6 +1,6 @@
// # Post Model
const _ = require('lodash');
const uuid = require('uuid');
const crypto = require('crypto');
const moment = require('moment');
const {sequence} = require('@tryghost/promise');
const tpl = require('@tryghost/tpl');
@ -89,7 +89,7 @@ Post = ghostBookshelf.Model.extend({
}
return {
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
status: 'draft',
featured: false,
type: 'post',

3
ghost/core/core/server/models/settings.js
View File

@ -1,5 +1,4 @@
const _ = require('lodash');
const uuid = require('uuid');
const crypto = require('crypto');
const keypair = require('keypair');
const ObjectID = require('bson-objectid').default;
@ -50,7 +49,7 @@ function parseDefaultSettings() {
const defaultSettingsFlattened = {};
const dynamicDefault = {
db_hash: () => uuid.v4(),
db_hash: () => crypto.randomUUID(),
public_hash: () => crypto.randomBytes(15).toString('hex'),
admin_session_secret: () => crypto.randomBytes(32).toString('hex'),
theme_session_secret: () => crypto.randomBytes(32).toString('hex'),

4
ghost/core/core/server/web/parent/middleware/request-id.js
View File

@ -1,4 +1,4 @@
const uuid = require('uuid');
const crypto = require('crypto');
/**
* @TODO: move this middleware to Framework monorepo?
@ -8,7 +8,7 @@ const uuid = require('uuid');
* @param {import('express').NextFunction} next
*/
module.exports = function requestIdMw(req, res, next) {
const requestId = req.get('X-Request-ID') || uuid.v4();
const requestId = req.get('X-Request-ID') || crypto.randomUUID();
// Set a value for internal use
req.requestId = requestId;

1
ghost/core/package.json
View File

@ -220,7 +220,6 @@
"sanitize-html": "2.13.0",
"semver": "7.6.3",
"stoppable": "1.1.0",
"uuid": "9.0.1",
"ws": "8.18.0",
"xml": "1.0.1",
"y-protocols": "1.0.6",

4
ghost/core/test/e2e-api/admin/members-exporter.test.js
View File

@ -1,7 +1,7 @@
const {agentProvider, mockManager, fixtureManager, matchers} = require('../../utils/e2e-framework');
const {anyContentVersion, anyEtag, anyString, anyContentLength} = matchers;
const uuid = require('uuid');
const crypto = require('crypto');
const should = require('should');
const Papa = require('papaparse');
const models = require('../../../core/server/models');
@ -9,7 +9,7 @@ const moment = require('moment');
async function createMember(data) {
const member = await models.Member.add({
email: uuid.v4() + '@example.com',
email: crypto.randomUUID() + '@example.com',
name: '',
email_disabled: false,
...data

4
ghost/core/test/regression/api/admin/db.test.js
View File

@ -2,7 +2,7 @@ const path = require('path');
const _ = require('lodash');
const os = require('os');
const fs = require('fs-extra');
const uuid = require('uuid');
const crypto = require('crypto');
const should = require('should');
const supertest = require('supertest');
const sinon = require('sinon');
@ -61,7 +61,7 @@ describe('DB API', function () {
});
it('can export & import', function () {
const exportFolder = path.join(os.tmpdir(), uuid.v4());
const exportFolder = path.join(os.tmpdir(), crypto.randomUUID());
const exportPath = path.join(exportFolder, 'export.json');
return request.put(localUtils.API.getApiQuery('settings/'))

4
ghost/core/test/regression/api/admin/redirects.test.js
View File

@ -3,7 +3,7 @@ const supertest = require('supertest');
const fs = require('fs-extra');
const path = require('path');
const os = require('os');
const uuid = require('uuid');
const crypto = require('crypto');
const localUtils = require('./utils');
const config = require('../../../../core/shared/config');
@ -23,7 +23,7 @@ describe('Redirects API', function () {
// which is currently impossible with available test utils.
// The test itself should be broken down into a unit test for the
// Redirects service class.
const contentFolder = path.join(os.tmpdir(), uuid.v4(), 'ghost-test');
const contentFolder = path.join(os.tmpdir(), crypto.randomUUID(), 'ghost-test');
fs.ensureDirSync(contentFolder);
fs.ensureDirSync(path.join(contentFolder, 'data'));
fs.writeFileSync(path.join(contentFolder, 'data', 'redirects.json'), JSON.stringify([]));

4
ghost/core/test/utils/e2e-framework.js
View File

@ -20,7 +20,7 @@ const {AsymmetricMatcher} = require('expect');
const fs = require('fs-extra');
const path = require('path');
const os = require('os');
const uuid = require('uuid');
const crypto = require('crypto');
const fixtureUtils = require('./fixture-utils');
const redirectsUtils = require('./redirects');
@ -64,7 +64,7 @@ const startGhost = async (options = {}) => {
* We never use the root content folder for testing!
* We use a tmp folder.
*/
const contentFolder = path.join(os.tmpdir(), uuid.v4(), 'ghost-test');
const contentFolder = path.join(os.tmpdir(), crypto.randomUUID(), 'ghost-test');
await prepareContentFolder({contentFolder});
// NOTE: need to pass this config to the server instance

4
ghost/core/test/utils/e2e-utils.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const fs = require('fs-extra');
const path = require('path');
const os = require('os');
const uuid = require('uuid');
const crypto = require('crypto');
// Ghost Internals
const boot = require('../../core/boot');
@ -213,7 +213,7 @@ const startGhost = async (options) => {
forceStart: false,
copyThemes: false,
copySettings: false,
contentFolder: path.join(os.tmpdir(), uuid.v4(), 'ghost-test'),
contentFolder: path.join(os.tmpdir(), crypto.randomUUID(), 'ghost-test'),
subdir: false
}, options);

4
ghost/core/test/utils/fixture-utils.js
View File

@ -2,7 +2,7 @@
const _ = require('lodash');
const path = require('path');
const fs = require('fs-extra');
const uuid = require('uuid');
const crypto = require('crypto');
const ObjectId = require('bson-objectid').default;
const KnexMigrator = require('knex-migrator');
const {sequence} = require('@tryghost/promise');
@ -160,7 +160,7 @@ const fixtures = {
let i;
for (i = 0; i < max; i += 1) {
tagName = uuid.v4().split('-')[0];
tagName = crypto.randomUUID().split('-')[0];
tags.push(DataGenerator.forKnex.createBasic({name: tagName, slug: tagName}));
}

12
ghost/core/test/utils/fixtures/data-generator.js
View File

@ -1,5 +1,5 @@
const _ = require('lodash');
const uuid = require('uuid');
const crypto = require('crypto');
const ObjectId = require('bson-objectid').default;
const moment = require('moment');
const constants = require('@tryghost/constants');
@ -1037,7 +1037,7 @@ DataGenerator.forKnex = (function () {
return _.defaults(newObj, {
id: ObjectId().toHexString(),
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
title: 'title',
status: 'published',
feature_image: null,
@ -1107,7 +1107,7 @@ DataGenerator.forKnex = (function () {
return _.defaults(newObj, {
id: ObjectId().toHexString(),
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
secret: 'not_available',
redirection_uri: 'http://localhost:9999',
client_uri: 'http://localhost:9000',
@ -1156,7 +1156,7 @@ DataGenerator.forKnex = (function () {
const newObj = _.cloneDeep(overrides);
return _.defaults(newObj, {
id: ObjectId().toHexString(),
uuid: uuid.v4(),
uuid: crypto.randomUUID(),
slug: 'daily-newsletter',
name: 'Daily Newsletter',
sender_name: 'Jamie Larsen',
@ -1299,7 +1299,7 @@ DataGenerator.forKnex = (function () {
return _.defaults(newObj, {
id: ObjectId().toHexString(),
token: uuid.v4(),
token: crypto.randomUUID(),
expires: Date.now() + constants.ONE_DAY_MS
});
}
@ -1309,7 +1309,7 @@ DataGenerator.forKnex = (function () {
return _.defaults(newObj, {
id: ObjectId().toHexString(),
token: uuid.v4(),
token: crypto.randomUUID(),
email: 'test@ghost.org',
role_id: DataGenerator.Content.roles[0].id,
expires: Date.now() + (60 * 1000),

4
ghost/members-api/lib/repositories/MemberRepository.js
View File

@ -7,7 +7,7 @@ const {SubscriptionActivatedEvent, MemberCreatedEvent, SubscriptionCreatedEvent,
const ObjectId = require('bson-objectid').default;
const {NotFoundError} = require('@tryghost/errors');
const validator = require('@tryghost/validator');
const uuid = require('uuid');
const crypto = require('crypto');
const messages = {
noStripeConnection: 'Cannot {action} without a Stripe Connection',
@ -228,7 +228,7 @@ module.exports = class MemberRepository {
}
_generateTransientId() {
return uuid.v4();
return crypto.randomUUID();
}
async cycleTransientId({id, email}) {

18
ghost/security/test/tokens.test.js
View File

@ -1,12 +1,12 @@
require('./utils');
const should = require('should');
const uuid = require('uuid');
const crypto = require('crypto');
const security = require('../');
describe('Utils: tokens', function () {
it('generate', function () {
const expires = Date.now() + 60 * 1000;
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
token = security.tokens.resetToken.generateHash({
@ -22,7 +22,7 @@ describe('Utils: tokens', function () {
it('compare: success', function () {
const expires = Date.now() + 60 * 1000;
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let tokenIsCorrect;
@ -45,7 +45,7 @@ describe('Utils: tokens', function () {
it('compare: error from invalid password', function () {
const expires = Date.now() + 60 * 1000;
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let tokenIsCorrect;
@ -68,7 +68,7 @@ describe('Utils: tokens', function () {
it('compare: error from invalid expires parameter', function () {
const invalidDate = 'not a date';
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let tokenIsCorrect;
@ -91,7 +91,7 @@ describe('Utils: tokens', function () {
it('compare: error from expired token', function () {
const dateInThePast = Date.now() - 60 * 1000;
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let tokenIsCorrect;
@ -114,7 +114,7 @@ describe('Utils: tokens', function () {
it('extract', function () {
const expires = Date.now() + 60 * 1000;
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let parts;
const email = 'test1@ghost.org';
@ -138,7 +138,7 @@ describe('Utils: tokens', function () {
it('extract - hashed password', function () {
const expires = Date.now() + 60 * 1000;
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let parts;
const email = 'test3@ghost.org';
@ -163,7 +163,7 @@ describe('Utils: tokens', function () {
it('can validate an URI encoded reset token', function () {
const expires = Date.now() + 60 * 1000;
const email = 'test1@ghost.org';
const dbHash = uuid.v4();
const dbHash = crypto.randomUUID();
let token;
let tokenIsCorrect;
let parts;

6
ghost/update-check-service/test/update-check-service.test.js
View File

@ -2,7 +2,7 @@ require('./utils');
const sinon = require('sinon');
const moment = require('moment');
const uuid = require('uuid');
const crypto = require('crypto');
const assert = require('assert/strict');
const logging = require('@tryghost/logging');
@ -196,7 +196,7 @@ describe('Update Check', function () {
id: 1,
custom: 0,
messages: [{
id: uuid.v4(),
id: crypto.randomUUID(),
version: '999.9.x',
content: '<p>Hey there! This is for 999.9.0 version</p>',
dismissible: true,
@ -268,7 +268,7 @@ describe('Update Check', function () {
const notification = {
id: 1,
messages: [{
id: uuid.v4(),
id: crypto.randomUUID(),
version: 'custom1',
content: '<p>Critical message. Upgrade your site!</p>',
dismissible: false,