X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/66fa00c7cb673a33bd7cfbd5949ed7985dfcc018..a2c63af36e3b9f0b99491d84126c84c5828ab136:/windows/firefox.admx?ds=sidebyside

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 996af46..a63eb85 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="2.01" schemaVersion="1.0">
+<policyDefinitions revision="2.2" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="2.01"/>
+  <resources minRequiredRevision="2.2"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@ -31,6 +31,9 @@
       <definition name="SUPPORTED_FF77" displayName="$(string.SUPPORTED_FF77)"/>
       <definition name="SUPPORTED_FF77_ONLY" displayName="$(string.SUPPORTED_FF77_ONLY)"/>
       <definition name="SUPPORTED_FF78" displayName="$(string.SUPPORTED_FF78)"/>
+      <definition name="SUPPORTED_FF79" displayName="$(string.SUPPORTED_FF79)"/>
+      <definition name="SUPPORTED_FF80" displayName="$(string.SUPPORTED_FF80)"/>
+      <definition name="SUPPORTED_FF81" displayName="$(string.SUPPORTED_FF81)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -85,6 +88,9 @@
     <category displayName="$(string.Autoplay_group)" name="Autoplay">
       <parentCategory ref="Permissions"/>
     </category>
+    <category displayName="$(string.VirtualReality_group)" name="VirtualReality">
+      <parentCategory ref="Permissions"/>
+    </category>
     <category displayName="$(string.Preferences_group)" name="Preferences">
       <parentCategory ref="firefox"/>
     </category>
@@ -280,6 +286,13 @@
         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Cookies\Allow" valuePrefix=""/>
       </elements>
     </policy>
+    <policy name="Cookies_AllowSession" class="Both" displayName="$(string.AllowSession)" explainText="$(string.Cookies_AllowSession_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Permissions)">
+      <parentCategory ref="Cookies"/>
+      <supportedOn ref="SUPPORTED_FF79"/>
+      <elements>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Cookies\AllowSession" valuePrefix=""/>
+      </elements>
+    </policy>
     <policy name="Cookies_Block" class="Both" displayName="$(string.Block)" explainText="$(string.Cookies_Block_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Permissions)">
       <parentCategory ref="Cookies"/>
       <supportedOn ref="SUPPORTED_FF60"/>
@@ -533,6 +546,40 @@
         </enum>
       </elements>
     </policy>
+    <policy name="VirtualReality_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.VirtualReality_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+      <parentCategory ref="VirtualReality"/>
+      <supportedOn ref="SUPPORTED_FF80"/>
+      <elements>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\VirtualReality\Allow" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="VirtualReality_Block" class="Both" displayName="$(string.Block)" explainText="$(string.VirtualReality_Block_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+      <parentCategory ref="VirtualReality"/>
+      <supportedOn ref="SUPPORTED_FF80"/>
+      <elements>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\VirtualReality\Block" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="VirtualReality_BlockNewRequests" class="Both" displayName="$(string.VirtualReality_BlockNewRequests)" explainText="$(string.VirtualReality_BlockNewRequests_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\VirtualReality" valueName="BlockNewRequests">
+      <parentCategory ref="VirtualReality"/>
+      <supportedOn ref="SUPPORTED_FF80"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="VirtualReality_Locked" class="Both" displayName="$(string.VirtualReality_Locked)" explainText="$(string.VirtualReality_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\VirtualReality" valueName="Locked">
+      <parentCategory ref="VirtualReality"/>
+      <supportedOn ref="SUPPORTED_FF80"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DefaultDownloadDirectory" class="Both" displayName="$(string.DefaultDownloadDirectory)" explainText="$(string.DefaultDownloadDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Preferences_String)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF68"/>
@@ -3255,7 +3302,7 @@
     </policy>
     <policy name="media_peerconnection_ice_obfuscate_host_addresses_blocklist" class="Both" displayName="$(string.media_peerconnection_ice_obfuscate_host_addresses_blocklist)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
-      <supportedOn ref="SUPPORTED_FF68" />
+      <supportedOn ref="SUPPORTED_FF79" />
       <elements >
         <text id="Preferences_String" valueName="media.peerconnection.ice.obfuscate_host_addresses.blocklist" required="true" />
       </elements>
@@ -3624,16 +3671,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-<!--    <policy name="MasterPassword" class="Both" displayName="$(string.MasterPassword)" explainText="$(string.MasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="MasterPassword">
+    <policy name="PrimaryPassword" class="Both" displayName="$(string.PrimaryPassword)" explainText="$(string.PrimaryPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="PrimaryPassword">
       <parentCategory ref="firefox"/>
-      <supportedOn ref="SUPPORTED_FF78"/>
+      <supportedOn ref="SUPPORTED_FF79"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>
-    </policy> -->
+    </policy>
     <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>