Use setProperties for IP Config.

chrome/browser/resources/options/chromeos/internet_detail.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
 //   networkingPrivate API. See network_config.js.
 // See crbug.com/279351 for more info.
 
-/** @typedef {{address: (string|undefined),
- *             gateway: (string|undefined),
- *             nameServers: (string|undefined),
- *             netmask: (string|undefined),
- *             prefixLength: (number|undefined)}}
- * @see chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
- */
-var IPInfo;
-
 cr.define('options.internet', function() {
   var OncData = cr.onc.OncData;
   var Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
   /** @const */ var IPAddressField = options.internet.IPAddressField;
 
-  /** @const */ var GoogleNameServersString = '8.8.4.4,8.8.8.8';
+  /** @const */ var GoogleNameServers = ['8.8.4.4', '8.8.8.8'];
   /** @const */ var CarrierGenericUMTS = 'Generic UMTS';
 
   /**
    * Helper function to set hidden attribute for elements matching a selector.
    * @param {string} selector CSS selector for extracting a list of elements.
    * @param {boolean} hidden New hidden value.
    */
   function updateHidden(selector, hidden) {
     var elements = cr.doc.querySelectorAll(selector);
     for (var i = 0, el; el = elements[i]; i++) {
@@ skipping 89 matching lines @@
       if (i > 0)
         netmask += '.';
       var value = 0;
       if (remainder != 0)
         value = ((2 << (remainder - 1)) - 1) << (8 - remainder);
       netmask += value.toString();
     }
     return netmask;
   }
 
+  /**
+   * Returns the prefix length from the netmask string.
+   * @param {string} netmask The netmask string, e.g. 255.255.255.0.
+   * @return {number} The corresponding netmask or -1 if invalid.
+   */
+  function netmaskToPrefixLength(netmask) {
+    var prefixLength = 0;
+    var tokens = netmask.split('.');
+    if (tokens.length != 4)
+      return -1;
+    for (var i = 0; i < tokens.length; ++i) {
+      var token = tokens[i];
+      // If we already found the last mask and the current one is not
+      // '0' then the netmask is invalid. For example, 255.224.255.0
+      if (prefixLength / 8 != i) {
+        if (token != '0')
+          return -1;
+      } else if (token == '255') {
+        prefixLength += 8;
+      } else if (token == '254') {
+        prefixLength += 7;
+      } else if (token == '252') {
+        prefixLength += 6;
+      } else if (token == '248') {
+        prefixLength += 5;
+      } else if (token == '240') {
+        prefixLength += 4;
+      } else if (token == '224') {
+        prefixLength += 3;
+      } else if (token == '192') {
+        prefixLength += 2;
+      } else if (token == '128') {
+        prefixLength += 1;
+      } else if (token == '0') {
+        prefixLength += 0;
+      } else {
+        // mask is not a valid number.
+        return -1;
+      }
+    }
+    return prefixLength;
+  }
+
   /////////////////////////////////////////////////////////////////////////////
   // DetailsInternetPage class:
 
   /**
    * Encapsulated handling of ChromeOS internet details overlay page.
    * @constructor
    * @extends {cr.ui.pageManager.Page}
    */
   function DetailsInternetPage() {
     // Cached Apn properties
@@ skipping 198 matching lines @@
      * Handler for when the name server selection changes.
      * @param {Event} event The click event.
      * @private
      */
     handleNameServerTypeChange_: function(event) {
       var type = event.target.value;
       DetailsInternetPage.updateNameServerDisplay(type);
     },
 
     /**
-     * Sends the IP Config info to chrome.
+     * Gets the IPConfig ONC Object.
      * @param {string} nameServerType The selected name server type:
      *   'automatic', 'google', or 'user'.
+     * @return {Object} The IPConfig ONC object.
      * @private
      */
-    sendIpConfig_: function(nameServerType) {
-      var userNameServerString = '';
-      if (nameServerType == 'user') {
-        var userNameServers = [];
-        for (var i = 1; i <= 4; ++i) {
-          var nameServerField = $('ipconfig-dns' + i);
-          // Skip empty values.
-          if (nameServerField && nameServerField.model &&
-              nameServerField.model.value) {
-            userNameServers.push(nameServerField.model.value);
+    getIpConfig_: function(nameServerType) {
+      var ipConfig = {};
+      // If 'ip-address' is empty, automatic configuration will be used.
+      if (!$('ip-automatic-configuration-checkbox').checked &&
+          $('ip-address').model.value) {
+        ipConfig['IPAddress'] = $('ip-address').model.value;
+        var netmask = $('ip-netmask').model.value;
+        var routingPrefix = 0;
+        if (netmask) {
+          routingPrefix = netmaskToPrefixLength(netmask);
+          if (routingPrefix == -1) {
+            console.error('Invalid netmask: ' + netmask);
+            routingPrefix = 0;
           }
         }
-        userNameServerString = userNameServers.sort().join(',');
+        ipConfig['RoutingPrefix'] = routingPrefix;
+        ipConfig['Gateway'] = $('ip-gateway').model.value || '';
       }
-      chrome.send('setIPConfig',
-                  [this.servicePath_,
-                   Boolean($('ip-automatic-configuration-checkbox').checked),
-                   $('ip-address').model.value || '',
-                   $('ip-netmask').model.value || '',
-                   $('ip-gateway').model.value || '',
-                   nameServerType,
-                   userNameServerString]);
+
+      // Note: If no nameserver fields are set, automatic configuration will be
+      // used. TODO(stevenjb): Validate input fields.
+      if (nameServerType != 'automatic') {
+        var userNameServers = [];
+        if (nameServerType == 'google') {
+          userNameServers = GoogleNameServers.splice();
+        } else if (nameServerType == 'user') {
+          for (var i = 1; i <= 4; ++i) {
+            var nameServerField = $('ipconfig-dns' + i);
+            // Skip empty values.
+            if (nameServerField && nameServerField.model &&
+                nameServerField.model.value) {
+              userNameServers.push(nameServerField.model.value);
+            }
+          }
+        }
+        if (userNameServers.length)
+          ipConfig['NameServers'] = userNameServers.sort();
+      }
+      return ipConfig;
     },
 
     /**
      * Creates an indicator event for controlled properties using
      * the same dictionary format as CoreOptionsHandler::CreateValueForPref.
      * @param {string} name The name for the Event.
      * @param {{value: *, controlledBy: *, recommendedValue: *}} propData
      *     Property dictionary.
      * @private
      */
@@ skipping 707 matching lines @@
     }
 
     var nameServerTypes = ['automatic', 'google', 'user'];
     var nameServerType = 'automatic';
     for (var i = 0; i < nameServerTypes.length; ++i) {
       if ($(nameServerTypes[i] + '-dns-radio').checked) {
         nameServerType = nameServerTypes[i];
         break;
       }
     }
-    detailsPage.sendIpConfig_(nameServerType);
+    var ipConfig = detailsPage.getIpConfig_(nameServerType);
+    var ipAddressType = ('IPAddress' in ipConfig) ? 'Static' : 'DHCP';
+    var nameServersType = ('NameServers' in ipConfig) ? 'Static' : 'DHCP';
+    oncData.setProperty('IPAddressConfigType', ipAddressType);
+    oncData.setProperty('NameServersConfigType', nameServersType);
+    oncData.setProperty('StaticIPConfig', ipConfig);
 
     var data = oncData.getData();
     if (Object.keys(data).length > 0) {
+      // TODO(stevenjb): Only set changed properties.
       // TODO(stevenjb): chrome.networkingPrivate.setProperties
       chrome.send('setProperties', [servicePath, data]);
     }
 
     PageManager.closeOverlay();
   };
 
   /**
    * Event handler called when the name server type changes.
    * @param {string} type The selected name sever type, 'automatic', 'google',
@@ skipping 94 matching lines @@
     } else {
       detailsPage.showProxy_ = false;
     }
 
     $('web-proxy-auto-discovery').hidden = true;
 
     var restricted = onc.getActiveValue('RestrictedConnectivity');
     var restrictedString = loadTimeData.getString(
         restricted ? 'restrictedYes' : 'restrictedNo');
 
+    // These objects contain an 'automatic' property that is displayed when
+    // ip-automatic-configuration-checkbox is checked, and a 'value' property
+    // that is displayed when unchecked and used to set the associated ONC
+    // property for StaticIPConfig on commit.
     var inetAddress = {};
     var inetNetmask = {};
     var inetGateway = {};
 
     var inetNameServersString;
 
     var ipconfigList = onc.getActiveValue('IPConfigs');
     if (Array.isArray(ipconfigList)) {
       for (var i = 0; i < ipconfigList.length; ++i) {
         var ipconfig = ipconfigList[i];
@@ skipping 18 matching lines @@
         }
         if ('NameServers' in ipconfig) {
           var inetNameServers = ipconfig['NameServers'];
           inetNameServers = inetNameServers.sort();
           inetNameServersString = inetNameServers.join(',');
         }
         break;  // Use the first IPv4 entry.
       }
     }
 
-    // Override the "automatic" values with the real saved DHCP values,
-    // if they are set.
+    // Override the 'automatic' properties with the saved DHCP values if the
+    // saved value is set, and set any unset 'value' properties.
     var savedNameServersString;
     var savedIpAddress = onc.getActiveValue('SavedIPConfig.IPAddress');
     if (savedIpAddress != undefined) {
       inetAddress.automatic = savedIpAddress;
-      inetAddress.value = savedIpAddress;
+      if (!inetAddress.value)
+        inetAddress.value = savedIpAddress;
     }
     var savedPrefix = onc.getActiveValue('SavedIPConfig.RoutingPrefix');
     if (savedPrefix != undefined) {
       assert(typeof savedPrefix == 'number');
       var savedNetmask = prefixLengthToNetmask(
           /** @type {number} */(savedPrefix));
       inetNetmask.automatic = savedNetmask;
-      inetNetmask.value = savedNetmask;
+      if (!inetNetmask.value)
+        inetNetmask.value = savedNetmask;
     }
     var savedGateway = onc.getActiveValue('SavedIPConfig.Gateway');
     if (savedGateway != undefined) {
       inetGateway.automatic = savedGateway;
-      inetGateway.value = savedGateway;
+      if (!inetGateway.value)
+        inetGateway.value = savedGateway;
     }
+
     var savedNameServers = onc.getActiveValue('SavedIPConfig.NameServers');
     if (savedNameServers) {
       savedNameServers = savedNameServers.sort();
       savedNameServersString = savedNameServers.join(',');
     }
 
     var ipAutoConfig = 'automatic';
-
-    var staticNameServersString;
-    var staticIpAddress = onc.getActiveValue('StaticIPConfig.IPAddress');
-    if (staticIpAddress != undefined) {
+    if (onc.getActiveValue('IPAddressConfigType') == 'Static') {
       ipAutoConfig = 'user';
+      var staticIpAddress = onc.getActiveValue('StaticIPConfig.IPAddress');
       inetAddress.user = staticIpAddress;
       inetAddress.value = staticIpAddress;
-    }
-    var staticPrefix = onc.getActiveValue('StaticIPConfig.RoutingPrefix');
-    if (staticPrefix != undefined) {
-      assert(typeof staticPrefix == 'number');
+
+      var staticPrefix = onc.getActiveValue('StaticIPConfig.RoutingPrefix');
+      if (typeof staticPrefix != 'number')
+        staticPrefix = 0;
       var staticNetmask = prefixLengthToNetmask(
-          /** @type {number} */(staticPrefix));
+          /** @type {number} */ (staticPrefix));
       inetNetmask.user = staticNetmask;
       inetNetmask.value = staticNetmask;
-    }
-    var staticGateway = onc.getActiveValue('StaticIPConfig.Gateway');
-    if (staticGateway != undefined) {
+
+      var staticGateway = onc.getActiveValue('StaticIPConfig.Gateway');
       inetGateway.user = staticGateway;
       inetGateway.value = staticGateway;
     }
-    var staticNameServers = onc.getActiveValue('StaticIPConfig.NameServers');
-    if (staticNameServers) {
+
+    var staticNameServersString;
+    if (onc.getActiveValue('NameServersConfigType') == 'Static') {
+      var staticNameServers = onc.getActiveValue('StaticIPConfig.NameServers');
       staticNameServers = staticNameServers.sort();
       staticNameServersString = staticNameServers.join(',');
     }
 
     $('ip-automatic-configuration-checkbox').checked =
         ipAutoConfig == 'automatic';
 
     inetAddress.autoConfig = ipAutoConfig;
     inetNetmask.autoConfig = ipAutoConfig;
     inetGateway.autoConfig = ipAutoConfig;
 
     var configureAddressField = function(field, model) {
       IPAddressField.decorate(field);
       field.model = model;
       field.editable = model.autoConfig == 'user';
     };
     configureAddressField($('ip-address'), inetAddress);
     configureAddressField($('ip-netmask'), inetNetmask);
     configureAddressField($('ip-gateway'), inetGateway);
 
     // Set Nameserver fields.
     var nameServerType = 'automatic';
     if (staticNameServersString) {
       // If static nameservers are defined and match the google name servers,
       // show that in the UI, otherwise show the custom static nameservers.
-      if (staticNameServersString == GoogleNameServersString)
+      if (staticNameServersString == GoogleNameServers.join(','))
         nameServerType = 'google';
       else if (staticNameServersString == inetNameServersString)
         nameServerType = 'user';
     }
     if (nameServerType == 'automatic')
       $('automatic-dns-display').textContent = inetNameServersString;
     else
       $('automatic-dns-display').textContent = savedNameServersString;
-    $('google-dns-display').textContent = GoogleNameServersString;
+    $('google-dns-display').textContent = GoogleNameServers.join(',');
 
     var nameServersUser = [];
     if (staticNameServers) {
       nameServersUser = staticNameServers;
     } else if (savedNameServers) {
       // Pre-populate with values provided by DHCP server.
       nameServersUser = savedNameServers;
     }
 
     var nameServerModels = [];
@@ skipping 224 matching lines @@
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });