fix: bump deps to fix HEAD HTTP2 requests, sync locales, 30d vs 7d fo…

…r logs (for accuracy for now), log hash should use fingerprint of email if set, converted openpgp key to binary vs ascii armored plaintext
forwardemail · Feb 27, 2025 · e522432 · e522432
1 parent 66d86f4
commit e522432
Show file tree

Hide file tree

Showing 29 changed files with 190 additions and 59 deletions.
diff --git a/app/controllers/web/my-account/list-analytics.js b/app/controllers/web/my-account/list-analytics.js
@@ -101,10 +101,13 @@ async function listAnalytics(ctx) {
     return ctx.render('my-account/analytics');
   }
 
-  const THIRTY_DAYS_AGO = dayjs().subtract(30, 'day').startOf('day').toDate();
+  // const THIRTY_DAYS_AGO = dayjs().subtract(30, 'day').startOf('day').toDate();
+  const SEVEN_DAYS_AGO = dayjs().subtract(7, 'day').startOf('day').toDate();
 
   const dates = [dayjs().format('YYYY-MM-DD')];
-  for (let i = 0; i < 30; i++) {
+  // TODO: support 30d of logs
+  // for (let i = 0; i < 30; i++) {
+  for (let i = 0; i < 7; i++) {
     dates.unshift(
       dayjs().subtract(1, 'day').subtract(i, 'days').format('YYYY-MM-DD')
     );
@@ -266,7 +269,7 @@ async function listAnalytics(ctx) {
             $or: query.$or.map((obj) => ({
               // TODO: add an index for created_at + bounce_category + domain (?)
               created_at: {
-                $gte: THIRTY_DAYS_AGO
+                $gte: SEVEN_DAYS_AGO // THIRTY_DAYS_AGO
               },
               bounce_category: category,
               ...obj
@@ -310,7 +313,7 @@ async function listAnalytics(ctx) {
             $or: query.$or.map((obj) => ({
               // TODO: index here (?)
               created_at: {
-                $gte: THIRTY_DAYS_AGO
+                $gte: SEVEN_DAYS_AGO // THIRTY_DAYS_AGO
               },
               'err.responseCode': {
                 $exists: true,
@@ -328,7 +331,7 @@ async function listAnalytics(ctx) {
             $or: query.$or.map((obj) => ({
               // TODO: index here (?)
               created_at: {
-                $gte: THIRTY_DAYS_AGO
+                $gte: SEVEN_DAYS_AGO // THIRTY_DAYS_AGO
               },
               'err.responseCode': {
                 $exists: true,
@@ -391,7 +394,7 @@ async function listAnalytics(ctx) {
             $or: query.$or.map((obj) => ({
               // TODO: index here (?)
               created_at: {
-                $gte: THIRTY_DAYS_AGO
+                $gte: SEVEN_DAYS_AGO // THIRTY_DAYS_AGO
               },
               'err.responseCode': {
                 $exists: true,
@@ -412,7 +415,7 @@ async function listAnalytics(ctx) {
             $or: query.$or.map((obj) => ({
               // TODO: index here (?)
               created_at: {
-                $gte: THIRTY_DAYS_AGO
+                $gte: SEVEN_DAYS_AGO // THIRTY_DAYS_AGO
               },
               'err.responseCode': {
                 $exists: true,

diff --git a/app/models/logs.js b/app/models/logs.js
@@ -740,7 +740,10 @@ Logs.pre('validate', function (next) {
     //
     // TODO: logs should live for 30d not 7d
     //
-    this.hash = getQueryHash(this);
+    this.hash =
+      this?.meta?.session?.isAllowlisted && this?.meta?.session?.fingerprint
+        ? this.meta.session.fingerprint
+        : getQueryHash(this);
     next();
   } catch (err) {
     err.is_duplicate_log = true;

diff --git a/assets/.well-known/openpgpkey/hu/mxqp8ogw4jfq83a58pn1wy1ccc1cx3f5 b/assets/.well-known/openpgpkey/hu/mxqp8ogw4jfq83a58pn1wy1ccc1cx3f5
diff --git a/locales/ar.json b/locales/ar.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "تم تصفيته للمجالات:",
   "Filtered for domain:": "تم التصفية حسب النطاق:",
   "Chat with us": "الدردشة معنا",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "تعطيل التجديد التلقائي",
+  "You can validate your Web Key Directory setup at": "يمكنك التحقق من صحة إعداد دليل مفتاح الويب الخاص بك على",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(مفتوح المصدر) أو",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(ملكية)."
 }
diff --git a/locales/cs.json b/locales/cs.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Filtrováno pro domény:",
   "Filtered for domain:": "Filtrováno pro doménu:",
   "Chat with us": "Chatujte s námi",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Zakázat automatické obnovení",
+  "You can validate your Web Key Directory setup at": "Nastavení Web Key Directory můžete ověřit na",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(open-source) popř",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietární)."
 }
diff --git a/locales/da.json b/locales/da.json
@@ -7830,10 +7830,15 @@
   "Filtered for domain:": "Filtreret for domæne:",
   "Request Removal": "Anmod om fjernelse",
   "Chat with us": "Chat med os",
-  "Upgrade to Team": "Upgrade to Team",
-  "card, wallet, or bank": "card, wallet, or bank",
-  "You have an active <span class=\"notranslate\">%s</span> subscription.": "You have an active <span class=\"notranslate\">%s</span> subscription.",
-  "Auto-renew enabled": "Auto-renew enabled",
-  "Update Payment Method": "Update Payment Method",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Upgrade to Team": "Opgrader til Team",
+  "card, wallet, or bank": "kort, pung eller bank",
+  "You have an active <span class=\"notranslate\">%s</span> subscription.": "Du har et aktivt <span class=\"notranslate\">%s</span> -abonnement.",
+  "Auto-renew enabled": "Automatisk fornyelse aktiveret",
+  "Update Payment Method": "Opdater betalingsmetode",
+  "Disable Auto-Renew": "Deaktiver automatisk fornyelse",
+  "You can validate your Web Key Directory setup at": "Du kan validere din Web Key Directory-opsætning på",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(open source) eller",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietær)."
 }
diff --git a/locales/de.json b/locales/de.json
@@ -9847,5 +9847,10 @@
   "Filtered for domains:": "Gefiltert nach Domänen:",
   "Filtered for domain:": "Gefiltert nach Domäne:",
   "Chat with us": "Chatten Sie mit uns",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Automatische Verlängerung deaktivieren",
+  "You can validate your Web Key Directory setup at": "Sie können Ihr Web Key Directory-Setup validieren unter",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(Open Source) oder",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietär)."
 }
diff --git a/locales/en.json b/locales/en.json
@@ -6999,5 +6999,10 @@
   "Filtered for domain:": "Filtered for domain:",
   "Chat with us": "Chat with us",
   "No messages were selected": "No messages were selected",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Disable Auto-Renew",
+  "You can validate your Web Key Directory setup at": "You can validate your Web Key Directory setup at",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(open-source) or",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietary)."
 }
diff --git a/locales/es.json b/locales/es.json
@@ -10806,5 +10806,10 @@
   "Filtered for domains:": "Filtrado por dominios:",
   "Filtered for domain:": "Filtrado por dominio:",
   "Chat with us": "Chatea con nosotros",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Desactivar renovación automática",
+  "You can validate your Web Key Directory setup at": "Puede validar la configuración de su directorio de claves web en",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(código abierto) o",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(propiedad)."
 }
diff --git a/locales/fi.json b/locales/fi.json
@@ -10655,5 +10655,10 @@
   "Filtered for domains:": "Suodatettu verkkotunnuksille:",
   "Filtered for domain:": "Suodatettu verkkotunnukselle:",
   "Chat with us": "Keskustele kanssamme",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Poista automaattinen uusiminen käytöstä",
+  "You can validate your Web Key Directory setup at": "Voit vahvistaa Web Key Directory -asetukset osoitteessa",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(avoin lähdekoodi) tai",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(omistusoikeus)."
 }
diff --git a/locales/fr.json b/locales/fr.json
@@ -8353,9 +8353,14 @@
   "Filtered for domain:": "Filtré pour le domaine :",
   "Request Removal": "Demande de suppression",
   "Chat with us": "Discutez avec nous",
-  "card, wallet, or bank": "card, wallet, or bank",
-  "You have an active <span class=\"notranslate\">%s</span> subscription.": "You have an active <span class=\"notranslate\">%s</span> subscription.",
-  "Auto-renew enabled": "Auto-renew enabled",
-  "Update Payment Method": "Update Payment Method",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "card, wallet, or bank": "carte, portefeuille ou banque",
+  "You have an active <span class=\"notranslate\">%s</span> subscription.": "Vous avez un abonnement <span class=\"notranslate\">%s</span> actif.",
+  "Auto-renew enabled": "Renouvellement automatique activé",
+  "Update Payment Method": "Mettre à jour le mode de paiement",
+  "Disable Auto-Renew": "Désactiver le renouvellement automatique",
+  "You can validate your Web Key Directory setup at": "Vous pouvez valider la configuration de votre répertoire de clés Web à l'adresse",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(open source) ou",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(propriétaire)."
 }
diff --git a/locales/he.json b/locales/he.json
@@ -8847,9 +8847,14 @@
   "Filtered for domain:": "מסונן עבור דומיין:",
   "Request Removal": "בקש הסרה",
   "Chat with us": "צ'אט איתנו",
-  "card, wallet, or bank": "card, wallet, or bank",
-  "You have an active <span class=\"notranslate\">%s</span> subscription.": "You have an active <span class=\"notranslate\">%s</span> subscription.",
-  "Auto-renew enabled": "Auto-renew enabled",
-  "Update Payment Method": "Update Payment Method",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "card, wallet, or bank": "כרטיס, ארנק או בנק",
+  "You have an active <span class=\"notranslate\">%s</span> subscription.": "יש לך מנוי <span class=\"notranslate\">%s</span> פעיל.",
+  "Auto-renew enabled": "חידוש אוטומטי מופעל",
+  "Update Payment Method": "עדכן את אמצעי התשלום",
+  "Disable Auto-Renew": "השבת את החידוש האוטומטי",
+  "You can validate your Web Key Directory setup at": "אתה יכול לאמת את ההגדרה של ספריית מפתחות האינטרנט שלך בכתובת",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(קוד פתוח) או",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(קנייני)."
 }
diff --git a/locales/hu.json b/locales/hu.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Domainekre szűrve:",
   "Filtered for domain:": "Domainre szűrve:",
   "Chat with us": "Csevegés velünk",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Az automatikus megújítás letiltása",
+  "You can validate your Web Key Directory setup at": "A Web Key Directory beállítását a következő címen érvényesítheti",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(nyílt forráskódú) ill",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(szabadalmazott)."
 }
diff --git a/locales/id.json b/locales/id.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Difilter berdasarkan domain:",
   "Filtered for domain:": "Difilter berdasarkan domain:",
   "Chat with us": "Ngobrol dengan kami",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Nonaktifkan Perpanjangan Otomatis",
+  "You can validate your Web Key Directory setup at": "Anda dapat memvalidasi pengaturan Direktori Kunci Web Anda di",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(sumber terbuka) atau",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(hak milik)."
 }
diff --git a/locales/it.json b/locales/it.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Filtrato per domini:",
   "Filtered for domain:": "Filtrato per dominio:",
   "Chat with us": "Chatta con noi",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Disattiva il rinnovo automatico",
+  "You can validate your Web Key Directory setup at": "Puoi convalidare la configurazione della tua Web Key Directory su",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(open source) o",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietario)."
 }
diff --git a/locales/ja.json b/locales/ja.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "ドメインでフィルタリング:",
   "Filtered for domain:": "ドメインでフィルタリング:",
   "Chat with us": "チャットでお問い合わせください",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "自動更新を無効にする",
+  "You can validate your Web Key Directory setup at": "Webキーディレクトリの設定は、次の場所で確認できます。",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "（オープンソース）または",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "（独自仕様）。"
 }
diff --git a/locales/ko.json b/locales/ko.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "도메인에 대해 필터링됨:",
   "Filtered for domain:": "도메인에 대해 필터링됨:",
   "Chat with us": "우리와 채팅하세요",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "자동 갱신 비활성화",
+  "You can validate your Web Key Directory setup at": "웹 키 디렉토리 설정을 다음에서 확인할 수 있습니다.",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(오픈소스) 또는",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(소유권)."
 }
diff --git a/locales/nl.json b/locales/nl.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Gefilterd op domeinen:",
   "Filtered for domain:": "Gefilterd op domein:",
   "Chat with us": "Chat met ons",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Automatisch verlengen uitschakelen",
+  "You can validate your Web Key Directory setup at": "U kunt uw Web Key Directory-instelling valideren op",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(open source) of",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(eigendom)."
 }
diff --git a/locales/no.json b/locales/no.json
@@ -10813,5 +10813,10 @@
   "Filtered for domains:": "Filtrert for domener:",
   "Filtered for domain:": "Filtrert for domene:",
   "Chat with us": "Chat med oss",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Deaktiver automatisk fornyelse",
+  "You can validate your Web Key Directory setup at": "Du kan validere Web Key Directory-oppsettet på",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(åpen kildekode) eller",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietær)."
 }
diff --git a/locales/pl.json b/locales/pl.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Filtrowano według domen:",
   "Filtered for domain:": "Filtrowano według domeny:",
   "Chat with us": "Porozmawiaj z nami",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Wyłącz automatyczne odnawianie",
+  "You can validate your Web Key Directory setup at": "Możesz sprawdzić poprawność konfiguracji katalogu kluczy internetowych pod adresem",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(oprogramowanie typu open source) lub",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(prawnie zastrzeżony)."
 }
diff --git a/locales/pt.json b/locales/pt.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Filtrado para domínios:",
   "Filtered for domain:": "Filtrado por domínio:",
   "Chat with us": "Converse conosco",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Desativar renovação automática",
+  "You can validate your Web Key Directory setup at": "Você pode validar a configuração do seu Web Key Directory em",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(código aberto) ou",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(proprietário)."
 }
diff --git a/locales/ru.json b/locales/ru.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Отфильтровано по доменам:",
   "Filtered for domain:": "Отфильтровано по домену:",
   "Chat with us": "Пообщайтесь с нами",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Отключить автоматическое продление",
+  "You can validate your Web Key Directory setup at": "Вы можете проверить настройки вашего веб-каталога ключей по адресу",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(с открытым исходным кодом) или",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(собственность)."
 }
diff --git a/locales/sv.json b/locales/sv.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Filtrerat för domäner:",
   "Filtered for domain:": "Filtrerat för domän:",
   "Chat with us": "Chatta med oss",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Inaktivera automatisk förnyelse",
+  "You can validate your Web Key Directory setup at": "Du kan validera din webbnyckelkatalog på",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(öppen källkod) eller",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(egendom)."
 }
diff --git a/locales/th.json b/locales/th.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "กรองตามโดเมน:",
   "Filtered for domain:": "กรองตามโดเมน:",
   "Chat with us": "พูดคุยกับเรา",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "ปิดใช้งานการต่ออายุอัตโนมัติ",
+  "You can validate your Web Key Directory setup at": "คุณสามารถตรวจสอบการตั้งค่าไดเร็กทอรีคีย์เว็บของคุณได้ที่",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(โอเพ่นซอร์ส) หรือ",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(เป็นกรรมสิทธิ์)"
 }
diff --git a/locales/tr.json b/locales/tr.json
@@ -10808,5 +10808,10 @@
   "Filtered for domains:": "Alan adlarına göre filtrelendi:",
   "Filtered for domain:": "Alan adına göre filtrelendi:",
   "Chat with us": "Bizimle sohbet edin",
-  "Disable Auto-Renew": "Disable Auto-Renew"
+  "Disable Auto-Renew": "Otomatik Yenilemeyi Devre Dışı Bırak",
+  "You can validate your Web Key Directory setup at": "Web Anahtar Dizini kurulumunuzu şu adreste doğrulayabilirsiniz:",
+  "https://wkd.chimbosonic.com/": "https://wkd.chimbosonic.com/",
+  "(open-source) or": "(açık kaynak) veya",
+  "https://www.webkeydirectory.com/": "https://www.webkeydirectory.com/",
+  "(proprietary).": "(tescilli)."
 }