Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Add support for domain allowlists in addition to blocklists. Closes #2230.

Kailash Nadhb8f50eafa3db
diff --git a/cmd/init.go b/cmd/init.go
index cdd94009..c9067528 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -79,6 +79,7 @@ type constants struct {
UnsubHeader bool `koanf:"unsubscribe_header"`
Exportable map[string]bool `koanf:"-"`
DomainBlocklist []string `koanf:"-"`
+ DomainAllowlist []string `koanf:"-"`
} `koanf:"privacy"`
Security struct {
OIDC struct {
@@ -410,6 +411,7 @@ func initConstants() *constants {
c.MediaUpload.Provider = ko.String("upload.provider")
c.MediaUpload.Extensions = ko.Strings("upload.extensions")
c.Privacy.DomainBlocklist = ko.Strings("privacy.domain_blocklist")
+ c.Privacy.DomainAllowlist = ko.Strings("privacy.domain_allowlist")
// Static URLS.
// url.com/subscription/{campaign_uuid}/{subscriber_uuid}
@@ -535,6 +537,7 @@ func initImporter(q *models.Queries, db *sqlx.DB, core *core.Core, app *App) *su
return subimporter.New(
subimporter.Options{
DomainBlocklist: app.constants.Privacy.DomainBlocklist,
+ DomainAllowlist: app.constants.Privacy.DomainAllowlist,
UpsertStmt: q.UpsertSubscriber.Stmt,
BlocklistStmt: q.UpsertBlocklistSubscriber.Stmt,
UpdateListDateStmt: q.UpdateListsDate.Stmt,
diff --git a/cmd/settings.go b/cmd/settings.go
index 519f84c2..7a1a4e9c 100644
--- a/cmd/settings.go
+++ b/cmd/settings.go
@@ -58,13 +58,13 @@ func handleGetSettings(c echo.Context) error {
}
// Empty out passwords.
- for i := 0; i < len(s.SMTP); i++ {
+ for i := range s.SMTP {
s.SMTP[i].Password = strings.Repeat(pwdMask, utf8.RuneCountInString(s.SMTP[i].Password))
}
- for i := 0; i < len(s.BounceBoxes); i++ {
+ for i := range s.BounceBoxes {
s.BounceBoxes[i].Password = strings.Repeat(pwdMask, utf8.RuneCountInString(s.BounceBoxes[i].Password))
}
- for i := 0; i < len(s.Messengers); i++ {
+ for i := range s.Messengers {
s.Messengers[i].Password = strings.Repeat(pwdMask, utf8.RuneCountInString(s.Messengers[i].Password))
}
@@ -232,16 +232,23 @@ func handleUpdateSettings(c echo.Context) error {
set.UploadExtensions[n] = strings.ToLower(strings.TrimPrefix(strings.TrimSpace(v), "."))
}
- // Domain blocklist.
- doms := make([]string, 0)
+ // Domain blocklist / allowlist.
+ doms := make([]string, 0, len(set.DomainBlocklist))
for _, d := range set.DomainBlocklist {
- d = strings.TrimSpace(strings.ToLower(d))
- if d != "" {
+ if d = strings.TrimSpace(strings.ToLower(d)); d != "" {
doms = append(doms, d)
}
}
set.DomainBlocklist = doms
+ doms = make([]string, 0, len(set.DomainAllowlist))
+ for _, d := range set.DomainAllowlist {
+ if d = strings.TrimSpace(strings.ToLower(d)); d != "" {
+ doms = append(doms, d)
+ }
+ }
+ set.DomainAllowlist = doms
+
// Validate slow query caching cron.
if set.CacheSlowQueries {
if _, err := cron.ParseStandard(set.CacheSlowQueriesInterval); err != nil {
diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue
index 92b4e2d5..2ea81851 100644
--- a/frontend/src/views/Settings.vue
+++ b/frontend/src/views/Settings.vue
@@ -194,6 +194,7 @@ export default Vue.extend({
// Domain blocklist array from multi-line strings.
form['privacy.domain_blocklist'] = form['privacy.domain_blocklist'].split('\n').map((v) => v.trim().toLowerCase()).filter((v) => v !== '');
+ form['privacy.domain_allowlist'] = form['privacy.domain_allowlist'].split('\n').map((v) => v.trim().toLowerCase()).filter((v) => v !== '');
this.isLoading = true;
this.$api.updateSettings(form).then((data) => {
@@ -236,6 +237,7 @@ export default Vue.extend({
// Domain blocklist array to multi-line string.
d['privacy.domain_blocklist'] = d['privacy.domain_blocklist'].join('\n');
+ d['privacy.domain_allowlist'] = d['privacy.domain_allowlist'].join('\n');
this.key += 1;
this.form = d;
diff --git a/frontend/src/views/settings/privacy.vue b/frontend/src/views/settings/privacy.vue
index 4487f703..c94ef1ad 100644
--- a/frontend/src/views/settings/privacy.vue
+++ b/frontend/src/views/settings/privacy.vue
@@ -29,9 +29,20 @@
<b-switch v-model="data['privacy.record_optin_ip']" name="privacy.record_optin_ip" />
</b-field>
- <b-field :label="$t('settings.privacy.domainBlocklist')" :message="$t('settings.privacy.domainBlocklistHelp')">
- <b-input type="textarea" v-model="data['privacy.domain_blocklist']" name="privacy.domain_blocklist" />
- </b-field>
+ <hr />
+
+ <b-tabs v-model="tab" type="is-boxed" :animated="false">
+ <b-tab-item :label="`${$t('settings.privacy.domainBlocklist')} (${numBlocked})`">
+ <b-field :message="$t('settings.privacy.domainBlocklistHelp')">
+ <b-input type="textarea" v-model="data['privacy.domain_blocklist']" name="privacy.domain_blocklist" />
+ </b-field>
+ </b-tab-item>
+ <b-tab-item :label="`${$t('settings.privacy.domainAllowlist')} (${numAllowed})`">
+ <b-field :message="$t('settings.privacy.domainAllowlistHelp')">
+ <b-input type="textarea" v-model="data['privacy.domain_allowlist']" name="privacy.domain_allowlist" />
+ </b-field>
+ </b-tab-item>
+ </b-tabs>
</div>
</template>
@@ -48,7 +59,33 @@ export default Vue.extend({
data() {
return {
data: this.form,
+ tab: 0,
};
},
+
+ methods: {
+ countItems(str) {
+ return str.split('\n').filter((line) => line.trim()).length;
+ },
+ },
+
+ mounted() {
+ this.tab = this.$utils.getPref('settings.privacyDomainTab') || 0;
+ },
+
+ computed: {
+ numBlocked() {
+ return this.countItems(this.form['privacy.domain_blocklist']);
+ },
+ numAllowed() {
+ return this.countItems(this.form['privacy.domain_allowlist']);
+ },
+ },
+
+ watch: {
+ tab(t) {
+ this.$utils.setPref('settings.privacyDomainTab', t);
+ },
+ },
});
</script>
diff --git a/i18n/bg.json b/i18n/bg.json
index daea4090..ced8a1a5 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Разрешаване на абонатите да променят предпочитанията си, като например техните имена и множество абонаменти за списъци.",
"settings.privacy.allowWipe": "Разрешаване на изтриване",
"settings.privacy.allowWipeHelp": "Разрешаване на абонатите да изтриват себе си, включително техните абонаменти и всички други данни от базата данни. Прегледите на кампаниите и кликовете върху връзките също се премахват, докато броят на прегледите и кликовете остава (без абонат, свързан с тях), така че статистиката и анализите да не бъдат засегнати.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Черен списък на домейни",
"settings.privacy.domainBlocklistHelp": "Имейл адреси с тези домейни не могат да се абонират. Въведете по един домейн на ред, напр.: somesite.com",
"settings.privacy.individualSubTracking": "Индивидуално проследяване на абонати",
diff --git a/i18n/ca.json b/i18n/ca.json
index 6fc0d207..74bf6d13 100644
--- a/i18n/ca.json
+++ b/i18n/ca.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permet als subscriptors fer canvis de les preferències tals com els seus noms o la subscripció a múltiples llistes.",
"settings.privacy.allowWipe": "Permet l'esborrat permanent",
"settings.privacy.allowWipeHelp": "Permet als subscriptors esborrar-se, incloses les seves subscripcions i totes les altres dades de la base de dades. Les visualitzacions de campanya i els clics als enllaços també s'eliminen mentre es mantenen les visualitzacions i els recomptes de clics (sense subscriptors associats a ells) de manera que les estadístiques i els indicadors no es veuran afectats.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Llista de dominis bloquejats",
"settings.privacy.domainBlocklistHelp": "No es permet la subscripció a les adreces de correu electrònic amb aquests dominis. Introduïu un domini per línia, per exemple: somesite.com",
"settings.privacy.individualSubTracking": "Seguiment individual de subscriptors",
diff --git a/i18n/cs-cz.json b/i18n/cs-cz.json
index d20ec1e0..23caed5c 100644
--- a/i18n/cs-cz.json
+++ b/i18n/cs-cz.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Povolit přihlášeným změnu předvoleb jako jsou jména a přihlášení k více seznamům.",
"settings.privacy.allowWipe": "Umožnit vymazání",
"settings.privacy.allowWipeHelp": "Umožnit odběratelům odstranit sebe včetně svých odběrů a všech ostatních dat z databáze. Pohledy na kampaně a klepnutí na odkazy se rovněž odeberou, zatímco pohledy a počty klepnutí se zachovají (aniž by měly přidruženého odběratele), takže statistiky a analýzy nebudou ovlivněny.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Seznam blokovaných domén",
"settings.privacy.domainBlocklistHelp": "E-mailové adresy z těchto domén se nemohou přihlásit k odběru. Uveďte jednu doménu na řádek, eg: somesite.com",
"settings.privacy.individualSubTracking": "Sledování jednotlivých odběratelů",
diff --git a/i18n/cy.json b/i18n/cy.json
index d8a4d044..51c59de0 100644
--- a/i18n/cy.json
+++ b/i18n/cy.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Caniatáu i danysgrifwyr newid dewisiadau fel eu henw a pha restrau maent wedi tanysgrifio iddynt.",
"settings.privacy.allowWipe": "Caniatáu sgubo",
"settings.privacy.allowWipeHelp": "Caniatáu i danysgrifwyr ddileu eu hunain",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Rhestr rhwystro parthau",
"settings.privacy.domainBlocklistHelp": "Nid oes gan gyfeiriadau e-bost yn y parthau hyn yr hawl i danysgrifio. Rhowch un parth i bob llinell",
"settings.privacy.individualSubTracking": "Olrhain tanysgrifwyr unigol",
diff --git a/i18n/da.json b/i18n/da.json
index 97b623f1..257ac6cf 100644
--- a/i18n/da.json
+++ b/i18n/da.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Tillad abonnenter at ændre præferencer såsom deres navne og abonnementer på flere lister.",
"settings.privacy.allowWipe": "Tillad aftørring",
"settings.privacy.allowWipeHelp": "Tillad abonnenter at slette sig selv, herunder deres abonnementer og alle andre data fra databasen. Kampagnevisninger og klik på link fjernes også, mens visninger og klikantal forbliver (uden abonnent tilknyttet dem), så statistik og analyser ikke påvirkes.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domæne blokeringsliste",
"settings.privacy.domainBlocklistHelp": "E-mail-adresser med disse domæner må ikke abonnere. Indtast et domæne pr. linje, f.eks.: somesite.com",
"settings.privacy.individualSubTracking": "Sporing af individuelle abonnenter",
diff --git a/i18n/de.json b/i18n/de.json
index 049a969e..de52ddf2 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Erlaube den Abonnenten, ihre Einstellungen zu ändern, wie z. B. ihren Namen und mehrere Listenabonnements.",
"settings.privacy.allowWipe": "Löschen aktivieren",
"settings.privacy.allowWipeHelp": "Erlaube Abonnenten alle Daten, welche über sie gespeichert sind zu löschen. Dies beinhaltet auch Klicks und Anzeigen, verändert allerdings nicht die Gesamtzahl. Statistiken bleiben auch unverändert.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domain-Sperrliste",
"settings.privacy.domainBlocklistHelp": "E-Mail Adressen dieser Domains sind vom Abonnieren ausgeschlossen. Eine Domain pro Zeile, z.B. somesite.com",
"settings.privacy.individualSubTracking": "Einzelabonnenten Tracking",
diff --git a/i18n/el.json b/i18n/el.json
index 05ea481d..80c940a7 100644
--- a/i18n/el.json
+++ b/i18n/el.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Να επιτρέπεται στους συνδρομητές να αλλάξουν τις προτιμήσεις τους, όπως τα ονόματά τους και τις συνδρομές σε πολλαπλές λίστες.",
"settings.privacy.allowWipe": "Να επιτρέπεται η ολική εκκαθάριση",
"settings.privacy.allowWipeHelp": "Να επιτρέπεται στους συνδρομητές να διαγράφουν τους εαυτούς τους, συμπεριλαμβανομένων των εγγραφών τους και όλων των άλλων δεδομένων από τη βάση δεδομένων. Οι προβολές εκστρατειών και τα κλικ σε συνδέσμους διαγράφονται επίσης, ενώ οι καταγραφές του πλήθους των προβολές και των κλικ παραμένουν (χωρίς να συνδέεται με αυτά κανένας συνδρομητής), ώστε να μην επηρεάζονται τα στατιστικά και τα αναλυτικά στοιχεία.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Λίστα αποκλεισμένων domain",
"settings.privacy.domainBlocklistHelp": "Οι διευθύνσεις ηλεκτρονικού ταχυδρομείου σε αυτά τα domain δεν μπορούν να εγγραφούν. Εισάγετε ένα domain ανά γραμμή, π.χ.: somesite.com",
"settings.privacy.individualSubTracking": "Παρακολούθηση μεμονωμένων συνδρομητών",
diff --git a/i18n/en.json b/i18n/en.json
index dd451173..426c5ce5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -506,7 +506,9 @@
"settings.privacy.allowWipe": "Allow wiping",
"settings.privacy.allowWipeHelp": "Allow subscribers to delete themselves including their subscriptions and all other data from the database. Campaign views and link clicks are also removed while views and click counts remain (with no subscriber associated to them) so that stats and analytics are not affected.",
"settings.privacy.domainBlocklist": "Domain blocklist",
- "settings.privacy.domainBlocklistHelp": "E-mail addresses with these domains are disallowed from subscribing. Enter one domain per line, eg: somesite.com",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainBlocklistHelp": "E-mail addresses with these domains are disallowed from subscribing. Enter one domain per line, eg: example.com",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.individualSubTracking": "Individual subscriber tracking",
"settings.privacy.individualSubTrackingHelp": "Track subscriber-level campaign views and clicks. When disabled, view and click tracking continue without being linked to individual subscribers.",
"settings.privacy.listUnsubHeader": "Include `List-Unsubscribe` header",
diff --git a/i18n/eo.json b/i18n/eo.json
index a90b6ac5..60e336bc 100644
--- a/i18n/eo.json
+++ b/i18n/eo.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permet als subscriptors fer canvis de les preferències tals com els seus noms o la subscripció a múltiples llistes.",
"settings.privacy.allowWipe": "Permet l'esborrat permanent",
"settings.privacy.allowWipeHelp": "Permet als subscriptors esborrar-se, incloses les seves subscripcions i totes les altres dades de la base de dades. Les visualitzacions de campanya i els clics als enllaços també s'eliminen mentre es mantenen les visualitzacions i els recomptes de clics (sense subscriptors associats a ells) de manera que les estadístiques i els indicadors no es veuran afectats.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Llista de dominis bloquejats",
"settings.privacy.domainBlocklistHelp": "No es permet la subscripció a les adreces de correu electrònic amb aquests dominis. Introduïu un domini per línia, per exemple: somesite.com",
"settings.privacy.individualSubTracking": "Seguiment individual de subscriptors",
diff --git a/i18n/es.json b/i18n/es.json
index ee68f5e7..0ca6acb3 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permitir a las cuentas suscritas realizar cambios como nombre o pertenencia a diferentes listas.",
"settings.privacy.allowWipe": "Permitir limpieza de datos",
"settings.privacy.allowWipeHelp": "Permitir a los suscriptores eliminarse incluyendo sus suscripciones y todos sus datos de la base de datos. Las vistas de las campañas y los vínculos cliqueados también son eliminados mientras que las vistas y el conteo de clics se mantienen. (sin suscriptores asociados a ellos) de manera que las estadísticas y el análisis no se vea afectado.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Listado de dominios bloqueados",
"settings.privacy.domainBlocklistHelp": "Los correos electrónicos de estos dominios estan desabilitados para suscribirse. Introduzca un dominio por línea, por ejemplo: unsitio.com",
"settings.privacy.individualSubTracking": "Seguimiento de suscriptor inválido.",
diff --git a/i18n/fi.json b/i18n/fi.json
index c8070fe0..b888a4f8 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Salli tilaajien muuttaa asetuksia, kuten nimiä ja tilauslistoja.",
"settings.privacy.allowWipe": "Salli poistaminen",
"settings.privacy.allowWipeHelp": "Salli tilaajien poistaa itsensä sisältäen tilaukset ja kaikki muut tiedot tietokannasta. Kampanjan katselut ja linkkiklikkaukset poistuvat myös, kun näkymät ja klikki- tai näyttömäärät säilyvät (ilman tilaajaa niihin nimettynä), jotta tilastotiedot ja analytiikka eivät häiriinny.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Verkkotunnus-estolista",
"settings.privacy.domainBlocklistHelp": "Tilaajien sähköpostiosoitteet näistä verkkotunnuksista estetään liittymästä postituslistoille. Lisää yksi verkkotunnus per rivi, esim: esimerkki.fi",
"settings.privacy.individualSubTracking": "Yksittäinen tilaajatason seuranta",
diff --git a/i18n/fr-CA.json b/i18n/fr-CA.json
index 78e42b37..41497e1f 100644
--- a/i18n/fr-CA.json
+++ b/i18n/fr-CA.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permettre aux abonnés de modifier leurs préférences, comme leur nom et l'abonnement à plusieurs listes.",
"settings.privacy.allowWipe": "Autoriser la suppression des données par les abonné·es",
"settings.privacy.allowWipeHelp": "Autoriser les abonné·es à supprimer leurs abonnements et toutes les autres données de la base de données. Les vues de campagne et les clics sur les liens sont également supprimés, tandis que le compteur de vues et de nombre de clics globaux restent inchangés (aucun·e abonné·e ne leur est associé) afin que les statistiques et les analyses ne soient pas affectées.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domaine bloqué",
"settings.privacy.domainBlocklistHelp": "Les adresses courriels avec ces domaines ne sont pas autorisées à s'abonner. Entrer un domaine par ligne, exple : somesite.com",
"settings.privacy.individualSubTracking": "Suivi individuel des abonné·es (vérifiez si la légalislation l'autorise)",
diff --git a/i18n/fr.json b/i18n/fr.json
index 9e0c3a51..8c7b9519 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permettre aux abonnés de modifier leurs préférences, comme leur nom et l'abonnement à plusieurs listes.",
"settings.privacy.allowWipe": "Autoriser la suppression des données par les abonné·es",
"settings.privacy.allowWipeHelp": "Autoriser les abonné·es à supprimer leurs abonnements et toutes les autres données de la base de données. Les vues de campagne et les clics sur les liens sont également supprimés, tandis que le compteur de vues et de nombre de clics globaux restent inchangés (aucun·e abonné·e ne leur est associé) afin que les statistiques et les analyses ne soient pas affectées.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domaine bloqué",
"settings.privacy.domainBlocklistHelp": "Les adresses e-mail avec ces domaines ne sont pas autorisées à s'abonner. Entrer un domaine par ligne, exple : somesite.com",
"settings.privacy.individualSubTracking": "Suivi individuel des abonné·es (vérifiez si la légalislation l'autorise)",
diff --git a/i18n/he.json b/i18n/he.json
index 0ba096d4..09c4ebab 100644
--- a/i18n/he.json
+++ b/i18n/he.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "ניתן למנויים לשתף פעולה בשינוי בחירות כמו שמותיהם ורישומי המנויים הרבים.",
"settings.privacy.allowWipe": "אישור מחיקה",
"settings.privacy.allowWipeHelp": "ניתן למנויים למחוק את עצמם כולל מינויים וכל הנתונים הקשורים להם ממסד הנתונים. תוספות חישוב גם מסירות הודעות וחיצונית בזמו שנשארו (ללא subscriber משוייך אליהם) בזמן מדידת נתונים כדי שלא יתפקעו נתונים וניתוחים.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "רשימת החסימה",
"settings.privacy.domainBlocklistHelp": "כתובות דואר אלקטרוני באמצעות שמן נאסר על הרשות להרשים. שמות התחומים יבשים על כל שורה. לדוגמה: somesite.com",
"settings.privacy.individualSubTracking": "מעקב אישי של המנויים",
diff --git a/i18n/hu.json b/i18n/hu.json
index a58b990e..1d6e0bc3 100644
--- a/i18n/hu.json
+++ b/i18n/hu.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "A tagok módosíthatják tagságukat (nevüket, listáikat, stb.).",
"settings.privacy.allowWipe": "Tagság törlése",
"settings.privacy.allowWipeHelp": "A tagok törölhetik midnen adatukat az adatbázisból. A megtekintések és kattintások száma megmarad (nem tagokkal társítva), így ez a kimutatásokat nem érinti.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domain tiltólista",
"settings.privacy.domainBlocklistHelp": "A felsorolt domainekhez tartozó e-mail címekkel nem lehet feliratkozni. Soronként egy domaint adjon meg, pl.: teszt.hu",
"settings.privacy.individualSubTracking": "Megtekintések és kattintások tagokhoz kötése",
diff --git a/i18n/it.json b/i18n/it.json
index d0123fcf..5265daa2 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Consenti agli iscritti di modificare le preferenze come il loro nome e le sottoscrizioni a più liste.",
"settings.privacy.allowWipe": "Autorizza la cancellazione",
"settings.privacy.allowWipeHelp": "Autorizza gli iscritti a cancellare le loro iscrizioni e tutti gli altri dati dal database. Le visualizzazioni della campagna e i clic sui link verranno anch'essi cancellati, mentre i contatori globali delle visualizzazioni e del numero di clic restano invariati (nessun iscritto vi è associato) in modo che le statistiche non siano compromesse.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Dominio della lista di blocco",
"settings.privacy.domainBlocklistHelp": "Le caselle di posta di questi domini sono vietate dalla iscrizione. Inserire un dominio per riga, ad esempio: pincopallino.com",
"settings.privacy.individualSubTracking": "Follow-up individuale degli abbonati",
diff --git a/i18n/jp.json b/i18n/jp.json
index 32601b0e..83fb990b 100644
--- a/i18n/jp.json
+++ b/i18n/jp.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "加入者に個人設定変更(名前やサブスクリプション状態)を許可する。",
"settings.privacy.allowWipe": "ワイプを許可する",
"settings.privacy.allowWipeHelp": "加入者サブスクリプション含むすべてのデータを含めて、データベースから自身を削除することを許可する。キャンペーンビューとリンククリックも削除されるが、統計と分析に影響が出ないよう、ビューとクリックカウントは残る (加入者を持たない状態)。",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "ドメインブロックリスト",
"settings.privacy.domainBlocklistHelp": "これらのドメインを持つメールアドレスは加入することができません。各行に一つドメインを入れてください。例: somesite.com",
"settings.privacy.individualSubTracking": "加入者個別追跡",
diff --git a/i18n/ml.json b/i18n/ml.json
index 58bffe64..172355e7 100644
--- a/i18n/ml.json
+++ b/i18n/ml.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "വരിക്കാരെ അവരുടെ പേരുകളും ഒന്നിലധികം ലിസ്റ്റ് സബ്‌സ്‌ക്രിപ്‌ഷനുകളും പോലുള്ള മുൻഗണനകൾ മാറ്റാൻ അനുവദിക്കുക.",
"settings.privacy.allowWipe": "വിവരങ്ങൾ എന്നന്നേയ്ക്കുമായി ഇല്ലാതാക്കുന്നത് അനുവദിക്കുക",
"settings.privacy.allowWipeHelp": "ഉപഭോക്താക്കളെ അവരുടെ വരിക്കാരായിട്ടുള്ള ലിസ്റ്റുകളും മറ്റു വിവരങ്ങളും ഡാറ്റാബേസിൽ നിന്നും ഇല്ലാതാക്കാൻ അനുവദിക്കുക.ക്യാമ്പെയ്ൻ കാഴ്ചകളും കണ്ണികളിന്മേലുള്ള ക്ലിക്കുകളുടെ വിവരങ്ങളും ഇല്ലാതാക്കുമെങ്കിലും കാഴ്ചകളുടെയും കണ്ണിയിലുള്ള ക്ലിക്കുകളുടെ (ഉപഭോക്തൃ വിവരങ്ങളില്ലാതെ) എണ്ണവും നിലനിൽക്കും. അതിനാൽ സ്ഥിതിവിവരക്കണക്കുകളെയും വിശകലനങ്ങളെയും ബാധിക്കില്ല.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "ഡൊമെയ്ൻ ബ്ലോക്ക്ലിസ്റ്റ്",
"settings.privacy.domainBlocklistHelp": "ഈ ഡൊമെയ്‌നുകളുള്ള ഇമെയിൽ വിലാസങ്ങൾ സബ്‌സ്‌ക്രൈബുചെയ്യുന്നതിൽ നിന്ന് അനുവദനീയമല്ല. ഓരോ വരിയിലും ഒരു ഡൊമെയ്ൻ നൽകുക. ഉദാ: somesite.com",
"settings.privacy.individualSubTracking": "വ്യക്തിഗത വരിക്കാരെ പിൻതുടരുക",
diff --git a/i18n/nl.json b/i18n/nl.json
index d536acb3..030e0637 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Abonnees toestaan ​​om voorkeuren zoals hun naam en meerdere lijstabonnementen te wijzigen.",
"settings.privacy.allowWipe": "Data wipe toestaan",
"settings.privacy.allowWipeHelp": "Abonnees toelaten zichzelf, al hun inschrijvingen en alle andere data over hun te verwijderen uit de database. Views en klikken op links van campagnes worden verwijderd, maar het aantal views en kliks blijft hetzelfde zodat statistieken niet veranderen.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domein blocklist",
"settings.privacy.domainBlocklistHelp": "E-mail adressen met deze domeinen kunnen zich niet inschrijven. Geef een domein in per lijn, bv.: somesite.com",
"settings.privacy.individualSubTracking": "Individuele abonnees volgen",
diff --git a/i18n/no.json b/i18n/no.json
index efa71886..903f84f5 100644
--- a/i18n/no.json
+++ b/i18n/no.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Tillat abonnenter å endre preferanser, for eksempel navn og hvilke lister de er abonnert på.",
"settings.privacy.allowWipe": "Tillat sletting",
"settings.privacy.allowWipeHelp": "Tillat abonnenter å slette seg selv, inkludert abonnementer og all annen data fra databasen. Kampanjevisninger og lenkeklikk fjernes også, mens statistikk og analyse forblir (uten tilknytning til abonnenter).",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Blokkerte domener",
"settings.privacy.domainBlocklistHelp": "E-postadresser med disse domenene er ikke tillatt å abonnere. Skriv inn ett domene per linje, f.eks. somesite.com",
"settings.privacy.individualSubTracking": "Individuell abonnentsporing",
diff --git a/i18n/pl.json b/i18n/pl.json
index 38692245..b78712b9 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Zezwól subskrybentom na zmianę ustawień takich jak imię czy subskrybowane listy",
"settings.privacy.allowWipe": "Zezwól na czyszczenie danych",
"settings.privacy.allowWipeHelp": "Czy zezwolić subskrybentom na usuwanie ich samych razem z wszystkimi ich danymi? Wyświetlenia i liczba kliknięć zostaną zachowane, ale zostaną z nich usunięte informacje kto wykonał tę akcję.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Lista zablokowanych domen",
"settings.privacy.domainBlocklistHelp": "Adresy e-mail z tymi domenami nie mogą subskrybować. Wprowadź jedną domenę w każdym wierszu, np.: domena.com",
"settings.privacy.individualSubTracking": "Śledzenie indywidualnych subskrybentów",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index d32f8ba5..eb06df4c 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permita que os assinantes alterem as preferências, como seus nomes e assinaturas de várias listas.",
"settings.privacy.allowWipe": "Permitir limpeza",
"settings.privacy.allowWipeHelp": "Permitir que os assinantes se excluam incluindo suas inscrições e todos os outros dados da base de dados. Visualizações da campanha e cliques de links também são removidos enquanto o total de visualizações e cliques permanecem (com nenhum inscrito associado a eles) para que as estatísticas e análises não sejam afetadas.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Blocklist de domínios",
"settings.privacy.domainBlocklistHelp": "Endereços de e-mail com estes domínios serão proibidos de se cadastrarem. Um domínio por linha, ex: somesite.com",
"settings.privacy.individualSubTracking": "Rastreamento individual de inscrito",
diff --git a/i18n/pt.json b/i18n/pt.json
index 6ac631a1..13ecbe20 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permitir que os subscritores alterem as suas preferências, como o seu nome e a sua subscrição às diversas listas.",
"settings.privacy.allowWipe": "Permitir eliminação de dados",
"settings.privacy.allowWipeHelp": "Permitir aos subscritores eliminar todos os seus dados, incluindo as suas subscrições, da base de dados. Visualizações de campanhas e cliques em links também são removidos enquanto visualizações e contagem de clicks permanecem (sem nenhum subscritor associado) para que as estatísticas não sejam afetadas.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Lista de domínios bloqueados",
"settings.privacy.domainBlocklistHelp": "Endereços de email com estes domínios não podem efetuar subscrições. Insira um domínio por linha, e.g. somesite.com",
"settings.privacy.individualSubTracking": "Tracking individual de subscritores",
diff --git a/i18n/ro.json b/i18n/ro.json
index f3ae12ee..88ea7dd5 100644
--- a/i18n/ro.json
+++ b/i18n/ro.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Permiteți abonaților să-și schimbe preferințele, cum ar fi numele lor și abonările la mai multe liste.",
"settings.privacy.allowWipe": "Permiteți accesul la audio",
"settings.privacy.allowWipeHelp": "Permite abonaților să se șteargă, inclusiv abonamentele lor și toate celelalte date din baza de date. Vizualizările campaniei și clicurile pe linkuri sunt, de asemenea, eliminate, în timp ce numărul de vizualizări și clicuri rămâne (fără niciun abonat asociat acestora), astfel încât statisticile și analizele să nu fie afectate.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Nu am găsit date despre domeniul {domain}.",
"settings.privacy.domainBlocklistHelp": "Adresele de poștă electronică cu aceste domenii nu sunt permise de la abonare. Introduceți un domeniu pe linie, de exemplu: somesite.com",
"settings.privacy.individualSubTracking": "În acest hub nu sunt disponibile date despre abonați",
diff --git a/i18n/ru.json b/i18n/ru.json
index 15d3baba..29ead24c 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Разрешить подписчикам изменять настройки, такие как их имена и подписки на несколько списков.",
"settings.privacy.allowWipe": "Разрешить удаление",
"settings.privacy.allowWipeHelp": "Разрешить подписчикам удалять себя, включая их подписки и все другие данные из базы данных. Просмотры кампаний и клики по ссылкам также удаляются, в то время как количество просмотров и кликов остаётся (без связи с подписчиком), чтобы не повлиять на статистику и аналитику.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Чёрный список доменов",
"settings.privacy.domainBlocklistHelp": "Адреса электронной почты с этими доменами не могут подписываться. Введите по одному домену на строку, например: somesite.com",
"settings.privacy.individualSubTracking": "Индивидуальное отслеживание подписчиков",
diff --git a/i18n/se.json b/i18n/se.json
index f1d612a6..6e64c6f3 100644
--- a/i18n/se.json
+++ b/i18n/se.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Ska prenumeranter kunna ändra preferenser som deras namn och flera lista-prenumerationer.",
"settings.privacy.allowWipe": "Tillåt att radera",
"settings.privacy.allowWipeHelp": "Ska prenumeranter kunna radera sig själva, inklusive deras prenumerationer och all annan data från databasen. Kampanjvisningar och länkklickar tas också bort, medan visnings- och klickräkningar förblir (utan någon prenumerant kopplad till dem) för att statistik och analys inte påverkas.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Domänblocklista",
"settings.privacy.domainBlocklistHelp": "E-postadresser med dessa domäner är inte tillåtna att prenumerera. Ange en domän per rad, t.ex: exempsite.com",
"settings.privacy.individualSubTracking": "Individuell prenumerationsövervakning",
diff --git a/i18n/sk.json b/i18n/sk.json
index 1297820b..bc59749f 100644
--- a/i18n/sk.json
+++ b/i18n/sk.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Povoliť prihláseným zmenu predvolieb ako sú meno a prihlásenie k viacerým zoznamom.",
"settings.privacy.allowWipe": "Povoliť vymazanie",
"settings.privacy.allowWipeHelp": "Dovolí odberateľom odstrániť svoje odbery a všetky súvisiace údaje z databázy. Pozretia kampaní a kliknutia na odkazy se tiež odstránia, pozretia a počty kliknutí sa zachovajú (ale nebudú mať odberateľa), takže štatistiky a analýzy nebudú ovplyvnené.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Zoznam blokovaných domén",
"settings.privacy.domainBlocklistHelp": "E-mailové adresy z týchto domén sa nemôžu prihlásiť na odber. Uveďte jednu doménu na riadok, napr: somesite.com",
"settings.privacy.individualSubTracking": "Sledovanie jednotlivých odberateľov",
diff --git a/i18n/sl.json b/i18n/sl.json
index d68b2290..d0d38328 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Dovoli naročnikom, da spremenijo nastavitve, kot so njihova imena in naročnine na več seznamov.",
"settings.privacy.allowWipe": "Dovoli brisanje",
"settings.privacy.allowWipeHelp": "Dovoli naročnikom, da se izbrišejo, vključno s svojimi naročninami in vsemi drugimi podatki iz zbirke podatkov. Odstranjeni so tudi ogledi oglaševalske akcije in kliki povezav, medtem ko število ogledov in klikov ostane (brez povezanih naročnikov), tako da statistika in analitika ni prizadeta.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Seznam blokiranih domen",
"settings.privacy.domainBlocklistHelp": "Na e-poštne naslove s temi domenami ni dovoljeno naročanje. V vsako vrstico vnesite eno domeno, npr. somesite.com",
"settings.privacy.individualSubTracking": "Sledenje posameznim naročnikom",
diff --git a/i18n/tr.json b/i18n/tr.json
index 44cfc16e..b2a1313f 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Abonelerin adları ve çoklu liste abonelikleri gibi tercihlerini değiştirmelerine izin verin.",
"settings.privacy.allowWipe": "Silmek için izin ver",
"settings.privacy.allowWipeHelp": "Abonelerin, abonelikleri ve veritabanındaki diğer tüm veriler dahil olmak üzere kendilerini silmesine izin verin. Kampanya görüntülemeleri ve bağlantı tıklamaları da, görünümler ve tıklama sayıları kalır (bunlarla ilişkilendirilmiş abone olmadan), böylece istatistikler ve analizler etkilenmez.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Alan adı engelleme listesi",
"settings.privacy.domainBlocklistHelp": "Bu alan adlarına sahip e-posta adreslerinin abone olmasına izin verilmez. Her satıra bir alan adı girin, örneğin: somesite.com",
"settings.privacy.individualSubTracking": "Bireysel üye takibi",
diff --git a/i18n/uk.json b/i18n/uk.json
index 37dac31f..03a8992a 100644
--- a/i18n/uk.json
+++ b/i18n/uk.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Дозволити підписни_цям налаштовувати свої імена й перемикати стан підписок.",
"settings.privacy.allowWipe": "Дозволити стирання",
"settings.privacy.allowWipeHelp": "Дозволити підписни_цям видаляти себе, свої підписки й пов'язані дані з бази. Перегляди кампаній і переходи за посиланнями відв'язуються від підписни_ці, тобто кількість у статистиці й аналітиці залишається без змін.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Блокування доменів",
"settings.privacy.domainBlocklistHelp": "Адресам е-пошти з цих доменів заборонено підписуватись. Уводьте кожен домен з нового рядка, наприклад: example.org",
"settings.privacy.individualSubTracking": "Відстежувати окремих підписни_ць",
diff --git a/i18n/vi.json b/i18n/vi.json
index 50668dc7..03d4e31d 100644
--- a/i18n/vi.json
+++ b/i18n/vi.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "Cho phép người đăng ký thay đổi tùy chọn như tên và đăng ký danh sách đa nguyên.",
"settings.privacy.allowWipe": "Cho phép xóa",
"settings.privacy.allowWipeHelp": "Cho phép người đăng ký tự xóa bao gồm đăng ký của họ và tất cả dữ liệu khác khỏi cơ sở dữ liệu. Lượt xem chiến dịch và lượt nhấp vào liên kết cũng bị xóa trong khi lượt xem và số lượt nhấp vẫn còn (không có người đăng ký nào được liên kết với chúng) để số liệu thống kê và phân tích không bị ảnh hưởng.",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "Danh sách chặn tên miền",
"settings.privacy.domainBlocklistHelp": "Địa chỉ email với các miền này không được phép đăng ký. Nhập một tên miền trên mỗi dòng, ví dụ: somesite.com",
"settings.privacy.individualSubTracking": "Theo dõi người đăng ký cá nhân",
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 07e56ad4..adf7298d 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "允许订阅者更改首选项,例如他们的姓名和多个列表订阅。",
"settings.privacy.allowWipe": "允许擦除",
"settings.privacy.allowWipeHelp": "允许订阅者删除自己,包括他们的订阅和数据库中的所有其他数据。广告系列浏览量和链接点击量也会被删除,而浏览量和点击量仍然存在(没有与之关联的订阅者),因此统计数据和分析不会受到影响。",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "域阻止列表",
"settings.privacy.domainBlocklistHelp": "不允许订阅具有这些域的电子邮件地址。每行输入一个域,例如:somesite.com",
"settings.privacy.individualSubTracking": "个人订户跟踪",
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 9df58080..1cd1b755 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -505,6 +505,8 @@
"settings.privacy.allowPrefsHelp": "允許訂閱者更改偏好,例如他們的名字和多個訂閱清單。",
"settings.privacy.allowWipe": "允許清除",
"settings.privacy.allowWipeHelp": "允許訂閱者刪除自己,包括他們的訂閱和資料庫中的所有其他數據資料。廣告瀏覽量和連結點擊次數也會被刪除,而瀏覽量和點擊量仍然存在(只是沒有與之關聯的訂閱者),因此統計數據和分析不會受到影響。",
+ "settings.privacy.domainAllowlist": "Domain allowlist",
+ "settings.privacy.domainAllowlistHelp": "Only e-mail addresses with these domains are allowed to subscribe. Enter one domain per line, eg: example.com, *.example.com",
"settings.privacy.domainBlocklist": "網域封鎖清單",
"settings.privacy.domainBlocklistHelp": "不允許使用這些網域的電子郵件進行訂閱。每行輸入一個網域,例如:somesite.com",
"settings.privacy.individualSubTracking": "個人訂閱用戶追蹤",
diff --git a/internal/migrations/v5.0.0.go b/internal/migrations/v5.0.0.go
index a143b3c8..7b3a450b 100644
--- a/internal/migrations/v5.0.0.go
+++ b/internal/migrations/v5.0.0.go
@@ -37,5 +37,12 @@ func V5_0_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Logger
return err
}
+ // Insert new preference settings.
+ if _, err := db.Exec(`
+ INSERT INTO settings (key, value) VALUES('privacy.domain_allowlist', '[]') ON CONFLICT DO NOTHING;
+ `); err != nil {
+ return err
+ }
+
return nil
}
diff --git a/internal/subimporter/importer.go b/internal/subimporter/importer.go
index 973ce678..41164b97 100644
--- a/internal/subimporter/importer.go
+++ b/internal/subimporter/importer.go
@@ -52,11 +52,17 @@ const (
// Importer represents the bulk CSV subscriber import system.
type Importer struct {
- opt Options
- db *sql.DB
- i18n *i18n.I18n
- domainBlocklist map[string]bool
+ opt Options
+ db *sql.DB
+ i18n *i18n.I18n
+
+ domainBlocklist map[string]struct{}
hasBlocklistWildcards bool
+ hasBlocklist bool
+
+ domainAllowlist map[string]struct{}
+ hasAllowlistWildcards bool
+ hasAllowlist bool
stop chan bool
status Status
@@ -70,8 +76,8 @@ type Options struct {
UpdateListDateStmt *sql.Stmt
NotifCB models.AdminNotifCallback
- // Lookup table for blocklisted domains.
DomainBlocklist []string
+ DomainAllowlist []string
}
// Session represents a single import session.
@@ -136,23 +142,23 @@ func New(opt Options, db *sql.DB, i *i18n.I18n) *Importer {
opt: opt,
db: db,
i18n: i,
- domainBlocklist: make(map[string]bool, len(opt.DomainBlocklist)),
+ domainBlocklist: make(map[string]struct{}, len(opt.DomainBlocklist)),
+ domainAllowlist: make(map[string]struct{}, len(opt.DomainAllowlist)),
status: Status{Status: StatusNone, logBuf: bytes.NewBuffer(nil)},
stop: make(chan bool, 1),
}
// Domain blocklist.
- for _, d := range opt.DomainBlocklist {
- im.domainBlocklist[d] = true
+ mp, hasWildcards := makeDomainMap(opt.DomainBlocklist)
+ im.domainBlocklist = mp
+ im.hasBlocklistWildcards = hasWildcards
+ im.hasBlocklist = len(mp) > 0
- // Domains with *. as the subdomain prefix, strip that
- // and add the full domain to the blocklist as well.
- // eg: *.example.com => example.com
- if strings.Contains(d, "*.") {
- im.hasBlocklistWildcards = true
- im.domainBlocklist[strings.TrimPrefix(d, "*.")] = true
- }
- }
+ // Domain allowlist.
+ mp, hasWildcards = makeDomainMap(opt.DomainAllowlist)
+ im.domainAllowlist = mp
+ im.hasAllowlistWildcards = hasWildcards
+ im.hasAllowlist = len(mp) > 0
return &im
}
@@ -603,29 +609,24 @@ func (im *Importer) SanitizeEmail(email string) (string, error) {
// Check if the e-mail's domain is blocklisted. The e-mail domain and blocklist config
// are always lowercase.
- d := strings.Split(em.Address, "@")
- if len(d) == 2 {
- domain := d[1]
-
- // Check the domain as-is.
- if _, ok := im.domainBlocklist[domain]; ok {
- return "", errors.New(im.i18n.T("subscribers.domainBlocklisted"))
+ if im.hasAllowlist || im.hasBlocklist {
+ d := strings.Split(em.Address, "@")
+ if len(d) != 2 {
+ return em.Address, nil
}
- // If there are wildcards in the blocklist and the email domain has a subdomain, check that.
- if im.hasBlocklistWildcards && strings.Count(domain, ".") > 1 {
- parts := strings.Split(domain, ".")
-
- // Replace the first part of the subdomain with * and check if that exists in the blocklist.
- // Eg: test.mail.example.com => *.mail.example.com
- parts[0] = "*"
- domain = strings.Join(parts, ".")
+ domain := d[1]
- if _, ok := im.domainBlocklist[domain]; ok {
+ // If there's an allowlist, check if the domain is in it. Checking blocklist after that is moot.
+ if im.hasAllowlist {
+ if !im.checkInList(domain, im.hasAllowlistWildcards, im.domainAllowlist) {
+ return "", errors.New(im.i18n.T("subscribers.domainBlocklisted"))
+ }
+ } else if im.hasBlocklist {
+ if im.checkInList(domain, im.hasBlocklistWildcards, im.domainBlocklist) {
return "", errors.New(im.i18n.T("subscribers.domainBlocklisted"))
}
}
-
}
return em.Address, nil
@@ -659,6 +660,30 @@ func (im *Importer) ValidateFields(s SubReq) (SubReq, error) {
return s, nil
}
+// Check the domain against the given map of domains (block/allowlist).
+func (im *Importer) checkInList(domain string, hasWildcards bool, mp map[string]struct{}) bool {
+ // Check the domain as-is.
+ if _, ok := mp[domain]; ok {
+ return true
+ }
+
+ // If there are wildcards in the list and the email domain has a subdomain, check that.
+ if hasWildcards && strings.Count(domain, ".") > 1 {
+ parts := strings.Split(domain, ".")
+
+ // Replace the first part of the subdomain with * and check if that exists in the list.
+ // Eg: test.mail.example.com => *.mail.example.com
+ parts[0] = "*"
+ domain = strings.Join(parts, ".")
+
+ if _, ok := mp[domain]; ok {
+ return true
+ }
+ }
+
+ return false
+}
+
// mapCSVHeaders takes a list of headers obtained from a CSV file, a map of known headers,
// and returns a new map with each of the headers in the known map mapped by the position (0-n)
// in the given CSV list.
@@ -702,3 +727,23 @@ func countLines(r io.Reader) (int, error) {
}
}
}
+
+func makeDomainMap(domains []string) (map[string]struct{}, bool) {
+ var (
+ out = make(map[string]struct{}, len(domains))
+ hasWildCards = false
+ )
+ for _, d := range domains {
+ out[d] = struct{}{}
+
+ // Domains with *. as the subdomain prefix, strip that
+ // and add the full domain to the blocklist as well.
+ // eg: *.example.com => example.com
+ if strings.Contains(d, "*.") {
+ hasWildCards = true
+ out[strings.TrimPrefix(d, "*.")] = struct{}{}
+ }
+ }
+
+ return out, hasWildCards
+}
diff --git a/models/settings.go b/models/settings.go
index fd7ba1bd..d0cb8a36 100644
--- a/models/settings.go
+++ b/models/settings.go
@@ -35,6 +35,7 @@ type Settings struct {
PrivacyExportable []string `json:"privacy.exportable"`
PrivacyRecordOptinIP bool `json:"privacy.record_optin_ip"`
DomainBlocklist []string `json:"privacy.domain_blocklist"`
+ DomainAllowlist []string `json:"privacy.domain_allowlist"`
SecurityEnableCaptcha bool `json:"security.enable_captcha"`
SecurityCaptchaKey string `json:"security.captcha_key"`
diff --git a/schema.sql b/schema.sql
index 9f2a81a6..bf973faf 100644
--- a/schema.sql
+++ b/schema.sql
@@ -249,6 +249,7 @@ INSERT INTO settings (key, value) VALUES
('privacy.allow_preferences', 'true'),
('privacy.exportable', '["profile", "subscriptions", "campaign_views", "link_clicks"]'),
('privacy.domain_blocklist', '[]'),
+ ('privacy.domain_allowlist', '[]'),
('privacy.record_optin_ip', 'false'),
('security.enable_captcha', 'false'),
('security.captcha_key', '""'),