From 6fa5ad6f26a21449489f7fa6278920b8b377e575 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Thu, 5 Apr 2018 13:28:45 -0500 Subject: [PATCH 1/1] Full cookies policy --- README.md | 30 ++++++++------ windows/en-US/firefox.adml | 33 +++++++++++++-- windows/firefox.admx | 83 +++++++++++++++++++++++++++++++------- 3 files changed, 114 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 07e144a..9d7eaeb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The content of the JSON file should look like this: } } ``` -Policies are documented below. +Policies are documented below. Note that even though comments are used in this file for documentation, comments are not allowed for JSON files. ### Authentication This policy is for configuring sites that support integrated authentication. See https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication for more information. ``` @@ -77,6 +77,22 @@ This is a Windows only policy that tells Firefox to read certificates from the W } } ``` +### Cookies +This policy controls various settings related to cookies. +``` +{ + "policies": { + "Cookies": { + "Allow": ["http://example.org/"], /* Domains where cookies are always allowed */ + "Block": ["http://example.edu/"], /* Domains where cookies are always blocked */ + "Default": [true|false], /* This sets the default value for "Accept cookies from websites" */ + "AcceptThirdParty": ["all", "none", "from-visited"], /* This sets the default value for "Accept third-party cookies" */ + "ExpireAtSessionEnd": [true|false], /* This determines when cookies expire */ + "Locked": [true|false] /* If this is true, cookies preferences can't be changed */ + } + } +} +``` ### CreateMasterPassword This policy removes the master password functionality. ``` @@ -293,18 +309,6 @@ This policy sets domains that can install extensions } } ``` -### Cookies -This policy sets domains that can set or not set cookies. -``` -{ - "policies": { - "Cookies": { - "Allow": ["http://example.org/"], - "Block": ["http://example.edu/"] - } - } -} -``` ### FlashPlugin This policy sets domains that can use or not use Flash ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index ff9c605..dc3b26f 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -73,8 +73,31 @@ If this policy is not configured or disabled, Firefox will not read certificates Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted. URLs to allow popups. URLs to allow addons. - URLs to allow cookies. - URLs to block cookies. + If this policy is enabled, cookies are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well. + +If this policy is not configured or disabled, the default cookie policy is followed. + If this policy is enabled, cookies are blocked for the URLS indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well. + +If this policy is not configured or disabled, cookies are not blocked by default. + Accept cookies from websites + If this policy is disabled, cookies are not accepted from websites by default. + +If this policy is not configured or enabled, cookies are accepted from websites. + Accept third-party cookies + If this policy is enabled and cookies are allowed, you can set when to accept third-party cookies. + +This setting is ignored if this policy is not configured or disabled or if cookies are not allowed. + Always + Never + From visited + Keep cookies until Firefox is closed + If this policy is enabled and cookies are allowed, they will expire when Firefox is closed. + +This setting is ignored if this policy is not configured or disabled or if cookies are not allowed. + Do not allow preferences to be changed + If this policy is enabled cookie preferences cannot be changed by the user. + +If this policy is not configured or disabled, the user can change their cookie preferences. URLs to allow Flash. URLs to block Flash. Bookmark 1 @@ -116,10 +139,12 @@ If this policy is enabled, private browsing is enabled by default in both the br + Allow popups for websites Allow add-ons for websites - Allow cookies for websites - Block cookies for websites + + + Allow Flash for websites Block Flash for websites diff --git a/windows/firefox.admx b/windows/firefox.admx index 963487a..38bceb2 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -22,7 +22,7 @@ - + @@ -125,6 +125,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + + + + + none + + + + + from-visited + + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,20 +406,6 @@ - - - - - - - - - - - - - - -- 2.34.1