From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Thu, 23 Jul 2020 19:08:03 +0000 (-0500)
Subject: Merge pull request #654 from mozilla/Cookies_AllowSession
X-Git-Tag: v2.1~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/033aa08dbe79e8d153a9a1bd9c7178e6e3360cb2?hp=74aeda5eef96f51974745ecd6fb672bc8cfb603c
Merge pull request #654 from mozilla/Cookies_AllowSession
Add AllowSession to Cookies policy
---
diff --git a/README.md b/README.md
index 16e5280..4216c47 100644
--- a/README.md
+++ b/README.md
@@ -680,6 +680,8 @@ Configure cookie preferences.
`Allow` is a list of origins (not domains) where cookies are always allowed. You must include http or https.
+`AllowSession` is a list of origins (not domains) where cookies are only allowed for the current session. You must include http or https.
+
`Block` is a list of origins (not domains) where cookies are always blocked. You must include http or https.
`Default` determines whether cookies are accepted at all.
@@ -692,13 +694,14 @@ Configure cookie preferences.
`Locked` prevents the user from changing cookie preferences.
-**Compatibility:** Firefox 60, Firefox ESR 60 (RejectTracker was added in Firefox 63)\
+**Compatibility:** Firefox 60, Firefox ESR 60 (RejectTracker added in Firefox 63, AllowSession added in Firefox 79/78.1)\
**CCK2 Equivalent:** N/A\
**Preferences Affected:** `network.cookie.cookieBehavior`,`network.cookie.lifetimePolicy`
#### Windows (GPO)
```
Software\Policies\Mozilla\Firefox\Cookies\Allow\1 = "https://example.com"
+Software\Policies\Mozilla\Firefox\Cookies\AllowSession\1 = "https://example.edu"
Software\Policies\Mozilla\Firefox\Cookies\Block\1 = "https://example.org"
Software\Policies\Mozilla\Firefox\Cookies\Default = 0x1 | 0x0
Software\Policies\Mozilla\Firefox\Cookies\AcceptThirdParty = "always" | "never" | "from-visited"
@@ -718,6 +721,15 @@ Value (string):
```
OMA-URI:
```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Cookies/Cookies_AllowSession
+```
+Value (string):
+```
+
+
+```
+OMA-URI:
+```
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Cookies/Cookies_Block
```
Value (string):
@@ -775,6 +787,10 @@ Value (string):
http://example.com
+ AllowSession
+
+ http://example.edu
+
Block
http://example.org
@@ -798,6 +814,7 @@ Value (string):
"policies": {
"Cookies": {
"Allow": ["http://example.org/"],
+ "AllowSession": ["http://example.edu/"],
"Block": ["http://example.edu/"],
"Default": true | false,
"AcceptThirdParty": "always" | "never" | "from-visited",
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 5ab46d2..232504f 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -97,6 +97,10 @@
https://www.example.org/
+ Allowsession
+
+ https://www.example.edu/
+
Block
https://www.example.edu/
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index da3c870..49abcae 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -55,6 +55,7 @@
DRM-Medien Erweiterungen
PDFjs
Erlaubte Seiten
+ Erlaubte Seiten (Session Only)
Gesperrte Seiten
Automatisches Update
Wenn diese Richtlinieneinstellung aktiviert ist, wird Firefox automatisch ohne Zustimmung des Benutzers aktualisiert.
@@ -347,6 +348,9 @@ Wenn Sie die Richtlinieneinstellungen nicht konfigurieren oder aktivieren, könn
Wenn Sie die Richtlinieneinstellung aktivieren, sind Cookies immer für die angegebenen URLs erlaubt. Wenn eine Top-Level-Domain angegeben ist (http://example.org), sind Cookies auch für alle Sub-Domains zulässig.
Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die Standard Cookie Richtlinie verwendet.
+ If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default cookie policy is followed.
Wenn Sie die Richtlinieneinstellung aktivieren, sind Cookies für die angegebenen URLs gesperrt. Wenn eine Top-Level-Domain angegeben ist (http://example.org), werden Cookies von allen Sub-Domains ebenfalls blockiert.
Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, sind Cookies standardmäÃig nicht blockiert.
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index cbe754d..4e3e152 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -55,6 +55,7 @@
Encrypted Media Extensions
PDFjs
Allowed Sites
+ Allowed Sites (Session Only)
Blocked Sites
Application Autoupdate
If this policy is enabled, Firefox is automatically updated without user approval.
@@ -346,6 +347,9 @@ If this policy is disabled or not configured, the default add-on policy is follo
If this policy is not configured or enabled, add-ons can be installed.
If this policy is enabled, cookies are always allowed for the origins indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+If this policy is disabled or not configured, the default cookie policy is followed.
+ If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
If this policy is disabled or not configured, the default cookie policy is followed.
If this policy is enabled, cookies are blocked for the origins indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well.
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 81d29c2..278afbe 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -55,6 +55,7 @@
Extensiones de medios cifrados
PDFjs
Sitios permitidos
+ Sitios permitidos (Session Only)
Sitios bloqueados
Actualización automática de aplicación
Si esta polÃtica está habilitada, Firefox se actualizará automáticamente sin la aprobación del usuario.
@@ -347,6 +348,9 @@ Si esta polÃtica no está configurada o habilitada, se podrán instalar complem
Si esta polÃtica está habilitada, las cookies siempre estarán permitidas para los orÃgenes indicados. Si se especifica un dominio de nivel superior (http://ejemplo.org), también se permitirán cookies para todos los subdominios.
Si esta polÃtica está deshabilitada o no está configurada, se seguirá la polÃtica de cookies predeterminada.
+ If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default cookie policy is followed.
Si esta polÃtica está habilitada, las cookies estarán bloqueadas por los orÃgenes indicados. Si se especifica un dominio de nivel superior (http://ejemplo.org), también se bloquearán las cookies de todos los subdominios.
Si esta polÃtica está deshabilitada o no está configurada, las cookies no estarán bloqueadas de manera predeterminada.
diff --git a/windows/firefox.admx b/windows/firefox.admx
index f9b6403..45a8006 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -283,6 +283,13 @@
+
+
+
+
+
+
+
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index da95bbe..1557630 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -55,6 +55,7 @@
Encrypted Media Extensions
PDFjs
Sites autorisés
+ Sites autorisés (Session Only)
Sites bloqués
Application Autoupdate
Si cette stratégie est activée, Firefox est automatiquement mis a jour sans aprobation de l'utilisateur.
@@ -347,6 +348,9 @@ Si cette stratégie n'est ni configurée ni activée, des modules complémentair
Si cette stratégie est activée, les cookies sont toujours autorisés pour les origines indiquées. Si un domaine de premier niveau est spécifié (http://example.org), les cookies sont également autorisés pour tous les sous-domaines.
Si cette stratégie est désactivée ou non configurée, la stratégie de cookie par défaut est appliquée.
+ If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default cookie policy is followed.
Si cette stratégie est activée, les cookies sont bloqués pour les origines indiquées. Si un domaine de premier niveau est spécifié (http://example.org), les cookies sont également bloqués pour tous les sous-domaines.
Si cette stratégie est désactivée ou non configurée, les cookies ne sont pas bloqués par défaut.
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index c5818ed..3351d7a 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -55,6 +55,7 @@
Encrypted Media Extensions
PDFjs
Siti consentiti
+ Siti consentiti (Session Only)
Siti bloccati
Aggiornamento automatico applicazione
Se questo criterio è abilitato, Firefox è aggiornato automaticamente senza l'approvazione dell'utente.
@@ -347,6 +348,9 @@ Se questo criterio non è configurato o è abilitato, è possibile installare co
Se questo criterio è abilitato, i cookie dai siti indicati sono sempre consentiti. Se è specificato un dominio di primo livello (http://example.org), i cookie sono consentiti anche da tutti i sottodomini.
Se questo criterio è disabilitato o non configurato, viene seguita la politica predefinita per i cookie.
+ If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default cookie policy is followed.
Se questo criterio è abilitato, i cookie dai siti indicati sono bloccati. Se è specificato un dominio di primo livello (http://example.org), i cookie sono bloccati anche da tutti i sottodomini.
Se questo criterio è disabilitato o non configurato, i cookie non sono bloccati per impostazione predefinita.
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 3a3d5b4..333e40f 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -55,6 +55,7 @@
å å¯åªé«æ´å
åè½
PDFjs
å
許ç網ç«
+ å
許çç¶²ç« (Session Only)
å°éç網ç«
æç¨ç¨å¼èªåæ´æ°
è¥åç¨æ¤ååï¼Firefox æä¸ç¶ä½¿ç¨è
åæèªåæ´æ°ã
@@ -345,6 +346,9 @@ Mozilla 建è°æ¨ä¸è¦åç¨ Telemetryãéé Telemetry æ¶éå°çè³è¨å¯
è¥åç¨æ¤ååï¼å°å
許ä¾èªæå®ä¾æºç¶²åç Cookieãè¥æå®äºé ç´ç¶²åå稱ï¼ä¾å¦ http://example.orgï¼ï¼ä¹å°å
許ææä¾èªå網åç Cookieã
è¥åç¨æä¸è¨å®æ¤ååï¼åéµå¾ªé è¨ç Cookie ååã
+ If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default cookie policy is followed.
è¥åç¨æ¤ååï¼å°å°éä¾èªæå®ä¾æºç¶²åç Cookieãè¥æå®äºé ç´ç¶²åå稱ï¼ä¾å¦ http://example.orgï¼ï¼ä¹å°å°éææä¾èªå網åç Cookieã
è¥åç¨æä¸è¨å®æ¤ååï¼åé è¨ä¸å°é Cookieã