From 4d29d20b363b6fee04fa0a35f395a9084ca7cf6c Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Fri, 24 Nov 2023 09:51:32 +0200 Subject: [PATCH] fix(imap): Allow to define IMAP TCP socket timeout with the EENGINE_IMAP_SOCKET_TIMEOUT env value --- lib/connection.js | 11 ++++- package.json | 2 +- sbom.json | 2 +- static/licenses.html | 6 +-- translations/messages.pot | 84 +++++++++++++++++++-------------------- 5 files changed, 57 insertions(+), 48 deletions(-) diff --git a/lib/connection.js b/lib/connection.js index 7580611a..74a74ea9 100644 --- a/lib/connection.js +++ b/lib/connection.js @@ -39,7 +39,8 @@ const { getByteSize, getBoolean, readEnvValue, - validUidValidity + validUidValidity, + getDuration } = require('./tools'); const RESYNC_DELAY = 15 * 60; @@ -66,6 +67,9 @@ const { const DOWNLOAD_CHUNK_SIZE = getByteSize(readEnvValue('EENGINE_CHUNK_SIZE')) || DEFAULT_DOWNLOAD_CHUNK_SIZE; const DISABLE_IMAP_COMPRESSION = getBoolean(readEnvValue('EENGINE_DISABLE_COMPRESSION')); +const IMAP_SOCKET_TIMEOUT = getDuration(readEnvValue('EENGINE_IMAP_SOCKET_TIMEOUT')); + +logger.trace({ msg: 'Worker configuration', DOWNLOAD_CHUNK_SIZE, DISABLE_IMAP_COMPRESSION, IMAP_SOCKET_TIMEOUT }); const settings = require('./settings'); const { redis } = require('./db'); @@ -990,6 +994,7 @@ class Connection { // Special case for Yahoo. Break IDLE at least once every three minutes imapConfig.maxIdleTime = 3 * 60 * 1000; } + /* else if (/(\.naver\.com)$/i.test(imapConfig.host)) { // NOOP does nothing in Naver, must run SELECT for changes in the folder to apply @@ -1002,6 +1007,10 @@ class Connection { imapConfig.disableCompression = true; } + if (IMAP_SOCKET_TIMEOUT) { + imapConfig.socketTimeout = IMAP_SOCKET_TIMEOUT; + } + const ignoreMailCertErrors = await settings.get('ignoreMailCertErrors'); if (ignoreMailCertErrors && imapConfig?.tls?.rejectUnauthorized !== false) { imapConfig.tls = imapConfig.tls || {}; diff --git a/package.json b/package.json index f994dc0f..6307b49d 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "ace-builds": "1.31.2", "base32.js": "0.1.0", "bull-arena": "4.1.0", - "bullmq": "4.14.0", + "bullmq": "4.14.1", "compare-versions": "6.1.0", "dotenv": "16.3.1", "encoding-japanese": "2.0.0", diff --git a/sbom.json b/sbom.json index 7b227d67..e90878d8 100644 --- a/sbom.json +++ b/sbom.json @@ -1 +1 @@ -{"bomFormat":"CycloneDX","specVersion":"1.4","version":1,"metadata":{"timestamp":"2023-11-22T08:43:36Z","tools":[{"vendor":"advanced-security","name":"gh-sbom","version":"0.0.9"}],"licenses":[{"expression":"CC0-1.0"}]},"components":[{"type":"library","name":"he","version":"1.2.0","purl":"pkg:npm/he@1.2.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"imapflow","version":"1.0.147","purl":"pkg:npm/imapflow@1.0.147","licenses":[{"expression":"MIT"}]},{"type":"library","name":"libmime","version":"5.2.1","purl":"pkg:npm/libmime@5.2.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"libqp","version":"2.0.1","purl":"pkg:npm/libqp@2.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"nodemailer","version":"6.9.7","purl":"pkg:npm/nodemailer@6.9.7","licenses":[{"expression":"MIT-0"}]},{"type":"library","name":"timezones-list","version":"3.0.2","purl":"pkg:npm/timezones-list@3.0.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"uuid","version":"9.0.1","purl":"pkg:npm/uuid@9.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@postalsys","name":"templates","version":"1.0.7","purl":"pkg:npm/%40postalsys/templates@1.0.7","licenses":[{"expression":"ISC"}]},{"type":"library","name":"chai","version":"4.3.10","purl":"pkg:npm/chai@4.3.10","licenses":[{"expression":"MIT"}]},{"type":"library","name":"encoding-japanese","version":"2.0.0","purl":"pkg:npm/encoding-japanese@2.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"eslint","version":"8.53.0","purl":"pkg:npm/eslint@8.53.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"libbase64","version":"1.2.1","purl":"pkg:npm/libbase64@1.2.1","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@hapi","name":"vision","version":"7.0.3","purl":"pkg:npm/%40hapi/vision@7.0.3","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"handlebars","version":"4.7.8","purl":"pkg:npm/handlebars@4.7.8","licenses":[{"expression":"MIT"}]},{"type":"library","name":"punycode","version":"2.3.1","purl":"pkg:npm/punycode@2.3.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"resedit","version":"2.0.0","purl":"pkg:npm/resedit@2.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@hapi","name":"hapi","version":"21.3.2","purl":"pkg:npm/%40hapi/hapi@21.3.2","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"eslint-config-nodemailer","version":"1.2.0","purl":"pkg:npm/eslint-config-nodemailer@1.2.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"js-beautify","version":"1.14.9","purl":"pkg:npm/js-beautify@1.14.9","licenses":[{"expression":"MIT"}]},{"type":"library","name":"prom-client","version":"15.0.0","purl":"pkg:npm/prom-client@15.0.0","licenses":[{"expression":"Apache-2.0"}]},{"type":"library","name":"pubface","version":"1.0.6","purl":"pkg:npm/pubface@1.0.6","licenses":[{"expression":"MIT-0"}]},{"type":"library","name":"wild-config","version":"1.7.1","purl":"pkg:npm/wild-config@1.7.1","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@bugsnag","name":"js","version":"7.21.0","purl":"pkg:npm/%40bugsnag/js@7.21.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"bullmq","version":"4.13.0","purl":"pkg:npm/bullmq@4.13.0"},{"type":"library","name":"ace-builds","version":"1.31.1","purl":"pkg:npm/ace-builds@1.31.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"ical.js","version":"1.5.0","purl":"pkg:npm/ical.js@1.5.0","licenses":[{"expression":"MPL-2.0"}]},{"type":"library","name":"iconv-lite","version":"0.6.3","purl":"pkg:npm/iconv-lite@0.6.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"ioredis","version":"5.3.2","purl":"pkg:npm/ioredis@5.3.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"mailsplit","version":"5.4.0","purl":"pkg:npm/mailsplit@5.4.0","licenses":[{"expression":"EUPL-1.1+ OR MIT OR (EUPL-1.1+ AND MIT)"}]},{"type":"library","name":"undici","version":"5.27.2","purl":"pkg:npm/undici@5.27.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"bull-arena","version":"4.1.0","purl":"pkg:npm/bull-arena@4.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"ipaddr.js","version":"2.1.0","purl":"pkg:npm/ipaddr.js@2.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"jsxgettext","version":"0.11.0","purl":"pkg:npm/jsxgettext@0.11.0","licenses":[{"expression":"MPL-2.0"}]},{"type":"library","name":"qrcode","version":"1.5.3","purl":"pkg:npm/qrcode@1.5.3","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@postalsys","name":"email-ai-tools","version":"1.7.2","purl":"pkg:npm/%40postalsys/email-ai-tools@1.7.2"},{"type":"library","name":"base32.js","version":"0.1.0","purl":"pkg:npm/base32.js@0.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"eerawlog","version":"1.5.1","purl":"pkg:npm/eerawlog@1.5.1","licenses":[{"expression":"ISC"}]},{"type":"library","name":"eslint-config-prettier","version":"9.0.0","purl":"pkg:npm/eslint-config-prettier@9.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"grunt","version":"1.6.1","purl":"pkg:npm/grunt@1.6.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"hapi-auth-bearer-token","version":"8.0.0","purl":"pkg:npm/hapi-auth-bearer-token@8.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"mailparser","version":"3.6.5","purl":"pkg:npm/mailparser@3.6.5","licenses":[{"expression":"MIT"}]},{"type":"library","name":"murmurhash","version":"2.0.1","purl":"pkg:npm/murmurhash@2.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"pino-pretty","version":"10.2.3","purl":"pkg:npm/pino-pretty@10.2.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"marked","version":"9.1.5","purl":"pkg:npm/marked@9.1.5"},{"type":"library","name":"pkg","version":"5.8.1","purl":"pkg:npm/pkg@5.8.1","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@hapi","name":"crumb","version":"9.0.1","purl":"pkg:npm/%40hapi/crumb@9.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"grunt-eslint","version":"24.3.0","purl":"pkg:npm/grunt-eslint@24.3.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"html-to-text","version":"9.0.5","purl":"pkg:npm/html-to-text@9.0.5","licenses":[{"expression":"MIT"}]},{"type":"library","name":"jquery","version":"3.7.1","purl":"pkg:npm/jquery@3.7.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"pino","version":"8.16.1","purl":"pkg:npm/pino@8.16.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"xml2js","version":"0.6.2","purl":"pkg:npm/xml2js@0.6.2","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@elastic","name":"elasticsearch","version":"8.10.0","purl":"pkg:npm/%40elastic/elasticsearch@8.10.0","licenses":[{"expression":"Apache-2.0"}]},{"type":"library","group":"@hapi","name":"cookie","version":"12.0.1","purl":"pkg:npm/%40hapi/cookie@12.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@postalsys","name":"certs","version":"1.0.7","purl":"pkg:npm/%40postalsys/certs@1.0.7","licenses":[{"expression":"ISC"}]},{"type":"library","group":"@postalsys","name":"email-text-tools","version":"2.1.3","purl":"pkg:npm/%40postalsys/email-text-tools@2.1.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"express","version":"4.18.2","purl":"pkg:npm/express@4.18.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"joi","version":"17.11.0","purl":"pkg:npm/joi@17.11.0","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"license-checker","version":"25.0.1","purl":"pkg:npm/license-checker@25.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"xgettext-template","version":"5.0.0","purl":"pkg:npm/xgettext-template@5.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"gettext-parser","version":"7.0.1","purl":"pkg:npm/gettext-parser@7.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"humanize","version":"0.0.9","purl":"pkg:npm/humanize@0.0.9","licenses":[{"expression":"MIT"}]},{"type":"library","name":"msgpack5","version":"6.0.2","purl":"pkg:npm/msgpack5@6.0.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"psl","version":"1.9.0","purl":"pkg:npm/psl@1.9.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"hapi-swagger","version":"17.2.0","purl":"pkg:npm/hapi-swagger@17.2.0"},{"type":"library","name":"speakeasy","version":"2.0.0","purl":"pkg:npm/speakeasy@2.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"dotenv","version":"16.3.1","purl":"pkg:npm/dotenv@16.3.1","licenses":[{"expression":"BSD-2-Clause"}]},{"type":"library","name":"smtp-server","version":"3.13.0","purl":"pkg:npm/smtp-server@3.13.0","licenses":[{"expression":"MIT-0"}]},{"type":"library","group":"@hapi","name":"bell","version":"13.0.1","purl":"pkg:npm/%40hapi/bell@13.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@hapi","name":"boom","version":"10.0.1","purl":"pkg:npm/%40hapi/boom@10.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@hapi","name":"inert","version":"7.1.0","purl":"pkg:npm/%40hapi/inert@7.1.0","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@phc","name":"pbkdf2","version":"1.1.14","purl":"pkg:npm/%40phc/pbkdf2@1.1.14","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@postalsys","name":"hecks","version":"3.0.0-fork.3","purl":"pkg:npm/%40postalsys/hecks@3.0.0-fork.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"exponential-backoff","version":"3.1.1","purl":"pkg:npm/exponential-backoff@3.1.1","licenses":[{"expression":"Apache-2.0"}]},{"type":"library","name":"grunt-cli","version":"1.4.3","purl":"pkg:npm/grunt-cli@1.4.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"ioredfour","version":"1.2.0-ioredis-07","purl":"pkg:npm/ioredfour@1.2.0-ioredis-07","licenses":[{"expression":"MIT"}]},{"type":"library","name":"nanoid","version":"3.3.4","purl":"pkg:npm/nanoid@3.3.4","licenses":[{"expression":"MIT"}]},{"type":"library","name":"node-gettext","version":"3.0.0","purl":"pkg:npm/node-gettext@3.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"socks","version":"2.7.1","purl":"pkg:npm/socks@2.7.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"startbootstrap-sb-admin-2","version":"3.3.7","purl":"pkg:npm/startbootstrap-sb-admin-2@3.3.7","licenses":[{"expression":"MIT"}]},{"type":"library","name":"compare-versions","version":"6.1.0","purl":"pkg:npm/compare-versions@6.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"hapi-pino","version":"12.1.0","purl":"pkg:npm/hapi-pino@12.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"minimist","version":"1.2.8","purl":"pkg:npm/minimist@1.2.8","licenses":[{"expression":"MIT"}]},{"type":"library","group":"docker","name":"metadata-action","version":"5","purl":"pkg:github/docker/metadata-action@5"},{"type":"library","group":"docker","name":"setup-buildx-action","version":"3","purl":"pkg:github/docker/setup-buildx-action@3"},{"type":"library","group":"docker","name":"setup-qemu-action","version":"3","purl":"pkg:github/docker/setup-qemu-action@3"},{"type":"library","group":"actions","name":"checkout","version":"4","purl":"pkg:github/actions/checkout@4"},{"type":"library","group":"shimataro","name":"ssh-key-action","version":"2","purl":"pkg:github/shimataro/ssh-key-action@2"},{"type":"library","group":"docker","name":"build-push-action","version":"5","purl":"pkg:github/docker/build-push-action@5"},{"type":"library","group":"docker","name":"login-action","version":"3","purl":"pkg:github/docker/login-action@3"},{"type":"library","group":"actions","name":"setup-node","version":"3","purl":"pkg:github/actions/setup-node@3"},{"type":"library","group":"actions","name":"setup-node","version":"1","purl":"pkg:github/actions/setup-node@1"},{"type":"library","group":"google-github-actions","name":"release-please-action","version":"3","purl":"pkg:github/google-github-actions/release-please-action@3"}]} +{"bomFormat":"CycloneDX","specVersion":"1.4","version":1,"metadata":{"timestamp":"2023-11-24T07:38:32Z","tools":[{"vendor":"advanced-security","name":"gh-sbom","version":"0.0.9"}],"licenses":[{"expression":"CC0-1.0"}]},"components":[{"type":"library","name":"ace-builds","version":"1.31.2","purl":"pkg:npm/ace-builds@1.31.2"},{"type":"library","name":"compare-versions","version":"6.1.0","purl":"pkg:npm/compare-versions@6.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"hapi-auth-bearer-token","version":"8.0.0","purl":"pkg:npm/hapi-auth-bearer-token@8.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"mailparser","version":"3.6.5","purl":"pkg:npm/mailparser@3.6.5","licenses":[{"expression":"MIT"}]},{"type":"library","name":"msgpack5","version":"6.0.2","purl":"pkg:npm/msgpack5@6.0.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"bull-arena","version":"4.1.0","purl":"pkg:npm/bull-arena@4.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"ioredfour","version":"1.2.0-ioredis-07","purl":"pkg:npm/ioredfour@1.2.0-ioredis-07","licenses":[{"expression":"MIT"}]},{"type":"library","name":"jquery","version":"3.7.1","purl":"pkg:npm/jquery@3.7.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"nodemailer","version":"6.9.7","purl":"pkg:npm/nodemailer@6.9.7","licenses":[{"expression":"MIT-0"}]},{"type":"library","name":"pubface","version":"1.0.6","purl":"pkg:npm/pubface@1.0.6","licenses":[{"expression":"MIT-0"}]},{"type":"library","group":"@hapi","name":"crumb","version":"9.0.1","purl":"pkg:npm/%40hapi/crumb@9.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"ipaddr.js","version":"2.1.0","purl":"pkg:npm/ipaddr.js@2.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"license-checker","version":"25.0.1","purl":"pkg:npm/license-checker@25.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"punycode","version":"2.3.1","purl":"pkg:npm/punycode@2.3.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"bullmq","version":"4.14.0","purl":"pkg:npm/bullmq@4.14.0"},{"type":"library","name":"encoding-japanese","version":"2.0.0","purl":"pkg:npm/encoding-japanese@2.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"handlebars","version":"4.7.8","purl":"pkg:npm/handlebars@4.7.8","licenses":[{"expression":"MIT"}]},{"type":"library","name":"ical.js","version":"1.5.0","purl":"pkg:npm/ical.js@1.5.0","licenses":[{"expression":"MPL-2.0"}]},{"type":"library","name":"resedit","version":"2.0.0","purl":"pkg:npm/resedit@2.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"speakeasy","version":"2.0.0","purl":"pkg:npm/speakeasy@2.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@hapi","name":"inert","version":"7.1.0","purl":"pkg:npm/%40hapi/inert@7.1.0","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"dotenv","version":"16.3.1","purl":"pkg:npm/dotenv@16.3.1","licenses":[{"expression":"BSD-2-Clause"}]},{"type":"library","name":"eerawlog","version":"1.5.1","purl":"pkg:npm/eerawlog@1.5.1","licenses":[{"expression":"ISC"}]},{"type":"library","name":"exponential-backoff","version":"3.1.1","purl":"pkg:npm/exponential-backoff@3.1.1","licenses":[{"expression":"Apache-2.0"}]},{"type":"library","name":"express","version":"4.18.2","purl":"pkg:npm/express@4.18.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"ioredis","version":"5.3.2","purl":"pkg:npm/ioredis@5.3.2","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@elastic","name":"elasticsearch","version":"8.10.0","purl":"pkg:npm/%40elastic/elasticsearch@8.10.0","licenses":[{"expression":"Apache-2.0"}]},{"type":"library","group":"@hapi","name":"hapi","version":"21.3.2","purl":"pkg:npm/%40hapi/hapi@21.3.2","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@postalsys","name":"certs","version":"1.0.7","purl":"pkg:npm/%40postalsys/certs@1.0.7","licenses":[{"expression":"ISC"}]},{"type":"library","name":"eslint-config-nodemailer","version":"1.2.0","purl":"pkg:npm/eslint-config-nodemailer@1.2.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"grunt-eslint","version":"24.3.0","purl":"pkg:npm/grunt-eslint@24.3.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"humanize","version":"0.0.9","purl":"pkg:npm/humanize@0.0.9","licenses":[{"expression":"MIT"}]},{"type":"library","name":"libqp","version":"2.0.1","purl":"pkg:npm/libqp@2.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"minimist","version":"1.2.8","purl":"pkg:npm/minimist@1.2.8","licenses":[{"expression":"MIT"}]},{"type":"library","name":"node-gettext","version":"3.0.0","purl":"pkg:npm/node-gettext@3.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"pino-pretty","version":"10.2.3","purl":"pkg:npm/pino-pretty@10.2.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"timezones-list","version":"3.0.2","purl":"pkg:npm/timezones-list@3.0.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"base32.js","version":"0.1.0","purl":"pkg:npm/base32.js@0.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"chai","version":"4.3.10","purl":"pkg:npm/chai@4.3.10","licenses":[{"expression":"MIT"}]},{"type":"library","name":"grunt","version":"1.6.1","purl":"pkg:npm/grunt@1.6.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"murmurhash","version":"2.0.1","purl":"pkg:npm/murmurhash@2.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"xml2js","version":"0.6.2","purl":"pkg:npm/xml2js@0.6.2","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@phc","name":"pbkdf2","version":"1.1.14","purl":"pkg:npm/%40phc/pbkdf2@1.1.14","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@postalsys","name":"email-text-tools","version":"2.1.3","purl":"pkg:npm/%40postalsys/email-text-tools@2.1.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"eslint-config-prettier","version":"9.0.0","purl":"pkg:npm/eslint-config-prettier@9.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"gettext-parser","version":"7.0.1","purl":"pkg:npm/gettext-parser@7.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"he","version":"1.2.0","purl":"pkg:npm/he@1.2.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"mailsplit","version":"5.4.0","purl":"pkg:npm/mailsplit@5.4.0","licenses":[{"expression":"EUPL-1.1+ OR MIT OR (EUPL-1.1+ AND MIT)"}]},{"type":"library","group":"@hapi","name":"bell","version":"13.0.1","purl":"pkg:npm/%40hapi/bell@13.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@hapi","name":"vision","version":"7.0.3","purl":"pkg:npm/%40hapi/vision@7.0.3","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","group":"@postalsys","name":"templates","version":"1.0.7","purl":"pkg:npm/%40postalsys/templates@1.0.7","licenses":[{"expression":"ISC"}]},{"type":"library","name":"eslint","version":"8.54.0","purl":"pkg:npm/eslint@8.54.0"},{"type":"library","name":"libmime","version":"5.2.1","purl":"pkg:npm/libmime@5.2.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"prom-client","version":"15.0.0","purl":"pkg:npm/prom-client@15.0.0","licenses":[{"expression":"Apache-2.0"}]},{"type":"library","name":"startbootstrap-sb-admin-2","version":"3.3.7","purl":"pkg:npm/startbootstrap-sb-admin-2@3.3.7","licenses":[{"expression":"MIT"}]},{"type":"library","name":"uuid","version":"9.0.1","purl":"pkg:npm/uuid@9.0.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"wild-config","version":"1.7.1","purl":"pkg:npm/wild-config@1.7.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"html-to-text","version":"9.0.5","purl":"pkg:npm/html-to-text@9.0.5","licenses":[{"expression":"MIT"}]},{"type":"library","name":"pino","version":"8.16.2","purl":"pkg:npm/pino@8.16.2","licenses":[{"expression":"MIT"}]},{"type":"library","name":"xgettext-template","version":"5.0.0","purl":"pkg:npm/xgettext-template@5.0.0","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@hapi","name":"boom","version":"10.0.1","purl":"pkg:npm/%40hapi/boom@10.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"imapflow","version":"1.0.147","purl":"pkg:npm/imapflow@1.0.147","licenses":[{"expression":"MIT"}]},{"type":"library","name":"joi","version":"17.11.0","purl":"pkg:npm/joi@17.11.0","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"libbase64","version":"1.2.1","purl":"pkg:npm/libbase64@1.2.1","licenses":[{"expression":"MIT"}]},{"type":"library","name":"marked","version":"9.1.6","purl":"pkg:npm/marked@9.1.6"},{"type":"library","name":"nanoid","version":"3.3.4","purl":"pkg:npm/nanoid@3.3.4","licenses":[{"expression":"MIT"}]},{"type":"library","name":"qrcode","version":"1.5.3","purl":"pkg:npm/qrcode@1.5.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"socks","version":"2.7.1","purl":"pkg:npm/socks@2.7.1","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@postalsys","name":"email-ai-tools","version":"1.7.2","purl":"pkg:npm/%40postalsys/email-ai-tools@1.7.2"},{"type":"library","group":"@postalsys","name":"hecks","version":"3.0.0-fork.3","purl":"pkg:npm/%40postalsys/hecks@3.0.0-fork.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"js-beautify","version":"1.14.11","purl":"pkg:npm/js-beautify@1.14.11","licenses":[{"expression":"MIT"}]},{"type":"library","name":"jsxgettext","version":"0.11.0","purl":"pkg:npm/jsxgettext@0.11.0","licenses":[{"expression":"MPL-2.0"}]},{"type":"library","group":"@bugsnag","name":"js","version":"7.22.2","purl":"pkg:npm/%40bugsnag/js@7.22.2"},{"type":"library","name":"grunt-cli","version":"1.4.3","purl":"pkg:npm/grunt-cli@1.4.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"hapi-pino","version":"12.1.0","purl":"pkg:npm/hapi-pino@12.1.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"iconv-lite","version":"0.6.3","purl":"pkg:npm/iconv-lite@0.6.3","licenses":[{"expression":"MIT"}]},{"type":"library","name":"pkg","version":"5.8.1","purl":"pkg:npm/pkg@5.8.1","licenses":[{"expression":"MIT"}]},{"type":"library","group":"@hapi","name":"cookie","version":"12.0.1","purl":"pkg:npm/%40hapi/cookie@12.0.1","licenses":[{"expression":"BSD-3-Clause"}]},{"type":"library","name":"hapi-swagger","version":"17.2.0","purl":"pkg:npm/hapi-swagger@17.2.0"},{"type":"library","name":"psl","version":"1.9.0","purl":"pkg:npm/psl@1.9.0","licenses":[{"expression":"MIT"}]},{"type":"library","name":"smtp-server","version":"3.13.0","purl":"pkg:npm/smtp-server@3.13.0","licenses":[{"expression":"MIT-0"}]},{"type":"library","name":"undici","version":"5.27.2","purl":"pkg:npm/undici@5.27.2","licenses":[{"expression":"MIT"}]},{"type":"library","group":"docker","name":"build-push-action","version":"5","purl":"pkg:github/docker/build-push-action@5"},{"type":"library","group":"docker","name":"metadata-action","version":"5","purl":"pkg:github/docker/metadata-action@5"},{"type":"library","group":"docker","name":"setup-qemu-action","version":"3","purl":"pkg:github/docker/setup-qemu-action@3"},{"type":"library","group":"google-github-actions","name":"release-please-action","version":"3","purl":"pkg:github/google-github-actions/release-please-action@3"},{"type":"library","group":"actions","name":"checkout","version":"4","purl":"pkg:github/actions/checkout@4"},{"type":"library","group":"shimataro","name":"ssh-key-action","version":"2","purl":"pkg:github/shimataro/ssh-key-action@2"},{"type":"library","group":"docker","name":"login-action","version":"3","purl":"pkg:github/docker/login-action@3"},{"type":"library","group":"docker","name":"setup-buildx-action","version":"3","purl":"pkg:github/docker/setup-buildx-action@3"},{"type":"library","group":"actions","name":"setup-node","version":"3","purl":"pkg:github/actions/setup-node@3"},{"type":"library","group":"actions","name":"setup-node","version":"1","purl":"pkg:github/actions/setup-node@1"}]} diff --git a/static/licenses.html b/static/licenses.html index ad64285e..71dad0bd 100644 --- a/static/licenses.html +++ b/static/licenses.html @@ -1616,7 +1616,7 @@

EmailEngine v2.39.0

EmailEngine includes code from the following soft bullmq -4.14.0 +4.14.1 MIT Taskforce.sh Inc. @@ -4655,7 +4655,7 @@

EmailEngine v2.39.0

EmailEngine includes code from the following soft lru-cache -10.0.3 +10.1.0 ISC Isaac Z. Schlueter i@izs.me @@ -7235,7 +7235,7 @@

EmailEngine v2.39.0

EmailEngine includes code from the following soft swagger-ui-dist -5.10.2 +5.10.3 Apache-2.0 diff --git a/translations/messages.pot b/translations/messages.pot index 0e029715..87bf8de0 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=ascii\n" -"POT-Creation-Date: 2023-11-22 08:44+0000\n" +"POT-Creation-Date: 2023-11-24 07:38+0000\n" #: views/config/license.hbs:48 msgid "%d day" @@ -13,47 +13,6 @@ msgstr[1] "" msgid "Click here to continue…" msgstr "" -#: views/accounts/register/imap.hbs:11 -msgid "Your name" -msgstr "" - -#: views/accounts/register/imap.hbs:17 -msgid "Enter your full name" -msgstr "" - -#: views/accounts/register/imap.hbs:21 -#: views/unsubscribe.hbs:69 -msgid "Email address" -msgstr "" - -#: views/accounts/register/imap.hbs:27 -#: views/unsubscribe.hbs:75 -msgid "Enter your email address" -msgstr "" - -#: views/accounts/register/imap.hbs:31 -#: views/accounts/register/imap-server.hbs:35 -#: views/accounts/register/imap-server.hbs:114 -msgid "Password" -msgstr "" - -#: views/accounts/register/imap.hbs:37 -msgid "Enter your account password" -msgstr "" - -#: views/accounts/register/imap.hbs:51 -#: views/accounts/register/imap-server.hbs:192 -msgid "Continue" -msgstr "" - -#: views/accounts/register/index.hbs:2 -msgid "Choose your email account provider" -msgstr "" - -#: views/accounts/register/index.hbs:15 -msgid "Standard IMAP" -msgstr "" - #: views/unsubscribe.hbs:1 #: views/unsubscribe.hbs:79 msgid "Unsubscribe" @@ -88,6 +47,47 @@ msgstr "" msgid "Your email address %s was re-subscribed." msgstr "" +#: views/unsubscribe.hbs:69 +#: views/accounts/register/imap.hbs:21 +msgid "Email address" +msgstr "" + +#: views/unsubscribe.hbs:75 +#: views/accounts/register/imap.hbs:27 +msgid "Enter your email address" +msgstr "" + +#: views/accounts/register/index.hbs:2 +msgid "Choose your email account provider" +msgstr "" + +#: views/accounts/register/index.hbs:15 +msgid "Standard IMAP" +msgstr "" + +#: views/accounts/register/imap.hbs:11 +msgid "Your name" +msgstr "" + +#: views/accounts/register/imap.hbs:17 +msgid "Enter your full name" +msgstr "" + +#: views/accounts/register/imap.hbs:31 +#: views/accounts/register/imap-server.hbs:35 +#: views/accounts/register/imap-server.hbs:114 +msgid "Password" +msgstr "" + +#: views/accounts/register/imap.hbs:37 +msgid "Enter your account password" +msgstr "" + +#: views/accounts/register/imap.hbs:51 +#: views/accounts/register/imap-server.hbs:192 +msgid "Continue" +msgstr "" + #: views/accounts/register/imap-server.hbs:18 msgid "IMAP" msgstr ""