From c4bd35e922f56490e9647ea35728da9b040d1388 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Fri, 6 Apr 2018 12:24:12 -0500 Subject: [PATCH 01/16] OverridePostUpdatePage policy --- README.md | 9 +++++++++ windows/en-US/firefox.adml | 8 ++++++-- windows/firefox.admx | 11 +++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1650860..34da6c7 100644 --- a/README.md +++ b/README.md @@ -385,6 +385,15 @@ This policy allowed you to override the first run page. If you leave the URL bla } } ``` +### OverridePostUpdatePage +This policy allowed you to override the upgrade page page. If you leave the URL blank, the upgrade page will not be displayed. +``` +{ + "policies": { + "OverridePostUpdatePage": "http://example.org" + } +} +``` ### Bookmarks This policy allows you to specify bookmarks. You can have any number of bookmarks although only ten are specified in the ADMX file. Placement can be specified as either toolbar or menu. If a folder is specified, it is automatically created and bookmarks with the diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 32f1a4b..d3d981d 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -161,6 +161,10 @@ If this policy is disabled or not configured, the user can change their Flash pr If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown. If this policy is disabled or not configured the first run page is displayed. + Override the upgrade page + If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown. + +If this policy is disabled or not configured the upgrade is displayed. Bookmark 1 Bookmark 2 Bookmark 3 @@ -211,8 +215,8 @@ If this policy is enabled, private browsing is enabled by default in both the br Don't allow tracking protection preferences to be changed. - - + + diff --git a/windows/firefox.admx b/windows/firefox.admx index 0524361..9271004 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -524,11 +524,18 @@ - + - + + + + + + + + -- 2.34.1 From e91c454b2ba0ae26ad0fdfd499a2f0ba4d9bb64e Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 09:55:29 -0500 Subject: [PATCH 02/16] Update to popup blocking policy --- README.md | 12 +++++++----- windows/en-US/firefox.adml | 12 +++++++++++- windows/firefox.admx | 32 ++++++++++++++++++++++++++------ 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 34da6c7..4ca48a0 100644 --- a/README.md +++ b/README.md @@ -337,14 +337,16 @@ This policy sets the default homepage value. It can also be used to lock the hom } } ``` -### Popups -This policy sets domains for which popups are allowed +### PopupBlocking +This policy sets domains for which pop-up windows are allowed. It also set the default pop-up policy ``` { "policies": { - "Popups": { + "PopupBlocking": { "Allow": ["http://example.org/", - "http://example.edu/"] + "http://example.edu/"], + "Default": [true|false], /* If this is set to false, pop-up window are enabled by default. */ + "Locked": [true|false] } } } @@ -390,7 +392,7 @@ This policy allowed you to override the upgrade page page. If you leave the URL ``` { "policies": { - "OverridePostUpdatePage": "http://example.org" + "OverridePostUpdatePagep": "http://example.org" } } ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index d3d981d..7e962f8 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -108,7 +108,17 @@ If this policy is disabled or not configured, no extensions are uninstalled. Remember Passwords Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted. - URLs to allow popups. + If this policy is enabled, pop-up windows are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well. + +If this policy is disabled or not configured, the default pop-up policy is followed. + Allow pop-ups from websites + If this policy is disabled, pop-up windows are allowed from websites by default. + +If this policy is not configured or enabled, popups are not allowed from websites. + Do not allow preferences to be changed + If this policy is enabled pop-up preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change their pop-up preferences. If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well. If this policy is disabled or not configured, the default add-on policy is followed. diff --git a/windows/firefox.admx b/windows/firefox.admx index 9271004..07862d3 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -19,13 +19,13 @@ - + - + @@ -466,22 +466,42 @@ - + - + + + + + + + + + + + + + + + + + + + + + - + - + -- 2.34.1 From 2ec02ee649c02648e2ae20ec813e7c118510219e Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:03:20 -0500 Subject: [PATCH 03/16] SanitizeOnShutdown policy --- README.md | 11 ++++++++++- windows/en-US/firefox.adml | 4 ++++ windows/firefox.admx | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ca48a0..4cc4496 100644 --- a/README.md +++ b/README.md @@ -392,7 +392,7 @@ This policy allowed you to override the upgrade page page. If you leave the URL ``` { "policies": { - "OverridePostUpdatePagep": "http://example.org" + "OverridePostUpdatePage": "http://example.org" } } ``` @@ -436,3 +436,12 @@ To specify ports, append them to the hostnames with a colon (:). If Locked is se } } ``` +### SanitizeOnShutdown +If this policy is set to true, all data is cleared when Firefox is closed. This includes Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data. +``` +{ + "policies": { + "SanitizeOnShutdown": [true|false] + } +} +``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 7e962f8..42113ab 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -175,6 +175,10 @@ If this policy is disabled or not configured the first run page is displayed.If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown. If this policy is disabled or not configured the upgrade is displayed. + Clear all data when browser is closed + If this policy is enabled, all data is cleared when Firefox is closed. This includes Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data. + +If this policy is disabled or not configured, data is not cleared when the browser is closed. Bookmark 1 Bookmark 2 Bookmark 3 diff --git a/windows/firefox.admx b/windows/firefox.admx index 07862d3..f8589c6 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -558,6 +558,16 @@ + + + + + + + + + + -- 2.34.1 From e1a558d42ec7aeab3bacfdb90d25730a06309af5 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:17:46 -0500 Subject: [PATCH 04/16] SearchBar Policy --- README.md | 9 +++++++++ windows/en-US/firefox.adml | 9 +++++++++ windows/firefox.admx | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/README.md b/README.md index 4cc4496..5c9515c 100644 --- a/README.md +++ b/README.md @@ -445,3 +445,12 @@ If this policy is set to true, all data is cleared when Firefox is closed. This } } ``` +### SearchBar +This policy can be used to determine if the search bar is separate or combined with the URL bar. +``` +{ + "policies": { + "SearchBar": ["unified", "separate"] + } +} +``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 42113ab..f4abe85 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -213,6 +213,12 @@ If this policy is disabled or not configured, data is not cleared when the brows If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing. If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it. + Search bar location + If this policy is enabled, you can set whether the search bar is separate from the URL bar. + +If this policy is not configured or disabled, new users get a unified search bar, users upgrading from Firefox 56 and below get a separate search bar. + Unified + Separate @@ -226,6 +232,9 @@ If this policy is enabled, private browsing is enabled by default in both the br + + + Don't allow tracking protection preferences to be changed. diff --git a/windows/firefox.admx b/windows/firefox.admx index f8589c6..8620630 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -783,5 +783,23 @@ + + + + + + + + unified + + + + + separate + + + + + -- 2.34.1 From 974ec233d227302f98c1a7696cc342afe7719b08 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:22:04 -0500 Subject: [PATCH 05/16] BlockSetDesktopBackground -> DisableSetDesktopBackground --- README.md | 4 ++-- windows/en-US/firefox.adml | 6 ++++-- windows/firefox.admx | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5c9515c..a769b73 100644 --- a/README.md +++ b/README.md @@ -57,12 +57,12 @@ This policy removes access to about:support. "BlockAboutSupport": true } ``` -### BlockSetDesktopBackground +### DisableSetDesktopBackground This policy removes the "Set As Desktop Background..." menuitem when right clicking on an image. ``` { "policies": { - "BlockAboutSupport": true + "DisableSetDesktopBackground": true } } ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index f4abe85..6524d26 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -32,8 +32,10 @@ Blocks access to the about:profiles page. Block About Support Blocks access to the about:support page. - Block Set Desktop Background - Prevents usage of the "Set Image as Desktop Background" feature. + Disable Set Desktop Background + If this policy is enabled, the user can not set an image as their desktop background. + +If this policy is disabled or not configured, users can set images as their desktop background. Import Enterprise Roots If this policy is enabled, Firefox will read certificates from the Windows certificate store. diff --git a/windows/firefox.admx b/windows/firefox.admx index 8620630..8324911 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -108,7 +108,7 @@ - + -- 2.34.1 From 8a394f33ab020a980a653bf79eeacb7c3599f9ab Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:23:12 -0500 Subject: [PATCH 06/16] Rename AcceptThirdParty enums --- README.md | 2 +- windows/firefox.admx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a769b73..f73e478 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ This policy controls various settings related to 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" */ + "AcceptThirdParty": ["always", "never", "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 */ } diff --git a/windows/firefox.admx b/windows/firefox.admx index 8324911..a18a28f 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -159,12 +159,12 @@ - all + always - none + never -- 2.34.1 From b6ec8586f5dd0fe21c54c63f450df1ffa016a912 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:25:48 -0500 Subject: [PATCH 07/16] CreateMasterPassword -> DisableMasterPasswordCreation --- README.md | 6 +++--- windows/en-US/firefox.adml | 6 ++++-- windows/firefox.admx | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f73e478..e530e8f 100644 --- a/README.md +++ b/README.md @@ -93,12 +93,12 @@ This policy controls various settings related to cookies. } } ``` -### CreateMasterPassword -This policy removes the master password functionality. +### DisableMasterPasswordCreation +This policy removes the master password functionality if set to true. ``` { "policies": { - "CreateMasterPassword": false + "DisableMasterPasswordCreation": [true|false] } } ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 6524d26..5575e19 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -40,8 +40,10 @@ If this policy is disabled or not configured, users can set images as their desk If this policy is enabled, Firefox will read certificates from the Windows certificate store. If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store. - Create Master Password - If false, removes access to create a master password. + Disable Master Password Creation + If this policy is enabled, users cannot create a master password. + +If this policy is disabled or not configured, users can create a master password. Disable Update Prevent the browser from updating. Disable Builtin PDF Viewer diff --git a/windows/firefox.admx b/windows/firefox.admx index a18a28f..64dab3a 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -195,7 +195,7 @@ - + -- 2.34.1 From db7ff9c887273f8ce1d14217d7802fbe2cc04865 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:28:28 -0500 Subject: [PATCH 08/16] DisableSysAddonUpdate -> DisableSystemAddonUpdate --- README.md | 4 ++-- windows/en-US/firefox.adml | 6 ++++-- windows/firefox.admx | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e530e8f..6b01861 100644 --- a/README.md +++ b/README.md @@ -231,12 +231,12 @@ This policy prevents the user from bypassign security in certain cases. } } ``` -### DisableSysAddonUpdate +### DisableSystemAddonUpdate This policy prevents system add-ons from being updated or installed. ``` { "policies": { - "DisableSysAddonUpdate": true + "DisableSystemAddonUpdate": true } } ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 5575e19..bff6a43 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -82,8 +82,10 @@ If this policy is disabled or not configured, certificate errors can be overridd If this policy is enabled, a user can not bypass the warning and visit a harmful site. If this policy is disabled or not configured, a user can choose to visit a harmful site. - Disable System Addon Updates - Prevent the browser from installing and updating system addons. + Disable System Addon Updates + If this policy is enabled, new system add-ons will not be installed and existing system add-ons will not be updated. + +If this policy is disabled or not configured, system add-ons are installed and updated. Disable Telemetry If this policy is enabled, telemetry is not uploaded. diff --git a/windows/firefox.admx b/windows/firefox.admx index 64dab3a..5e40254 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -355,7 +355,7 @@ - + -- 2.34.1 From 02a62d15c5695dae5d9a66ce5b8f590e4e713f99 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:31:29 -0500 Subject: [PATCH 09/16] RememberPassword -> OfferToSaveLogins --- README.md | 6 +++--- windows/en-US/firefox.adml | 6 ++++-- windows/firefox.admx | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6b01861..ada3d52 100644 --- a/README.md +++ b/README.md @@ -314,12 +314,12 @@ Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent } } ``` -### RememberPasswords -This policy sets the signon.rememberSignons preference. It can either be enabled or disabled. +### OfferToSaveLogins +This policy sets the signon.rememberSignons preference. It determines whether or not Firefox offers to save passwords. It can either be enabled or disabled. ``` { "policies": { - "RememberPasswords": true + "OfferToSaveLogins": true } } ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index bff6a43..e034fe3 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -112,8 +112,10 @@ If this policy is disabled or not configured, no extensions are uninstalled.If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable. If this policy is disabled or not configured, no extensions are locked. - Remember Passwords - Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted. + Offer to save logins + If this policy is enabled or not configured, Firefox will offer to save website logins and passwords. + +If this policy is disabled, firefox will not offer to save website logins and passwords. If this policy is enabled, pop-up windows are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well. If this policy is disabled or not configured, the default pop-up policy is followed. diff --git a/windows/firefox.admx b/windows/firefox.admx index 5e40254..fd8267a 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -456,7 +456,7 @@ - + -- 2.34.1 From 81b1a20e2b10e52e172ef6dcd910647d3527ba81 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 10:33:16 -0500 Subject: [PATCH 10/16] InstallAddons -> InstallAddonsPermission --- README.md | 4 ++-- windows/en-US/firefox.adml | 6 +++--- windows/firefox.admx | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ada3d52..33d27f1 100644 --- a/README.md +++ b/README.md @@ -351,12 +351,12 @@ This policy sets domains for which pop-up windows are allowed. It also set the d } } ``` -### InstallAddons +### InstallAddonsPermission This policy sets domains that can install extensions, as well as the default behavior. ``` { "policies": { - "InstallAddons": { + "InstallAddonsPermission": { "Allow": ["http://example.org/", "http://example.edu/"] "Default": [true|false], /* If this is set to false, add-ons cannot be installed by the user */ diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index e034fe3..eaa9e5c 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -127,11 +127,11 @@ If this policy is not configured or enabled, popups are not allowed from website If this policy is enabled pop-up preferences cannot be changed by the user. If this policy is disabled or not configured, the user can change their pop-up preferences. - If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well. + If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well. If this policy is disabled or not configured, the default add-on policy is followed. - Allow add-on installs from websites - If this policy is disabled, add-ons cannot be installed. + Allow add-on installs from websites + If this policy is disabled, add-ons cannot be installed. If this policy is not configured or enabled, add-ons can be installed. 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. diff --git a/windows/firefox.admx b/windows/firefox.admx index fd8267a..08b2be4 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -493,14 +493,14 @@ - + - + - + -- 2.34.1 From 1ded7919669d2b6da6f672bbff7525b6ac7b97ea Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 9 Apr 2018 16:50:51 -0500 Subject: [PATCH 11/16] WebsiteFilter Policy --- README.md | 10 ++++++++++ windows/en-US/firefox.adml | 11 +++++++++++ windows/firefox.admx | 14 ++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/README.md b/README.md index 33d27f1..9938b1a 100644 --- a/README.md +++ b/README.md @@ -454,3 +454,13 @@ This policy can be used to determine if the search bar is separate or combined w } } ``` +### WebsiteFilter +Blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. The arrays are limited to 1000 entries each. +``` +{ + "policies": { + "Block": [""], + "Exceptions": ["http://example.org/*"] + } +} +``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index eaa9e5c..6e9bfe9 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -187,6 +187,14 @@ If this policy is disabled or not configured the upgrade is displayed. If this policy is enabled, all data is cleared when Firefox is closed. This includes Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data. If this policy is disabled or not configured, data is not cleared when the browser is closed. + Blocked websites + If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.", + +If this policy is disabled or not configured, no websites are blocked. + Exceptions to blocked websites + If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.", + +If this policy is disabled or not configured, there are no exceptions to the website filter. Bookmark 1 Bookmark 2 Bookmark 3 @@ -235,6 +243,9 @@ If this policy is not configured or disabled, new users get a unified search bar + + + Allow popups for websites diff --git a/windows/firefox.admx b/windows/firefox.admx index 08b2be4..24c5f62 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -801,5 +801,19 @@ + + + + + + + + + + + + + + -- 2.34.1 From 302850d96b6e8f82f936fe04d4e5ca893ca198b2 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Wed, 11 Apr 2018 09:14:12 -0500 Subject: [PATCH 12/16] Addons placed in wrong category --- windows/firefox.admx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/firefox.admx b/windows/firefox.admx index 24c5f62..93832ec 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -25,7 +25,7 @@ - + -- 2.34.1 From 7bdccd55292fa4a4d08210af733e2e67b341c976 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Wed, 11 Apr 2018 10:23:42 -0500 Subject: [PATCH 13/16] Add policies for SearchEngines --- README.md | 36 ++++++++-- windows/en-US/firefox.adml | 46 ++++++++++++ windows/firefox.admx | 140 +++++++++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9938b1a..2277853 100644 --- a/README.md +++ b/README.md @@ -405,12 +405,13 @@ same folder name are grouped together. { "policies": { "Bookmarks": [ - {"Title": "Example", - "URL": "http://example.org", - "Favicon": "http://example.com/favicon.ico", - "Placement": ["toolbar", "menu"], - "Folder": "FolderName" - } + { + "Title": "Example", + "URL": "http://example.org", + "Favicon": "http://example.com/favicon.ico", + "Placement": ["toolbar", "menu"], + "Folder": "FolderName" + } ] } } @@ -464,3 +465,26 @@ Blocks websites from being visited. The parameters take an array of Match Patter } } ``` +### Search Engines +This policy allows you to add new search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required. +``` +{ + "policies": { + "SearchEngines": { + "Add": [ + { + "Name": "", + "URLTemplate": "URL including {searchTerms} to substitute for the terms", + "Method": ["GET", "POST"], + "IconURL": "URL to icon", + "Alias": "Alias that can be used to access the engine", + "Description": "Description", + "SuggestURLTemplate": "URL for suggestions using {searchTerms}" + } + ], + "Default": "Name of engine", + "PreventInstalls": [true|false] + } + } +} +``` \ No newline at end of file diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 6e9bfe9..ea66f2e 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -16,6 +16,7 @@ Extensions Flash Home page + Search Allowed Sites Blocked Sites SPNEGO @@ -233,8 +234,26 @@ If this policy is enabled, private browsing is enabled by default in both the br If this policy is enabled, you can set whether the search bar is separate from the URL bar. If this policy is not configured or disabled, new users get a unified search bar, users upgrading from Firefox 56 and below get a separate search bar. + Search Engine One + Search Engine Two + Search Engine Three + Search Engine Four + Search Engine Five + If this policy is enabled, you can configure a search engine to be added to Firefox. Use {searchTerms} to indicate where the search term is placed. Due to a bug, you must select the method (usually GET). Note that you must specify the search engines in order. + +If this policy is not configured or disabled, a new search engine is not added. Unified Separate + GET + POST + Default Search Engine + If this policy is enabled, you can set type the name of a search engine to be used as the default. + +If this policy is not configured or disabled, the Firefox default engine is used. + Prevent Search Engine Installs + If this policy is enabled, the user cannot install search engines from web page. + +If this policy is not configured or disabled, search engines can be installed from web pages. @@ -292,6 +311,33 @@ If this policy is not configured or disabled, new users get a unified search bar + + + + + + + + Method: + + + + + + + + + + + + + + + + + + Don't allow proxy settings to be changed. Connection Type: diff --git a/windows/firefox.admx b/windows/firefox.admx index 93832ec..5e153a1 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -45,6 +45,9 @@ + + + @@ -815,5 +818,142 @@ + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.34.1 From b64356893453f81103fd1ca949fb6e9de30a8c80 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Wed, 11 Apr 2018 16:13:19 -0500 Subject: [PATCH 14/16] Better telemetry disclaimer from data team --- README.md | 6 ++++-- windows/en-US/firefox.adml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2277853..77fdbde 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,9 @@ This policy prevents system add-ons from being updated or installed. } ``` ### DisableTelemetry -This policy prevents the upload of telemetry data. Mozilla strongly recommends that you do NOT disable telemetry if you do not have a business need to do so. +This policy prevents the upload of telemetry data. + +Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours. ``` { "policies": { @@ -487,4 +489,4 @@ This policy allows you to add new search engines, as well as set the default and } } } -``` \ No newline at end of file +``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index ea66f2e..d046e3f 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -92,7 +92,7 @@ If this policy is disabled or not configured, system add-ons are installed and u If this policy is disabled or not configured, telemetry is collected and uploaded. -Mozilla strongly recommends that you do NOT disable telemetry if you do not have a business need to do so. +Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours. Display Bookmarks Toolbar Causes the bookmarks toolbar to be displayed by default. Display Menu Bar -- 2.34.1 From 7e8d27667545b02d5074386a6450c52820b4631e Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Wed, 11 Apr 2018 16:57:17 -0500 Subject: [PATCH 15/16] DisableProfileImport policy --- README.md | 9 +++++++++ windows/en-US/firefox.adml | 4 ++++ windows/firefox.admx | 10 ++++++++++ 3 files changed, 23 insertions(+) diff --git a/README.md b/README.md index 77fdbde..fc7813a 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,15 @@ This policy removes access to private browsing } } ``` +### DisableProfileImport +This policy disables the"Import data from another browser" option in the bookmarks window. +``` +{ + "policies": { + "DisableProfileImport": true + } +} +``` ### DisableProfileRefresh This policy disables the Refresh Firefox button on about:support and support.mozilla.org. ``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index d046e3f..107f64e 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -69,6 +69,10 @@ If this policy is disabled or not configured, the "Forget" button is a Prevents ability to save webpages to Pocket. Disable Private Browsing Disables private browsing. + Disable Profile Import + If this policy is enabled, the "Import data from another browser" option is not available in the bookmarks window. + +If this policy is disabled or not configured, the "Import data from another browser" option is available. Disable Profile Refresh If this policy is enabled, the "Refresh Firefox" button is not available on the about:support page or on support.mozilla.org. diff --git a/windows/firefox.admx b/windows/firefox.admx index 5e153a1..371d07a 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -318,6 +318,16 @@ + + + + + + + + + + -- 2.34.1 From 6e84712eed648f4b64ffe4e98a02f1e08948c0a9 Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Wed, 11 Apr 2018 17:18:39 -0500 Subject: [PATCH 16/16] Tweaks to order --- windows/en-US/firefox.adml | 6 +- windows/firefox.admx | 126 +++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 107f64e..988bfb1 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -103,17 +103,17 @@ Mozilla recommends that you do not disable telemetry. Information collected thro Causes the menu bar to be displayed by default. Don't Check Default Browser Don't check for the default browser on startup. - Install + Extensions to Install If this policy is enabled, you can specify a list of extension URLs or paths that will be installed when Firefox is started. Anytime this list is changed, the extensions will be reinstalled. If this policy is disabled or not configured, no extensions are installed. - Uninstall + Extensions to Uninstall If this policy is enabled, you can specify a list of extension IDs that will be uninstalled. Anytime this list is changed, the extensions will be uninstalled. If this policy is disabled or not configured, no extensions are uninstalled. - Locked + Prevent extensions fromb being disabled or removed If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable. If this policy is disabled or not configured, no extensions are locked. diff --git a/windows/firefox.admx b/windows/firefox.admx index 371d07a..8574cae 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -15,7 +15,7 @@ - + @@ -36,9 +36,6 @@ - - - @@ -111,16 +108,6 @@ - - - - - - - - - - @@ -198,16 +185,6 @@ - - - - - - - - - - @@ -298,7 +275,7 @@ - + @@ -308,7 +285,7 @@ - + @@ -318,7 +295,7 @@ - + @@ -328,7 +305,7 @@ - + @@ -338,7 +315,7 @@ - + @@ -348,7 +325,7 @@ - + @@ -358,7 +335,7 @@ - + @@ -449,26 +426,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -571,7 +528,19 @@ - + + + + + + + + + + + + + @@ -581,7 +550,18 @@ - + + + + + + + + + + + + @@ -596,14 +576,14 @@ - + - + @@ -625,7 +605,7 @@ - + @@ -647,7 +627,7 @@ - + @@ -669,7 +649,7 @@ - + @@ -691,7 +671,7 @@ - + @@ -713,7 +693,7 @@ - + @@ -814,14 +794,36 @@ - + + + + + + + + + + + + + + + + + + + + + + - + + -- 2.34.1