Rearrange EAP setup so that it is more parameterizable for other EAP types

server/site_linux_router.py

 # Copyright (c) 2010 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 logging, re, time
 from autotest_lib.client.common_lib import error
-from autotest_lib.server import site_eap_tls
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
     return re.search('Linux', router_uname)
 
 class LinuxRouter(object):
     """
     Linux/mac80211-style WiFi Router support for WiFiTest class.
 
     This class implements test methods/steps that communicate with a
@@ skipping 121 matching lines @@
         self.router.run("%s phy %s interface add %s type %s" %
             (self.cmd_iw, self.phydev5, self.wlanif5, phytype))
 
 
     def destroy(self, params):
         """ Destroy a previously created device """
         # For linux, this is the same as deconfig.
         self.deconfig(params)
 
 
+    def insert_file(self, host, filename, contents):
+        """
+        If config files are too big, the "host.run()" never returns.
+        As a workaround, break the file up into lines and append the
+        file piece by piece
+        """
+        host.run('rm -f %s >/dev/null 2>&1' % filename, ignore_status=True)
+        content_lines = contents.splitlines()
+        while content_lines:
+            buflist = []
+            buflen = 0
+            while content_lines and buflen + len(content_lines[0]) < 200:
+                line = content_lines.pop(0)
+                buflen += len(line) + 1
+                buflist.append(line)
+
+            if not buflist:
+                raise error.TestFail('Cert profile: line too long: %s' %
+                                     content_lines[0])
+            host.run('cat <<EOF >>%s\n%s\nEOF\n' %
+                     (filename, '\n'.join(buflist)))
 
     def config(self, params):
         """ Configure the AP per test requirements """
 
         multi_interface = 'multi_interface' in params
         if multi_interface:
             params.pop('multi_interface')
         elif self.hostapd['configured']:
             self.deconfig({})
 
         if self.apmode:
             # Construct the hostapd.conf file and start hostapd.
             conf = self.hostapd['conf']
             htcaps = set()
 
             conf['driver'] = params.get('hostapd_driver',
                 self.hostapd['driver'])
 
             for k, v in params.iteritems():
-                if k == 'ssid':
+                # For some parameters, the hostapd.conf value is a filename;
+                # here, we create a file to contain the actual value and then
+                # put the filename in hostapd.conf.
+                if k.endswith('_file') or k in ['ca_cert',
+                                                'server_cert',
+                                                'private_key',
+                                                'radius_server_clients',
+                                                'wps_pin_requests',
+                                                'ap_settings']:
+                    filename = "/tmp/hostap_%s" % k
+                    self.insert_file(self.router, filename, v)
+                    conf[k] = filename
+                elif k == 'ssid':
                     conf['ssid'] = v
                 elif k == 'ssid_suffix':
                     conf['ssid'] = self.defssid + v
                 elif k == 'channel':
                     freq = int(v)
 
                     # 2.4GHz
                     if freq <= 2484:
                         # Make sure hw_mode is set
                         if conf.get('hw_mode') == 'a':
@@ skipping 72 matching lines @@
                 elif k == 'ht':
                     htcaps.add('')  # NB: ensure 802.11n setup below
                 elif k == 'htprotmode':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'rifs':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'wepmode':
                     pass        # NB: meaningless for hostapd; ignore
                 elif k == '-ampdu':
                     pass        # TODO(sleffler) need hostapd support
-                elif k == 'eap-tls':
-                    conf.update(site_eap_tls.router_config(self.router, v))
+                elif k == 'eap':
+                    conf.update(site_eap.router_config(self.router, v))
                 else:
                     conf[k] = v
 
             # Aggregate ht_capab.
             if htcaps:
                 conf['ieee80211n'] = 1
                 conf['ht_capab'] = ''.join(htcaps)
 
             # Figure out the correct interface.
             if conf.get('hw_mode', 'b') == 'a':
@@ skipping 71 matching lines @@
 
     def get_ssid(self):
         return self.hostapd['conf']['ssid']
 
 
     def set_txpower(self, params):
         self.router.run("%s dev %s set txpower %s" %
                         (self.cmd_iw, params.get('interface',
                                                  self.hostapd['interface']),
                          params.get('power', 'auto')))