jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

recvmail: check for active mailbox

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-10-03 23:59:06 -07:00
parent 1743368069
commit 671e0d1e6f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ldap.js
+8 -3
View File
@@ -624,14 +624,19 @@ async function authenticateMailAddon(req, res, next) {
if (addonId === 'recvmail' && !domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString())); if (addonId === 'recvmail' && !domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));
const [getMailboxError, mailbox] = await safe(mail.getMailbox(parts[0], parts[1]));
if (getMailboxError) return next(new ldap.OperationsError(getMailboxError.message));
const [appPasswordError] = await safe(verifyAppMailboxPassword(addonId, email, req.credentials || '')); const [appPasswordError] = await safe(verifyAppMailboxPassword(addonId, email, req.credentials || ''));
if (!appPasswordError) return res.end(); // validated as app if (!appPasswordError) { // validated as app
if (addonId === 'recvmail' && (!mailbox || !mailbox.active)) return next(new ldap.NoSuchObjectError(req.dn.toString())); // recvmail requires active mailbox
return res.end();
}
if (appPasswordError && appPasswordError.reason === BoxError.INVALID_CREDENTIALS) return next(new ldap.InvalidCredentialsError(req.dn.toString())); if (appPasswordError && appPasswordError.reason === BoxError.INVALID_CREDENTIALS) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
if (appPasswordError && appPasswordError.reason !== BoxError.NOT_FOUND) return next(new ldap.OperationsError(appPasswordError.message)); if (appPasswordError && appPasswordError.reason !== BoxError.NOT_FOUND) return next(new ldap.OperationsError(appPasswordError.message));
const [getMailboxError, mailbox] = await safe(mail.getMailbox(parts[0], parts[1])); // user password check requires an active mailbox for recvmail and sendmail addon
if (getMailboxError) return next(new ldap.OperationsError(getMailboxError.message));
if (!mailbox) return next(new ldap.NoSuchObjectError(req.dn.toString())); if (!mailbox) return next(new ldap.NoSuchObjectError(req.dn.toString()));
if (!mailbox.active) return next(new ldap.NoSuchObjectError(req.dn.toString())); if (!mailbox.active) return next(new ldap.NoSuchObjectError(req.dn.toString()));