From: Michael Kaply <consulting@kaply.com>
Date: Fri, 23 Mar 2018 20:20:08 +0000 (-0500)
Subject: Merge branch 'master' into 1429177_Proxy
X-Git-Tag: 0.9~28^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/63137e9ff89ff41c41bcdc33589563d037cc9715?ds=inline;hp=-c

Merge branch 'master' into 1429177_Proxy
---

63137e9ff89ff41c41bcdc33589563d037cc9715
diff --combined README.md
index 13db59a,8d00ced..5296410
--- a/README.md
+++ b/README.md
@@@ -27,6 -27,15 +27,15 @@@ This policy removes access to about:con
    }
  }
  ```
+ ### BlockAboutProfiles
+ This policy removes access to about:profiles.
+ ```
+ {
+   "policies": {
+     "BlockAboutProfiles": true
+   }
+ }
+ ```
  ### BlockAboutSupport
  This policy removes access to about:support.
  ```
@@@ -62,12 -71,12 +71,12 @@@ This policy turns off application updat
    }
  }
  ```
- ### DisableDeveloperTools
- This policy removes access to all developer tools.
+ ### DisableBuiltinPDFViewer
+ This policy disables the built in PDF viewer. PDF files are downloaded and sent externally.
  ```
  {
    "policies": {
-     "DisableDeveloperTools": true
+     "DisableBuiltinPDFViewer": true
    }
  }
  ```
@@@ -80,6 -89,15 +89,15 @@@ This policy removes access to all devel
    }
  }
  ```
+ ### DisableFeedbackCommands
+ This policy disables the menus for reporting sites (Submit Feedback, Report Deceptive Site)
+ ```
+ {
+   "policies": {
+     "DisableFeedbackCommands": true
+   }
+ }
+ ```
  ### DisableFirefoxScreenshots
  This policy removes access to Firefox Screenshots
  ```
@@@ -134,6 -152,15 +152,15 @@@ This policy removes access to private b
    }
  }
  ```
+ ### DisableSafeMode
+ This policy disables safe mode on Windows only
+ ```
+ {
+   "policies": {
+     "DisableSafeMode": true
+   }
+ }
+ ```
  ### DisableSysAddonUpdate
  This policy prevents system add-ons from being updated or installed.
  ```
@@@ -170,6 -197,31 +197,31 @@@ This policy stops Firefox from checkin
    }
  }
  ```
+ ### EnableTrackingProtection
+ This policy affects tracking protection.
+ 
+ If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+ 
+ If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
+ 
+ If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
+ ```
+ {
+   "policies": {
+     "EnableTrackingProtection": {
+       "Value": [true, false],
+       "Locked": [true, false]
+     }
+ ```
+ ### NoDefaultBookmarks
+ Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.
+ ```
+ {
+   "policies": {
+     "NoDefaultBookmarks": true
+   }
+ }
+ ```
  ### RememberPasswords
  This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
  ```
@@@ -253,31 -305,10 +305,31 @@@ same folder name are grouped together
      {"Title": "Example",
       "URL": "http://example.org",
       "Favicon": "http://example.com/favicon.ico",
-      "Placement": "toolbar",
-      "Folder": "Bookmarks"
+      "Placement": ["toolbar", "menu"],
+      "Folder": "FolderName"
       }
      ]
    }
  }
  ```
 +### Proxy
 +This policy allows you to specify proxy settings. These settings correspond to the connection settings in Firefox preferences.
 +To specify ports, append them to the URLs with a colon (:). If Locked is set to true, the values can't be changed by the user.
 +```
 +{
 +  "Proxy": {
 +    "Mode": ["none", "system", "manual", "autoDetect", "autoConfig"]
 +    "Locked": [true, false]
 +Z   "HTTPProxy": "URL_TO_PROXY",
 +    "UseHTTPProxyForAllProtocols": [true, false]
 +    "SSLProxy": "URL_TO_PROXY",
 +    "FTPProxy": "URL_TO_PROXY",
 +    "SOCKSProxy": { "URL_TO_PROXY",
 +    "SOCKSVersion": [4, 5],
 +    "Passthrough": "List of passthrough addresses/domains",
 +    "AutoConfigURL": "URL_TO_AUTOCONFIG",
 +    "AutoLogin":  [true, false],
 +    "UseProxyForDNS": [true, false]
 +  }
 +}
 +```
diff --combined windows/en-US/firefox.adml
index 4b2b76e,c0b69c7..ebb57c8
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -72,25 -72,19 +72,33 @@@
        <string id="Bookmark5">Bookmark 5</string>
        <string id="Bookmark_Explain">Bookmark Explanation</string>
        <string id="BookmarkPlacementToolbar">Toolbar</string>
-       <string id="BookmarkPlacementFolder">Folder</string>
+       <string id="BookmarkPlacementMenu">Menu</string>
+       <string id="NoDefaultBookmarks">No Default Bookmarks</string>
+       <string id="NoDefaultBookmarks_Explain">Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.</string>
        <string id="HomepageURL">URL for Home page</string>
        <string id="HomepageURL_Explain">Homepage Settings</string>
        <string id="HomepageAdditional">Additional Homepages</string>
        <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
 +      <string id="Proxy">Proxy Settings</string>
 +      <string id="Proxy_Explain">If this policy is enabled, you should select the connection type and then fill in the appropriate sections. Due to a bug, you must select a value for the SOCKS proxy version.</string>
 +      <string id="SOCKSVersion4">SOCKS v4</string>
 +      <string id="SOCKSVersion5">SOCKS v5</string>
 +      <string id="AutoConfigURL">Automatic proxy configuration URL</string>
 +      <string id="AutoConfigURL_Explain">These should only be set if you selected autoConfig</string>
 +      <string id="Passthrough">Proxy bypass URLs</string>
 +      <string id="Passthrough_Explain">These should only be set if you selected manual proxy</string>
 +      <string id="Connection">Connection Type</string>
 +      <string id="NoProxy">No Proxy</string>
 +      <string id="SystemProxy">Use system proxy settings</string>
 +      <string id="ManualProxy">Manual proxy configuration</string>
 +      <string id="AutoDetectProxy">Auto-detect proxy settings</string>
 +      <string id="AutoConfigProxy">Automatic proxy configuration</string>
+       <string id="TrackingProtection">Tracking Protection</string>
+       <string id="TrackingProtection_Explain">If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+ 
+ 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.</string>
      </stringTable>
      <presentationTable>
        <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
@@@ -99,6 -93,9 +107,9 @@@
        <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
        <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
        <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
+       <presentation id="TrackingProtection">
+         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
+       </presentation>
        <presentation id="HomepageURL">
          <text>URL:</text>
          <textBox refId="HomepageURL">
@@@ -129,41 -126,6 +140,41 @@@
            <label/>
          </textBox>
        </presentation>
 +      <presentation id="Proxy">
 +        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox> 
 +        <text>Connection Type:</text>
 +        <dropdownList refId="ConnectionType"/>
 +        <text>HTTP Proxy:</text>
 +        <textBox refId="HTTPProxy">
 +          <label/>
 +        </textBox>
 +        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
 +        <text>SSL Proxy:</text>
 +        <textBox refId="SSLProxy">
 +          <label/>
 +        </textBox>
 +        <text>FTP Proxy:</text>
 +        <textBox refId="FTPProxy">
 +          <label/>
 +        </textBox>
 +        <text>SOCKS Host:</text>
 +        <textBox refId="SOCKSProxy">
 +          <label/>
 +        </textBox>
 +        <text>SOCKS Version:</text>
 +        <dropdownList refId="SOCKSVersion"/>
 +        <text>No proxy for</text>
 +        <textBox refId="Passthrough">
 +          <label/>
 +        </textBox>
 +        <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
 +        <text>Automatic proxy configuration URL:</text>
 +        <textBox refId="AutoConfigURL">
 +          <label/>
 +        </textBox>
 +        <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
 +        <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
 +      </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>
diff --combined windows/firefox.admx
index 0a89f63,c597bb1..1511902
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -58,6 -58,16 +58,16 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="BlockAboutProfiles" class="Both" displayName="$(string.BlockAboutProfiles)" explainText="$(string.BlockAboutProfiles_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutProfiles">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_WINXPSP2"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="BlockAboutSupport" class="Both" displayName="$(string.BlockAboutSupport)" explainText="$(string.BlockAboutSupport_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutSupport">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_WINXPSP2"/>
@@@ -228,6 -238,16 +238,16 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_WINXPSP2"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="DontCheckDefaultBrowser" class="Both" displayName="$(string.DontCheckDefaultBrowser)" explainText="$(string.DontCheckDefaultBrowser_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DontCheckDefaultBrowser">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_WINXPSP2"/>
@@@ -238,6 -258,26 +258,26 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="TrackingProtection" class="Both" displayName="$(string.TrackingProtection)" explainText="$(string.TrackingProtection_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Value" presentation="$(presentation.TrackingProtection)">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_WINXPSP2"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+       <elements >
+         <boolean id="TrackingProtectionLocked" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Locked">
+           <trueValue>
+             <decimal value="1"/>
+           </trueValue>
+           <falseValue>
+             <decimal value="0"/>
+           </falseValue>
+         </boolean>
+       </elements>
+     </policy>
      <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_WINXPSP2"/>
@@@ -326,9 -366,9 +366,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -348,9 -388,9 +388,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -370,9 -410,9 +410,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -392,9 -432,9 +432,9 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
@@@ -414,96 -454,13 +454,96 @@@
                <string>toolbar</string>
              </value>
            </item>
-           <item displayName="$(string.BookmarkPlacementFolder)">
+           <item displayName="$(string.BookmarkPlacementMenu)">
              <value>
-               <string>folder</string>
+               <string>menu</string>
              </value>
            </item>
          </enum>
        </elements>
      </policy>
 +    <policy class="Both" displayName="$(string.Proxy)" name="Proxy" explainText="$(string.Proxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy)" >
 +      <parentCategory ref="firefox" />
 +      <supportedOn ref="SUPPORTED_WINXPSP2" />
 +      <elements >
 +        <boolean id="ProxyLocked" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="Locked">
 +          <trueValue>
 +            <decimal value="1"/>
 +          </trueValue>
 +          <falseValue>
 +            <decimal value="0"/>
 +          </falseValue>
 +        </boolean>
 +        <enum id="ConnectionType" valueName="Mode">
 +          <item displayName="$(string.NoProxy)">
 +            <value>
 +              <string>none</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.SystemProxy)">
 +            <value>
 +              <string>system</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.ManualProxy)">
 +            <value>
 +              <string>manual</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.AutoDetectProxy)">
 +            <value>
 +              <string>autoDetect</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.AutoConfigProxy)">
 +            <value>
 +              <string>autoConfig</string>
 +            </value>
 +          </item>
 +        </enum>
 +        <text id="HTTPProxy" valueName="HTTPProxy"/>
 +        <boolean id="UseHTTPProxyForAllProtocols" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseHTTPProxyForAllProtocols">
 +          <trueValue>
 +            <decimal value="1"/>
 +          </trueValue>
 +          <falseValue>
 +            <decimal value="0"/>
 +          </falseValue>
 +        </boolean>
 +        <text id="SSLProxy" valueName="SSLProxy"/>
 +        <text id="FTPProxy" valueName="FTPProxy"/>
 +        <text id="SOCKSProxy" valueName="SOCKSProxy"/>
 +        <enum id="SOCKSVersion" valueName="SOCKSVersion">
 +          <item displayName="$(string.SOCKSVersion4)">
 +            <value>
 +              <string>4</string>
 +            </value>
 +          </item>
 +          <item displayName="$(string.SOCKSVersion5)">
 +            <value>
 +              <string>5</string>
 +            </value>
 +          </item>
 +        </enum>
 +        <text id="AutoConfigURL" valueName="AutoConfigURL"/>
 +        <text id="Passthrough" valueName="Passthrough"/>
 +        <boolean id="AutoLogin" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="AutoLogin">
 +          <trueValue>
 +            <decimal value="1"/>
 +          </trueValue>
 +          <falseValue>
 +            <decimal value="0"/>
 +          </falseValue>
 +        </boolean>
 +        <boolean id="UseProxyForDNS" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseProxyForDNS">
 +          <trueValue>
 +            <decimal value="1"/>
 +          </trueValue>
 +          <falseValue>
 +            <decimal value="0"/>
 +          </falseValue>
 +        </boolean>
 +      </elements>
 +    </policy>
    </policies>
  </policyDefinitions>