nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-10-08 04:47:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

log user domain on auth

Browse source
This commit is contained in:
Andris Reinman 2018-11-14 15:28:12 +02:00
parent b8f9c8882d
commit da99238905
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/user-handler.js
View file

@ -362,6 +362,9 @@ class UserHandler {
meta = {}; meta = {};
} }
username = (username || '').toString();
let userDomain = username.indexOf('@') >= 0 ? username.split('@').pop() : '';
meta = meta || {}; meta = meta || {};
meta.requiredScope = requiredScope; meta.requiredScope = requiredScope;
@ -372,6 +375,7 @@ class UserHandler {
_error: 'Empty password', _error: 'Empty password',
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -389,6 +393,7 @@ class UserHandler {
_error_code: err.code, _error_code: err.code,
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -403,6 +408,7 @@ class UserHandler {
_authfail: 'yes', _authfail: 'yes',
_rate_limit: 'yes', _rate_limit: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -417,6 +423,7 @@ class UserHandler {
_authfail: 'yes', _authfail: 'yes',
_unknown: 'yes', _unknown: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -434,6 +441,7 @@ class UserHandler {
projection: { projection: {
_id: true, _id: true,
username: true, username: true,
address: true,
tempPassword: true, tempPassword: true,
password: true, password: true,
enabled2fa: true, enabled2fa: true,
@ -452,6 +460,7 @@ class UserHandler {
_error_code: err.code, _error_code: err.code,
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -471,6 +480,7 @@ class UserHandler {
_error_code: err.code, _error_code: err.code,
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -484,6 +494,7 @@ class UserHandler {
_authfail: 'yes', _authfail: 'yes',
_rate_limit: 'yes', _rate_limit: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -496,6 +507,7 @@ class UserHandler {
_authfail: 'yes', _authfail: 'yes',
_unknown: 'yes', _unknown: 'yes',
_username: username, _username: username,
_domain: userDomain,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
}); });
@ -503,6 +515,9 @@ class UserHandler {
}); });
} }
// make sure we use the primary domain if available
userDomain = (userData.address || '').split('@').pop() || userDomain;
// check if there are not too many auth attempts for that user // check if there are not too many auth attempts for that user
this.rateLimitUser(userData._id, meta, 0, (err, res) => { this.rateLimitUser(userData._id, meta, 0, (err, res) => {
if (err) { if (err) {
@ -514,6 +529,7 @@ class UserHandler {
_error_code: err.code, _error_code: err.code,
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_user: userData._id, _user: userData._id,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
@ -528,6 +544,7 @@ class UserHandler {
_rate_limit: 'yes', _rate_limit: 'yes',
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_user: userData._id, _user: userData._id,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
@ -545,6 +562,7 @@ class UserHandler {
_disabled: 'yes', _disabled: 'yes',
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_user: userData._id, _user: userData._id,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
@ -569,6 +587,7 @@ class UserHandler {
short_message: '[AUTHOK] ' + username, short_message: '[AUTHOK] ' + username,
_authenticated: 'yes', _authenticated: 'yes',
_username: username, _username: username,
_domain: userDomain,
_user: userData._id, _user: userData._id,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip
@ -585,6 +604,7 @@ class UserHandler {
_error_code: err.code, _error_code: err.code,
_authfail: 'yes', _authfail: 'yes',
_username: username, _username: username,
_domain: userDomain,
_user: userData._id, _user: userData._id,
_scope: requiredScope, _scope: requiredScope,
_ip: meta.ip _ip: meta.ip