Policy for Proxy settings. Fixes #19.

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 06beb4b42e885854def8814b8ed1418a0f90d454..e52cd964d070e990b6b48c20e61ff8257e4bf6f1 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -13,6 +13,7 @@
       <string id="Addons_group">Addons</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Addons_group">Addons</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>

+      <string id="Proxy_group">Proxy server</string>

       <string id="Allow">Allow</string>
       <string id="Block">Block</string>
       <string id="BlockAboutAddons">Block About Addons</string>
       <string id="Allow">Allow</string>
       <string id="Block">Block</string>
       <string id="BlockAboutAddons">Block About Addons</string>


@@ -77,6 +78,27 @@
       <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="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="HTTPProxy">HTTP Proxy Settings</string>
+      <string id="HTTPProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SSLProxy">SSL Proxy Settings</string>
+      <string id="SSLProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="FTPProxy">FTP Proxy Settings</string>
+      <string id="FTPProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SOCKSProxy">SOCKS Host Settings</string>
+      <string id="SOCKSProxy_Explain">This should only be set if you selected manual proxy</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="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="ProxyMode">Proxy Mode</string>
+      <string id="ProxyMode_Explain">Select the proxy mode</string>

     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>


@@ -115,6 +137,51 @@
           <label/>
         </textBox>
       </presentation>
           <label/>
         </textBox>
       </presentation>

+      <presentation id="HTTPProxy">
+        <text>HTTP Proxy:</text>
+        <textBox refId="HTTPProxy">
+          <label/>
+        </textBox>
+        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
+         </presentation>
+      <presentation id="SSLProxy">
+        <text>SSL Proxy:</text>
+        <textBox refId="SSLProxy">
+          <label/>
+        </textBox>
+         </presentation>
+      <presentation id="FTPProxy">
+        <text>FTP Proxy:</text>
+        <textBox refId="FTPProxy">
+          <label/>
+        </textBox>
+         </presentation>
+      <presentation id="SOCKSProxy">
+        <text>SOCKS Host:</text>
+        <textBox refId="SOCKSProxy">
+          <label/>
+        </textBox>
+        <dropdownList refId="SOCKSVersion"/>
+      </presentation>
+      <presentation id="Passthrough">
+        <text>No proxy for</text>
+        <textBox refId="Passthrough">
+          <label/>
+        </textBox>
+        <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
+         </presentation>
+      <presentation id="AutoConfigURL">
+        <text>Automatic proxy configuration URL:</text>
+        <textBox refId="AutoConfigURL">
+          <label/>
+        </textBox>
+         </presentation>
+      <presentation id="ProxyMode">
+        <dropdownList refId="ProxyMode"/>
+        <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
+        <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
+        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 198dc65f05cb05fbd04a498e450ede16f2d7f830..827c0633b4012a9ddf45daf9a14f269413fe5860 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -36,6 +36,9 @@
     <category displayName="$(string.Homepage_group)" name="Homepage">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Homepage_group)" name="Homepage">
       <parentCategory ref="firefox"/>
     </category>

+    <category displayName="$(string.Proxy_group)" name="Proxy">
+      <parentCategory ref="firefox"/>
+    </category>

   </categories>
   <policies>
     <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">
   </categories>
   <policies>
     <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">


@@ -422,5 +425,124 @@
         </enum>
       </elements>
     </policy>
         </enum>
       </elements>
     </policy>

+    <policy class="Both" displayName="$(string.ProxyMode)" name="ProxyMode" explainText="$(string.ProxyMode_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.ProxyMode)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <enum id="ProxyMode" 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>
+        <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>
+        <boolean id="ProxyLocked" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="Locked">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.HTTPProxy)" name="HTTPProxy" explainText="$(string.HTTPProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.HTTPProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="HTTPProxy" valueName="HTTPProxy" required="true" />
+        <boolean id="UseHTTPProxyForAllProtocols" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseHTTPProxyForAllProtocols">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.SSLProxy)" name="SSLProxy" explainText="$(string.SSLProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.SSLProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="SSLProxy" valueName="SSLProxy" required="true" />
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.FTPProxy)" name="FTPProxy" explainText="$(string.FTPProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.FTPProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="FTPProxy" valueName="FTPProxy" required="true" />
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.SOCKSProxy)" name="SOCKSProxy" explainText="$(string.SOCKSProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.SOCKSProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="SOCKSProxy" valueName="SOCKSProxy" required="true" />
+        <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>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.AutoConfigURL)" name="AutoConfigURL" explainText="$(string.AutoConfigURL_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.AutoConfigURL)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="AutoConfigURL" valueName="AutoConfigURL" required="true" />
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Passthrough)" name="Passthrough" explainText="$(string.Passthrough_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Passthrough)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="Passthrough" valueName="Passthrough" required="true" />
+      </elements>
+    </policy>

   </policies>
 </policyDefinitions>
   </policies>
 </policyDefinitions>