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

server/site_wlan_connect.py

 #!/usr/bin/python
 
 """Connect to a WiFi service and report the amount of time it took
 
 This script initiates a connection to a WiFi service and reports
 the time to major state changes (assoc, config).  If the connection
 fails within the desired time, it outputs the contents of the log
 files during that intervening time.
 
 """
@@ skipping 139 matching lines @@
 
   connection_settings = {
       'Type': 'wifi',
       'Mode': 'managed',
       'SSID': ssid,
       'Security': security
   }
 
   if security == '802_1x':
     cert_args = psk.split(':')
-    (connection_settings['Identity'],
-     connection_settings['CertPath']) = cert_args[:2]
-    if len(cert_args) > 2:
-      connection_settings['AuthorityPath'] = cert_args[2]
+    if cert_args[0] == 'EAP-TLS':
+      (connection_settings['Identity'],
+       connection_settings['CertPath']) = cert_args[1:3]
+      if len(cert_args) > 3:
+        connection_settings['AuthorityPath'] = cert_args[3]
+    elif (cert_args[0] == 'EAP-PEAP' or
+             cert_args[0] == 'EAP-TTLS'):
+      (connection_settings['Identity'],
+       connection_settings['Passphrase']) = cert_args[1:3]
+      if len(cert_args) > 3:
+        connection_settings['AuthorityPath'] = cert_args[3]
   else:
     connection_settings['Passphrase'] = psk
 
   global logs
   global handler
   logs = OpenLogs('/var/log/messages')
 
   assoc_start = time.time()
   handler = ConnectStateHandler(bus, connection_settings, options.hidden,
                                 assoc_timeout, assoc_start, options.debug)
@@ skipping 34 matching lines @@
 
   print ('OK %3.1f %3.1f %s (assoc and config times in sec, quirks)' %
          (assoc_time, config_time, str(connect_quirks.keys())))
 
   if connect_quirks:
     DumpLogs(logs)
   sys.exit(0)
 
 if __name__ == '__main__':
   main(sys.argv)