Only import certificates with Web trust from ONC if the user is managed and matches the enterprise …

chrome/browser/chromeos/cros/onc_network_parser.cc

 // 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.
 
 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
 
 #include <keyhi.h>
 #include <pk11pub.h>
 
 #include "base/base64.h"
@@ skipping 264 matching lines @@
 
 }  // namespace
 
 // -------------------- OncNetworkParser --------------------
 
 OncNetworkParser::OncNetworkParser(const std::string& onc_blob,
                                    const std::string& passphrase,
                                    NetworkUIData::ONCSource onc_source)
     : NetworkParser(get_onc_mapper()),
       onc_source_(onc_source),
+      allow_web_trust_from_policy_(false),
       network_configs_(NULL),
       certificates_(NULL) {
   VLOG(2) << __func__ << ": OncNetworkParser called on " << onc_blob;
   JSONStringValueSerializer deserializer(onc_blob);
   deserializer.set_allow_trailing_comma(true);
   scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, &parse_error_));
 
   if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
     LOG(WARNING) << "OncNetworkParser received bad ONC file: " << parse_error_;
   } else {
@@ skipping 27 matching lines @@
 }
 
 OncNetworkParser::~OncNetworkParser() {
 }
 
 // static
 const EnumMapper<PropertyIndex>* OncNetworkParser::property_mapper() {
   return get_onc_mapper();
 }
 
+void OncNetworkParser::AllowWebTrustFromPolicy() {

[Mattias Nissler (ping if slow), 2012/08/28 11:57:56]

Make this a regular setter? When I read the declaration, I wasn't sure what it
would do, just setting a flag or actually attempting to set the web trust?

[Joao da Silva, 2012/09/03 15:24:32]

Turned into a setter.

+  allow_web_trust_from_policy_ = true;
+}
+
 base::DictionaryValue* OncNetworkParser::Decrypt(
     const std::string& passphrase,
     base::DictionaryValue* root) {
   const int kKeySizeInBits = 256;
   const int kMaxIterationCount = 500000;
   std::string onc_type;
   std::string initial_vector;
   std::string salt;
   std::string cipher;
   std::string stretch_method;
@@ skipping 501 matching lines @@
         LOG(WARNING) << "ONC File: certificate contains unknown "
                      << "trust type: " << trust_type
                      << " at index " << cert_index;
         parse_error_ = l10n_util::GetStringUTF8(
             IDS_NETWORK_CONFIG_ERROR_CERT_TRUST_UNKNOWN);
         return NULL;
       }
     }
   }
 
+  if (web_trust &&
+      (onc_source_ == NetworkUIData::ONC_SOURCE_DEVICE_POLICY ||
+       onc_source_ == NetworkUIData::ONC_SOURCE_USER_POLICY) &&
+      !allow_web_trust_from_policy_) {
+    LOG(WARNING) << "Web trust not granted";
+    parse_error_ = l10n_util::GetStringUTF8(
+        IDS_NETWORK_CONFIG_ERROR_WEB_TRUST_NOT_ALLOWED);
+    return NULL;

[Mattias Nissler (ping if slow), 2012/08/28 11:57:56]

I don't think this is a good idea, as it'll abort the certificate import process
(correct me if I'm wrong). That means that you'll essentially break ONC
configuration that specifies this on non-enrolled (and foreign) devices. I guess
the only chance we have here is to not set the web trust bit and silently bail
out.

[Joao da Silva, 2012/09/03 15:24:32]

You're right, thanks! This is now dropping the web trust bit only.

+  }
+
   std::string x509_data;
   if (!certificate->GetString("X509", &x509_data) || x509_data.empty()) {
     LOG(WARNING) << "ONC File: certificate missing appropriate "
                  << "certificate data for type: " << cert_type
                  << " at index " << cert_index;
     parse_error_ = l10n_util::GetStringUTF8(
         IDS_NETWORK_CONFIG_ERROR_CERT_DATA_MISSING);
     return NULL;
   }
 
@@ skipping 1148 matching lines @@
     // on the value of AuthenticationType.
     { "L2TP-IPsec", PROVIDER_TYPE_L2TP_IPSEC_PSK },
     { "OpenVPN", PROVIDER_TYPE_OPEN_VPN },
   };
   CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,
       (table, arraysize(table), PROVIDER_TYPE_MAX));
   return parser.Get(type);
 }
 
 }  // namespace chromeos