Add ONC VPN support for OpenVPN and L2TP/IPsec VPNs

chrome/browser/chromeos/cros/network_library.h

Index: chrome/browser/chromeos/cros/network_library.h
===================================================================
--- chrome/browser/chromeos/cros/network_library.h	(revision 112277)
+++ chrome/browser/chromeos/cros/network_library.h	(working copy)
@@ -90,6 +90,8 @@
   PROPERTY_INDEX_IDENTITY,
   PROPERTY_INDEX_IMEI,
   PROPERTY_INDEX_IMSI,
+  PROPERTY_INDEX_IPSEC_AUTHENTICATIONTYPE,
+  PROPERTY_INDEX_IPSEC_IKEVERSION,
   PROPERTY_INDEX_IS_ACTIVE,
   PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS,
   PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_ID,
@@ -109,6 +111,42 @@
   PROPERTY_INDEX_NETWORKS,
   PROPERTY_INDEX_NETWORK_TECHNOLOGY,
   PROPERTY_INDEX_OFFLINE_MODE,
+  PROPERTY_INDEX_OLP,
+  PROPERTY_INDEX_ONC_IPSEC,
+  PROPERTY_INDEX_ONC_L2TP,  // Used internally for ONC parsing
+  PROPERTY_INDEX_ONC_OPENVPN,  // Used internally for ONC parsing
+  PROPERTY_INDEX_ONC_REMOVE,  // Used internally for ONC parsing
+  PROPERTY_INDEX_ONC_WIFI,  // Used internally for ONC parsing
+  PROPERTY_INDEX_ONC_VPN,  // Used internally for ONC parsing

[Mattias Nissler (ping if slow), 2011/12/01 13:09:10]

I'm not sold on the idea to have these here. Can we somehow forward the data in
the ONC parser internally?

[kmixter1, 2011/12/01 19:48:41]

As we discussed off-thread, the only alternative without a more large rewrite
would be to define a region of PropertyIndex which is local to individual
parsers and then define these values in the onc_network_parser.h.  I'm open to
that, but you suggested that was hacky, so leaving as is for now.

+  PROPERTY_INDEX_OPEN_VPN_AUTH,
+  PROPERTY_INDEX_OPEN_VPN_AUTHRETRY,
+  PROPERTY_INDEX_OPEN_VPN_AUTHNOCACHE,
+  PROPERTY_INDEX_OPEN_VPN_CACERT,
+  PROPERTY_INDEX_OPEN_VPN_CERT,
+  PROPERTY_INDEX_OPEN_VPN_CIPHER,
+  PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID,
+  PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_SLOT,
+  PROPERTY_INDEX_OPEN_VPN_COMPLZO,
+  PROPERTY_INDEX_OPEN_VPN_COMPNOADAPT,
+  PROPERTY_INDEX_OPEN_VPN_KEYDIRECTION,
+  PROPERTY_INDEX_OPEN_VPN_NSCERTTYPE,
+  PROPERTY_INDEX_OPEN_VPN_OTP,
+  PROPERTY_INDEX_OPEN_VPN_PASSWORD,
+  PROPERTY_INDEX_OPEN_VPN_PIN,
+  PROPERTY_INDEX_OPEN_VPN_PORT,
+  PROPERTY_INDEX_OPEN_VPN_PROTO,
+  PROPERTY_INDEX_OPEN_VPN_PKCS11_PROVIDER,
+  PROPERTY_INDEX_OPEN_VPN_PUSHPEERINFO,
+  PROPERTY_INDEX_OPEN_VPN_REMOTECERTEKU,
+  PROPERTY_INDEX_OPEN_VPN_REMOTECERTKU,
+  PROPERTY_INDEX_OPEN_VPN_REMOTECERTTLS,
+  PROPERTY_INDEX_OPEN_VPN_RENEGSEC,
+  PROPERTY_INDEX_OPEN_VPN_SERVERPOLLTIMEOUT,
+  PROPERTY_INDEX_OPEN_VPN_SHAPER,
+  PROPERTY_INDEX_OPEN_VPN_STATICCHALLENGE,
+  PROPERTY_INDEX_OPEN_VPN_TLSAUTHCONTENTS,
+  PROPERTY_INDEX_OPEN_VPN_TLSREMOTE,
+  PROPERTY_INDEX_OPEN_VPN_USER,
   PROPERTY_INDEX_OPERATOR_CODE,
   PROPERTY_INDEX_OPERATOR_NAME,
   PROPERTY_INDEX_PASSPHRASE,
@@ -116,12 +154,12 @@
   PROPERTY_INDEX_PORTAL_URL,
   PROPERTY_INDEX_POWERED,
   PROPERTY_INDEX_PRIORITY,
+  PROPERTY_INDEX_PROVIDER_TYPE,
   PROPERTY_INDEX_PRL_VERSION,
   PROPERTY_INDEX_PROFILE,
   PROPERTY_INDEX_PROFILES,
   PROPERTY_INDEX_PROVIDER,
   PROPERTY_INDEX_PROXY_CONFIG,
-  PROPERTY_INDEX_REMOVE,
   PROPERTY_INDEX_ROAMING_STATE,
   PROPERTY_INDEX_SAVE_CREDENTIALS,
   PROPERTY_INDEX_SCANNING,
@@ -140,15 +178,11 @@
   PROPERTY_INDEX_UI_DATA,
   PROPERTY_INDEX_UNKNOWN,
   PROPERTY_INDEX_USAGE_URL,
-  PROPERTY_INDEX_OLP,
-  PROPERTY_INDEX_OPEN_VPN_USER,
-  PROPERTY_INDEX_OPEN_VPN_PASSWORD,
-  PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID,
   PROPERTY_INDEX_WIFI_AUTH_MODE,
   PROPERTY_INDEX_WIFI_FREQUENCY,
   PROPERTY_INDEX_WIFI_HEX_SSID,
   PROPERTY_INDEX_WIFI_HIDDEN_SSID,
-  PROPERTY_INDEX_WIFI_PHY_MODE,
+  PROPERTY_INDEX_WIFI_PHY_MODE
 };
 
 // Connection enums (see flimflam/include/service.h)