Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-25 02:31:59 -05:00
Code Issues Activity

Replaced i18n.t w/ tpl helper in spam-prevention (#13425)

Browse source 
refs: TryGhost#13380

The i18n package is deprecated. It is being replaced with the tpl package.
This commit is contained in:
Ozan Uslan 2021-10-04 12:03:21 +03:00 • committed by GitHub
parent acf4a4b227
commit b97aadd840
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
core/server/web/shared/middlewares/api/spam-prevention.js
View file

@ -3,10 +3,26 @@ const extend = require('lodash/extend');
const pick = require('lodash/pick');
const errors = require('@tryghost/errors');
const config = require('../../../../../shared/config');
const i18n = require('../../../../../shared/i18n');
const tpl = require('@tryghost/tpl');
const logging = require('@tryghost/logging');
const spam = config.get('spam') || {};
const messages = {
forgottenPasswordEmail: {
error: 'Only {rfa} forgotten password attempts per email every {rfp} seconds.',
context: 'Forgotten password reset attempt failed'
},
forgottenPasswordIp: {
error: 'Only {rfa} tries per IP address every {rfp} seconds.',
context: 'Forgotten password reset attempt failed'
},
tooManySigninAttempts: {
error: 'Only {rateSigninAttempts} tries per IP address every {rateSigninPeriod} seconds.',
context: 'Too many login attempts.'
},
tooManyAttempts: 'Too many attempts.'
};
const spamPrivateBlock = spam.private_block || {};
const spamGlobalBlock = spam.global_block || {};
const spamGlobalReset = spam.global_reset || {};
@ -64,9 +80,9 @@ const globalBlock = () => {
failCallback(req, res, next, nextValidRequestDate) {
return next(new errors.TooManyRequestsError({
message: `Too many attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
context: i18n.t('errors.middleware.spamprevention.forgottenPasswordIp.error',
context: tpl(messages.forgottenPasswordIp.error,
{rfa: spamGlobalBlock.freeRetries + 1 || 5, rfp: spamGlobalBlock.lifetime || 60 * 60}),
help: i18n.t('errors.middleware.spamprevention.tooManyAttempts')
help: tpl(messages.tooManyAttempts)
}));
},
handleStoreError: handleStoreError
@ -94,9 +110,9 @@ const globalReset = () => {
// TODO use i18n again
return next(new errors.TooManyRequestsError({
message: `Too many attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
context: i18n.t('errors.middleware.spamprevention.forgottenPasswordIp.error',
context: tpl(messages.forgottenPasswordIp.error,
{rfa: spamGlobalReset.freeRetries + 1 || 5, rfp: spamGlobalReset.lifetime || 60 * 60}),
help: i18n.t('errors.middleware.spamprevention.forgottenPasswordIp.context')
help: tpl(messages.forgottenPasswordIp.context)
}));
},
handleStoreError: handleStoreError
@ -128,8 +144,8 @@ const userLogin = () => {
return next(new errors.TooManyRequestsError({
message: `Too many sign-in attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
// TODO add more options to i18n
context: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.context'),
help: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.context')
context: tpl(messages.tooManySigninAttempts.context),
help: tpl(messages.tooManySigninAttempts.context)
}));
},
handleStoreError: handleStoreError
@ -159,9 +175,9 @@ const userReset = function userReset() {
failCallback(req, res, next, nextValidRequestDate) {
return next(new errors.TooManyRequestsError({
message: `Too many password reset attempts try again in ${moment(nextValidRequestDate).fromNow(true)}`,
context: i18n.t('errors.middleware.spamprevention.forgottenPasswordEmail.error',
context: tpl(messages.forgottenPasswordEmail.error,
{rfa: spamUserReset.freeRetries + 1 || 5, rfp: spamUserReset.lifetime || 60 * 60}),
help: i18n.t('errors.middleware.spamprevention.forgottenPasswordEmail.context')
help: tpl(messages.forgottenPasswordEmail.context)
}));
},
handleStoreError: handleStoreError
@ -189,12 +205,12 @@ const privateBlog = () => {
attachResetToRequest: false,
failCallback(req, res, next, nextValidRequestDate) {
logging.error(new errors.TooManyRequestsError({
message: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.error',
message: tpl(messages.tooManySigninAttempts.error,
{
rateSigninAttempts: spamPrivateBlock.freeRetries + 1 || 5,
rateSigninPeriod: spamPrivateBlock.lifetime || 60 * 60
}),
context: i18n.t('errors.middleware.spamprevention.tooManySigninAttempts.context')
context: tpl(messages.tooManySigninAttempts.context)
}));
return next(new errors.TooManyRequestsError({
@ -218,7 +234,7 @@ const contentApiKey = () => {
attachResetToRequest: true,
failCallback(req, res, next) {
const err = new errors.TooManyRequestsError({
message: i18n.t('errors.middleware.spamprevention.tooManyAttempts')
message: tpl(messages.tooManyAttempts)
});
logging.error(err);