diff --git a/CHANGES b/CHANGES index 19f42e478..8816d8c3d 100644 --- a/CHANGES +++ b/CHANGES @@ -2902,4 +2902,5 @@ [8.3.0] * UI redesign * mail: add ipv6 rdns check +* notifications: email notification when server reboot is required diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json index e76735064..e0fcef096 100644 --- a/dashboard/public/translation/en.json +++ b/dashboard/public/translation/en.json @@ -1142,7 +1142,8 @@ "certificateRenewalFailed": "Certificate renewal failed", "appOutOfMemory": "App ran out of memory", "appUp": "App is online", - "appDown": "App is down" + "appDown": "App is down", + "rebootRequired": "Server reboot required" }, "settingsDialog": { "description": "Manage your personal notification preferences here. Cloudron will send an email for the selected events to your primary email address." diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json index f4c056dd4..3e4c9fb40 100644 --- a/dashboard/public/translation/nl.json +++ b/dashboard/public/translation/nl.json @@ -645,7 +645,7 @@ "remotePath": "Extern pad" }, "archives": { - "title": "Archieven", + "title": "App Archief", "location": "Locatie", "info": "Info" }, @@ -703,7 +703,7 @@ "solrEnabled": "Ingeschakeld", "solrRunning": "Actief", "solrNotRunning": "Inactief", - "solrFts": "Zoek volledige tekst (Solr)", + "solrFts": "Zoek volledige tekst", "solrDisabled": "Uitgeschakeld", "acl": "E-mail ACL", "aclOverview": "{{ dnsblZonesCount }} DNSBL zone(s)", @@ -767,10 +767,10 @@ "sendAction": "Verstuur" }, "solrConfig": { - "title": "Zoek volledige tekst (Solr)", - "enableSolrCheckbox": "'Zoek volledige tekst' (Solr) inschakelen", + "title": "Zoek volledige tekst", + "enableSolrCheckbox": "'Zoek volledige tekst' inschakelen", "notEnoughMemory": "Minstens 3GB configureren voor de e-mail dienst om solr te activeren.", - "description": "Solr kan gebruikt worden voor 'volledige tekst zoeken' in e-mails. Solr werkt alleen als de e-mail dienst minstens 3GB RAM is toegewezen." + "description": "Solr & Tika kan gebruikt worden voor 'volledige tekst zoeken' in e-mails en bijlagen. Solr werkt alleen als de e-mail dienst minstens 3GB RAM is toegewezen." }, "typeFilterHeader": "Alle gebeurtenissen", "aclDialog": { @@ -1258,8 +1258,8 @@ "action": "Archiveer", "latestBackupInfo": "De laatste backup werd gemaakt op {{date}}.", "title": "Archief", - "description": "De laatste app backup wordt toegevoegd aan het App Archief. De app wordt gedeïnstalleerd maar kan hersteld worden vanuit het Backup Overzicht. Andere backups worden opgeschoond op basis van het backup-beleid.", - "noBackup": "Deze app heeft geen backup. Archiveren vereist minstens één backup." + "description": "De laatste app backup wordt toegevoegd aan het App Archief. De app wordt gedeïnstalleerd maar kan hersteld worden vanuit het Backup Overzicht. Andere backups worden opgeschoond op basis van het backup-beleid.", + "noBackup": "Deze app heeft geen backup. Archiveren vereist een recente backup." }, "archiveDialog": { "title": "Archief {{app}}", diff --git a/dashboard/public/views/notifications.html b/dashboard/public/views/notifications.html index 526c1fde0..a39847de9 100644 --- a/dashboard/public/views/notifications.html +++ b/dashboard/public/views/notifications.html @@ -32,6 +32,11 @@ {{ 'notifications.settings.certificateRenewalFailed' | tr }} +
+ +
diff --git a/src/mail_templates/reboot_required-text.ejs b/src/mail_templates/reboot_required-text.ejs new file mode 100644 index 000000000..aecd1d8d8 --- /dev/null +++ b/src/mail_templates/reboot_required-text.ejs @@ -0,0 +1,12 @@ +Dear Cloudron Admin, + +One or more Ubuntu security updates were applied on the server. Updates to CPU Firmware, +shared libraries and low level dependencies requires a server reboot. For best security, reboot +your system at the earliest convenience - <%= webadminUrl %>/#/system . + +Powered by https://cloudron.io + +Don't want such mails? Change your notification preferences at <%= notificationsUrl %> + +Sent at: <%= new Date().toUTCString() %> + diff --git a/src/mailer.js b/src/mailer.js index dceb05080..58eab9ced 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -11,6 +11,7 @@ exports = module.exports = { appDown, appUp, oomEvent, + rebootRequired, sendTestMail, @@ -262,6 +263,21 @@ async function backupFailed(mailTo, errorMessage, logUrl) { await sendMail(mailOptions); } +async function rebootRequired(mailTo) { + assert.strictEqual(typeof mailTo, 'string'); + + const mailConfig = await getMailConfig(); + + const mailOptions = { + from: mailConfig.notificationFrom, + to: mailTo, + subject: `[${mailConfig.cloudronName}] Reboot required for security updates`, + text: render('reboot_required-text.ejs', { webadminUrl: `https://${mailConfig.dashboardFqdn}`, notificationsUrl: mailConfig.notificationsUrl }) + }; + + await sendMail(mailOptions); +} + async function certificateRenewalError(mailTo, domain, message) { assert.strictEqual(typeof mailTo, 'string'); assert.strictEqual(typeof domain, 'string'); diff --git a/src/notifications.js b/src/notifications.js index 22044beab..2c5e23fcf 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -270,6 +270,26 @@ async function backupFailed(eventId, taskId, errorMessage) { } } +async function rebootRequired() { + const admins = await users.getAdmins(); + for (const admin of admins) { + if (admin.notificationConfig.includes(exports.TYPE_REBOOT)) { + await mailer.rebootRequired(admin.email); + } + } +} + +async function onPin(type) { + assert.strictEqual(typeof type, 'string'); // TYPE_ + + switch (type) { + case exports.TYPE_REBOOT: + return await rebootRequired(); + default: + break; + } +} + async function pin(type, title, message, options) { assert.strictEqual(typeof type, 'string'); // TYPE_ assert.strictEqual(typeof title, 'string'); @@ -284,12 +304,17 @@ async function pin(type, title, message, options) { } const result = await getByType(type, options.context || ''); - if (!result) return await add(type, title, message, { eventId: null, context: options.context || '' }); + if (!result) { + await onPin(type); + return await add(type, title, message, { eventId: null, context: options.context || '' }); + } // do not reset the ack state if user has already seen the update notification const isUpdateType = type === exports.TYPE_BOX_UPDATE || type === exports.TYPE_MANUAL_APP_UPDATE_NEEDED; const acknowledged = (isUpdateType && result.message === message) ? result.acknowledged : false; + if (result.acknowledged && !acknowledged) await onPin(type); + await update(result, { title, message, acknowledged, creationTime: new Date() }); return result.id; } @@ -301,45 +326,45 @@ async function unpin(type, options) { await database.query('UPDATE notifications SET acknowledged=1 WHERE type = ? AND context = ?', [ type, options.context || '' ]); } -async function onEvent(id, action, source, data) { - assert.strictEqual(typeof id, 'string'); +async function onEvent(eventId, action, source, data) { + assert.strictEqual(typeof eventId, 'string'); assert.strictEqual(typeof action, 'string'); assert.strictEqual(typeof source, 'object'); assert.strictEqual(typeof data, 'object'); switch (action) { case eventlog.ACTION_APP_OOM: - return await oomEvent(id, data.containerId, data.app, data.addonName, data.event); + return await oomEvent(eventId, data.containerId, data.app, data.addonName, data.event); case eventlog.ACTION_APP_UP: - return await appUp(id, data.app); + return await appUp(eventId, data.app); case eventlog.ACTION_APP_DOWN: - return await appDown(id, data.app); + return await appDown(eventId, data.app); case eventlog.ACTION_APP_UPDATE_FINISH: if (source.username !== AuditSource.CRON.username) return; // updated by user if (data.errorMessage) return; // the update indicator will still appear, so no need to notify user - return await appUpdated(id, data.app, data.fromManifest, data.toManifest); + return await appUpdated(eventId, data.app, data.fromManifest, data.toManifest); case eventlog.ACTION_CERTIFICATE_RENEWAL: case eventlog.ACTION_CERTIFICATE_NEW: if (!data.errorMessage) return; if (!data.notAfter || (data.notAfter - new Date() >= (10 * 24 * 60 * 60 * 1000))) return; // more than 10 days left to expire - return await certificateRenewalError(id, data.domain, data.errorMessage); + return await certificateRenewalError(eventId, data.domain, data.errorMessage); case eventlog.ACTION_BACKUP_FINISH: if (!data.errorMessage) return; if (source.username !== AuditSource.CRON.username && !data.timedOut) return; // manual stop by user - return await backupFailed(id, data.taskId, data.errorMessage); // only notify for automated backups or timedout + return await backupFailed(eventId, data.taskId, data.errorMessage); // only notify for automated backups or timedout case eventlog.ACTION_INSTALL_FINISH: - return await boxInstalled(id, data.version); + return await boxInstalled(eventId, data.version); case eventlog.ACTION_UPDATE_FINISH: - if (!data.errorMessage) return await boxUpdated(id, data.oldVersion, data.newVersion); - if (data.timedOut) return await boxUpdateError(id, data.errorMessage); + if (!data.errorMessage) return await boxUpdated(eventId, data.oldVersion, data.newVersion); + if (data.timedOut) return await boxUpdateError(eventId, data.errorMessage); return; default: