From 48e8ddd18b900b156846241fd5a4a40a3d1e880e Mon Sep 17 00:00:00 2001 From: gumi Date: Wed, 4 Mar 2020 22:02:05 -0500 Subject: this is for you, Jesusalva --- src/logger.js | 2 +- src/routers/vault/middlewares/evol/account.js | 8 ++++---- src/routers/vault/middlewares/identity.js | 6 +++--- src/routers/vault/middlewares/legacy/account.js | 18 +++++++++--------- src/routers/vault/middlewares/session.js | 8 ++++---- src/routers/vault/utils/claim.js | 2 +- src/routers/vault/utils/game_accounts.js | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/logger.js b/src/logger.js index 19a1b46..8714301 100644 --- a/src/logger.js +++ b/src/logger.js @@ -3,7 +3,7 @@ const Fetch = require("node-fetch"); // from npm registry // wraps the (match group) with some markdown syntax const markdown = [ [ /^(?:[^ ]{1,3} )?([a-z.]+)/i, "**" ], // endpoint - [ /\{(\d+)\} (?:\[[a-z0-9.:]+\])?$/i, "_" ], // vault account + [ /<(\d+@vault)>/i, "_" ], // vault account [ /\[([a-z0-9.:]+)\]$/i, "`" ], // ip address ]; diff --git a/src/routers/vault/middlewares/evol/account.js b/src/routers/vault/middlewares/evol/account.js index 440367c..50248b2 100644 --- a/src/routers/vault/middlewares/evol/account.js +++ b/src/routers/vault/middlewares/evol/account.js @@ -134,7 +134,7 @@ const new_account = async (req, res, next) => { const account = new EvolAccount(evol_acc.accountId, evol_acc.userid); session.gameAccounts.push(account); - req.app.locals.logger.info(`Vault.evol.account: created a new game account: ${account.accountId} {${session.vault}} [${req.ip}]`); + req.app.locals.logger.info(`Vault.evol.account: created a new game account: ${account.accountId} <${session.vault}@vault> [${req.ip}]`); res.status(200).json({ status: "success", @@ -203,7 +203,7 @@ const update_account = async (req, res, next) => { status: "error", error: "account not found", }); - req.app.locals.logger.warn(`Vault.evol.account: blocked an attempt to modify a game account not owned by the user {${session.vault}} [${req.ip}]`); + req.app.locals.logger.warn(`Vault.evol.account: blocked an attempt to modify a game account not owned by the user <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3e5); return; } @@ -228,7 +228,7 @@ const update_account = async (req, res, next) => { userid: req.body.username, }; account.name = req.body.username; - req.app.locals.logger.info(`Vault.evol.account: changed username of game account ${account.accountId} {${session.vault}} [${req.ip}]`); + req.app.locals.logger.info(`Vault.evol.account: changed username of game account ${account.accountId} <${session.vault}@vault> [${req.ip}]`); req.app.locals.vault.account_log.create({ vaultId: session.vault, accountType: "EVOL", @@ -241,7 +241,7 @@ const update_account = async (req, res, next) => { update_fields = { userPass: req.body.password, }; - req.app.locals.logger.info(`Vault.evol.account: changed password of game account ${account.accountId} {${session.vault}} [${req.ip}]`); + req.app.locals.logger.info(`Vault.evol.account: changed password of game account ${account.accountId} <${session.vault}@vault> [${req.ip}]`); req.app.locals.vault.account_log.create({ vaultId: session.vault, accountType: "EVOL", diff --git a/src/routers/vault/middlewares/identity.js b/src/routers/vault/middlewares/identity.js index 638d5bc..8ee5b6b 100644 --- a/src/routers/vault/middlewares/identity.js +++ b/src/routers/vault/middlewares/identity.js @@ -44,7 +44,7 @@ const get_identities = async (req, res, next) => { } if (session.identities.length === 0) { - console.info(`Vault.identity: fetching identities {${session.vault}} [${req.ip}]`); + console.info(`Vault.identity: fetching identities <${session.vault}@vault> [${req.ip}]`); const rows = await req.app.locals.vault.identity.findAll({ where: {userId: session.vault} }); @@ -124,7 +124,7 @@ const add_identity = async (req, res, next) => { req.app.locals.identity_pending.delete(validate); if (session !== null) { - console.info(`Vault.identity: added a new identity {${session.vault}} [${req.ip}]`); + console.info(`Vault.identity: added a new identity <${session.vault}@vault> [${req.ip}]`); } else { console.info(`Vault.identity: added a new identity [${req.ip}]`); } @@ -224,7 +224,7 @@ const add_identity = async (req, res, next) => { email: req.body.email, }); - console.log(`Vault.session: starting identity validation {${session.vault}} [${req.ip}]`); + console.log(`Vault.session: starting identity validation <${session.vault}@vault> [${req.ip}]`); if (process.env.NODE_ENV === "development") { console.log(`uuid: ${uuid}`); diff --git a/src/routers/vault/middlewares/legacy/account.js b/src/routers/vault/middlewares/legacy/account.js index bdd9a84..93fd831 100644 --- a/src/routers/vault/middlewares/legacy/account.js +++ b/src/routers/vault/middlewares/legacy/account.js @@ -114,11 +114,11 @@ const claim_by_password = async (req, res, next) => { // max 5 attempts per 15 minutes if (req.app.locals.brute.consume(req, 5, 9e5)) { // some attempts left - console.warn(`Vault.legacy.account: failed to log in to Legacy account {${session.vault}} [${req.ip}]`); + console.warn(`Vault.legacy.account: failed to log in to Legacy account <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3e3); } else { // no attempts left: big cooldown - req.app.locals.logger.warn(`Vault.legacy.account: login request flood {${session.vault}} [${req.ip}]`); + req.app.locals.logger.warn(`Vault.legacy.account: login request flood <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3.6e6); } return; @@ -143,11 +143,11 @@ const claim_by_password = async (req, res, next) => { // max 5 attempts per 15 minutes if (req.app.locals.brute.consume(req, 5, 9e5)) { // some attempts left - console.warn(`Vault.legacy.account: failed to log in to Legacy account {${session.vault}} [${req.ip}]`); + console.warn(`Vault.legacy.account: failed to log in to Legacy account <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3e3); } else { // no attempts left: big cooldown - req.app.locals.logger.warn(`Vault.legacy.account: login request flood {${session.vault}} [${req.ip}]`); + req.app.locals.logger.warn(`Vault.legacy.account: login request flood <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3.6e6); } return; @@ -161,7 +161,7 @@ const claim_by_password = async (req, res, next) => { status: "error", error: "already assigned", }); - req.app.locals.logger.warn(`Vault.legacy.account: blocked an attempt to link an already-linked account {${session.vault}} [${req.ip}]`); + req.app.locals.logger.warn(`Vault.legacy.account: blocked an attempt to link an already-linked account <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3e5); return; } @@ -204,7 +204,7 @@ const claim_by_password = async (req, res, next) => { account }); - req.app.locals.logger.info(`Vault.legacy.account: linked Legacy account ${legacy.accountId} to Vault account {${session.vault}} [${req.ip}]`); + req.app.locals.logger.info(`Vault.legacy.account: linked Legacy account ${legacy.accountId} to Vault account <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 8e3); }; @@ -271,7 +271,7 @@ const migrate = async (req, res, next) => { status: "error", error: "not found", }); - req.app.locals.logger.warn(`Vault.legacy.account: blocked an attempt to migrate a Legacy account not owned by the user {${session.vault}} [${req.ip}]`); + req.app.locals.logger.warn(`Vault.legacy.account: blocked an attempt to migrate a Legacy account not owned by the user <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3e5); return; } @@ -281,7 +281,7 @@ const migrate = async (req, res, next) => { status: "error", error: "already migrated", }); - req.app.locals.logger.warn(`Vault.legacy.account: blocked an attempt to migrate an already-migrated Legacy account {${session.vault}} [${req.ip}]`); + req.app.locals.logger.warn(`Vault.legacy.account: blocked an attempt to migrate an already-migrated Legacy account <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 3e5); return; } @@ -392,7 +392,7 @@ const migrate = async (req, res, next) => { account: evol_account, }); - req.app.locals.logger.info(`Vault.legacy.account: migrated Legacy account ${legacy.accountId} {${session.vault}} [${req.ip}]`); + req.app.locals.logger.info(`Vault.legacy.account: migrated Legacy account ${legacy.accountId} <${session.vault}@vault> [${req.ip}]`); req.app.locals.cooldown(req, 15e3); }; diff --git a/src/routers/vault/middlewares/session.js b/src/routers/vault/middlewares/session.js index 990de49..be5787a 100644 --- a/src/routers/vault/middlewares/session.js +++ b/src/routers/vault/middlewares/session.js @@ -114,7 +114,7 @@ const auth_session = async (req, res, next) => { user.primaryIdentity = ident.id; await user.save(); - req.app.locals.logger.info(`Vault.session: created a new Vault account {${user.id}} [${req.ip}]`); + req.app.locals.logger.info(`Vault.session: created a new Vault account <${user.id}@vault> [${req.ip}]`); await Claim.claim_accounts(req, session.email, user.id, session); // update current session @@ -147,7 +147,7 @@ const auth_session = async (req, res, next) => { req.app.locals.session.delete(key); } } - console.info(`Vault.session: accepted login {${session.vault}} [${req.ip}]`); + console.info(`Vault.session: accepted login <${session.vault}@vault> [${req.ip}]`); } req.app.locals.cooldown(req, 6e4); @@ -171,7 +171,7 @@ const auth_session = async (req, res, next) => { if (primary === null || primary === undefined) { // the vault account has no primary identity (bug): let's fix this - console.warn(`Vault.session: fixing account with a deleted primary identity {${session.vault}} [${req.ip}]`); + console.warn(`Vault.session: fixing account with a deleted primary identity <${session.vault}@vault> [${req.ip}]`); await req.app.locals.vault.login.update({ primaryIdentity: session.identity, }, {where: { @@ -276,7 +276,7 @@ const new_session = async (req, res, next) => { // auth flow if (account.primaryIdentity === null || account.primaryIdentity === undefined) { // the vault account has no primary identity (bug): let's fix this - console.warn(`Vault.session: fixing account with no primary identity {${session.vault}} [${req.ip}]`); + console.warn(`Vault.session: fixing account with no primary identity <${session.vault}@vault> [${req.ip}]`); account.primaryIdentity = identity.id; await account.save(); } else if (identity.id !== account.primaryIdentity && !account.allowNonPrimary) { diff --git a/src/routers/vault/utils/claim.js b/src/routers/vault/utils/claim.js index d28e076..148767f 100644 --- a/src/routers/vault/utils/claim.js +++ b/src/routers/vault/utils/claim.js @@ -71,7 +71,7 @@ const claim_accounts = async (req, email, vault_id, session = null) => { session.legacyAccounts.push(legacy_account); } - locals.logger.info(`Vault.legacy.account: linked Legacy account ${acc.accountId} to Vault account {${vault_id}} [${req.ip}]`); + locals.logger.info(`Vault.legacy.account: linked Legacy account ${acc.accountId} to Vault account <${vault_id}@vault> [${req.ip}]`); } // TODO: split TMWA claiming into its own function, add forums and wiki claiming diff --git a/src/routers/vault/utils/game_accounts.js b/src/routers/vault/utils/game_accounts.js index c19feb5..fb0e5a4 100644 --- a/src/routers/vault/utils/game_accounts.js +++ b/src/routers/vault/utils/game_accounts.js @@ -20,7 +20,7 @@ const get_legacy_accounts = async (req, session) => { if (acc === null || acc === undefined) { // unexpected: account was deleted - console.info(`Vault.legacy.account: unlinking deleted account ${acc_.accountId} {${session.vault}} [${req.ip}]`); + console.info(`Vault.legacy.account: unlinking deleted account ${acc_.accountId} <${session.vault}@vault> [${req.ip}]`); await acc_.destroy(); // un-claim the account continue; } @@ -65,7 +65,7 @@ const get_account_list = async (req, session) => { if (acc === null || acc === undefined) { // unexpected: account was deleted - console.info(`Vault.evol.account: unlinking deleted account ${acc_.accountId} {${session.vault}} [${req.ip}]`); + console.info(`Vault.evol.account: unlinking deleted account ${acc_.accountId} <${session.vault}@vault> [${req.ip}]`); await acc_.destroy(); // un-claim the account continue; } -- cgit v1.2.3-60-g2f50