Test Web Proxy Auto Config
Perform a DHCP negotiation where the server provides a Web Proxy
Auto Config option. Test to make sure that the shill IPConfig
contains this value.
CQ-DEPEND=CL:60015
BUG=chromium:253915
TEST=This is a test.
Change-Id: Iae1d23f69e83c51b0cfc8afbc75cc3aec7fdd4dc
Reviewed-on: https://gerrit.chromium.org/gerrit/60020
Reviewed-by: Paul Stewart <[email protected]>
Tested-by: Paul Stewart <[email protected]>
Commit-Queue: Paul Stewart <[email protected]>
diff --git a/client/cros/dhcp_packet.py b/client/cros/dhcp_packet.py
index e218cf9..844d7d0 100644
--- a/client/cros/dhcp_packet.py
+++ b/client/cros/dhcp_packet.py
@@ -345,6 +345,7 @@
OPTION_DNS_DOMAIN_SEARCH_LIST = DomainListOption("domain_search_list", 119)
OPTION_CLASSLESS_STATIC_ROUTES = ClasslessStaticRoutesOption(
"classless_static_routes", 121)
+OPTION_WEB_PROXY_AUTO_DISCOVERY = RawOption("wpad", 252)
# Unlike every other option, which are tuples like:
# <number, length in bytes, data>, the pad and end options are just
@@ -460,6 +461,7 @@
OPTION_BOOTFILE_NAME,
OPTION_DNS_DOMAIN_SEARCH_LIST,
OPTION_CLASSLESS_STATIC_ROUTES,
+ OPTION_WEB_PROXY_AUTO_DISCOVERY,
]
def get_dhcp_option_by_number(number):
diff --git a/client/site_tests/network_DhcpWpadNegotiation/control b/client/site_tests/network_DhcpWpadNegotiation/control
new file mode 100644
index 0000000..e7ee336
--- /dev/null
+++ b/client/site_tests/network_DhcpWpadNegotiation/control
@@ -0,0 +1,24 @@
+# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "[email protected]"
+NAME = "network_DhcpWpadNegotiation"
+PURPOSE = "Verify DHCP negotion for Web Proxy Auto Discovery succeeds"
+SUITE = "network_nightly"
+CRITERIA = """
+This test fails if dhcpcd is unable to negotiate a DHCP lease, or
+if shill fails to report the WPAD parameter sent by the server.
+"""
+TIME = "SHORT"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "network"
+TEST_TYPE = "client"
+
+DOC = """
+ Tests that we can negotiate a lease on an IPv4 address via DHCP from
+a server that provides the Web Proxy Auto Discovery option.
+
+"""
+
+job.run_test('network_DhcpWpadNegotiation')
diff --git a/client/site_tests/network_DhcpWpadNegotiation/network_DhcpWpadNegotiation.py b/client/site_tests/network_DhcpWpadNegotiation/network_DhcpWpadNegotiation.py
new file mode 100644
index 0000000..d554760
--- /dev/null
+++ b/client/site_tests/network_DhcpWpadNegotiation/network_DhcpWpadNegotiation.py
@@ -0,0 +1,90 @@
+# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import time
+
+from autotest_lib.client.common_lib import error
+from autotest_lib.client.cros import dhcp_handling_rule
+from autotest_lib.client.cros import dhcp_packet
+from autotest_lib.client.cros import dhcp_test_base
+
+# This hacks the path so that we can import shill_proxy.
+# pylint: disable=W0611
+from autotest_lib.client.cros import flimflam_test_path
+# pylint: enable=W0611
+import shill_proxy
+
+# Length of time the lease from the DHCP server is valid.
+LEASE_TIME_SECONDS = 60
+# We'll fill in the subnet and give this address to the client.
+INTENDED_IP_SUFFIX = "0.0.0.101"
+# We should be able to complete a DHCP negotiation in this amount of time.
+DHCP_NEGOTIATION_TIMEOUT_SECONDS = 10
+
+class network_DhcpWpadNegotiation(dhcp_test_base.DhcpTestBase):
+ """Test implemenation of WPAD negotiation."""
+
+ def check_wpad_config(self, proxy_auto_config):
+ """Check that the ipconfig in the client shows the the proxy config.
+
+ @param proxy_auto_config string expected value for proxy autoconfig.
+
+ """
+ proxy = shill_proxy.ShillProxy()
+ device = proxy.find_object(
+ 'Device',
+ {'Name': self.ethernet_pair.peer_interface_name})
+ if device is None:
+ raise error.TestFail('Device was not found.')
+ device_properties = device.GetProperties(utf8_strings=True)
+ ipconfig_path = device_properties['IPConfigs'][0]
+ ipconfig = proxy.get_dbus_object('org.chromium.flimflam.IPConfig',
+ ipconfig_path)
+ ipconfig_properties = ipconfig.GetProperties(utf8_strings=True)
+ ipconfig_proxy_auto_config = ipconfig_properties[
+ 'WebProxyAutoDiscoveryUrl']
+ if ipconfig_proxy_auto_config != proxy_auto_config:
+ raise error.TestFail('Shill proxy config %s does not match '
+ 'expected %s.' %
+ (proxy_auto_config,
+ ipconfig_proxy_auto_config))
+
+
+ def test_body(self):
+ """Main body of the test."""
+ subnet_mask = self.ethernet_pair.interface_subnet_mask
+ intended_ip = dhcp_test_base.DhcpTestBase.rewrite_ip_suffix(
+ subnet_mask,
+ self.server_ip,
+ INTENDED_IP_SUFFIX)
+ # Two real name servers, and a bogus one to be unpredictable.
+ dns_servers = ["8.8.8.8", "8.8.4.4", "192.168.87.88"]
+ proxy_auto_config = "http://server:8080/wpad.dat"
+ # This is the pool of information the server will give out to the client
+ # upon request.
+ dhcp_options = {
+ dhcp_packet.OPTION_SERVER_ID : self.server_ip,
+ dhcp_packet.OPTION_SUBNET_MASK : subnet_mask,
+ dhcp_packet.OPTION_IP_LEASE_TIME : LEASE_TIME_SECONDS,
+ dhcp_packet.OPTION_REQUESTED_IP : intended_ip,
+ dhcp_packet.OPTION_DNS_SERVERS : dns_servers,
+ dhcp_packet.OPTION_WEB_PROXY_AUTO_DISCOVERY : proxy_auto_config
+ }
+ rules = [
+ dhcp_handling_rule.DhcpHandlingRule_RespondToDiscovery(
+ intended_ip, self.server_ip, dhcp_options, {}),
+ dhcp_handling_rule.DhcpHandlingRule_RespondToRequest(
+ intended_ip, self.server_ip, dhcp_options, {})
+ ]
+ rules[-1].is_final_handler = True
+ self.server.start_test(rules, DHCP_NEGOTIATION_TIMEOUT_SECONDS)
+ self.server.wait_for_test_to_finish()
+ if not self.server.last_test_passed:
+ raise error.TestFail("Test server didn't get all the messages it "
+ "was told to expect during negotiation.")
+
+ # Wait for configuration to propagate over dbus to shill.
+ # TODO(wiley) Make this event based. This is pretty sloppy.
+ time.sleep(0.1)
+ self.check_wpad_config(proxy_auto_config)
