Prevent ONC-pushed certificates from being used with multiprofiles.

chrome/browser/chromeos/policy/policy_cert_service.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_POLICY_CERT_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_POLICY_CERT_SERVICE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 
-class PrefService;
+namespace chromeos {
+class UserManager;
+}
 
 namespace net {
 class X509Certificate;
 typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
 }
 
 namespace policy {
 
 class PolicyCertVerifier;
 
 // This service is the counterpart of PolicyCertVerifier on the UI thread. It's
 // responsible for pushing the current list of trust anchors to the CertVerifier
 // and marking the profile's prefs if any of the trust anchors was used.
 // Except for unit tests, PolicyCertVerifier should only be created through this
 // class.
 class PolicyCertService
     : public BrowserContextKeyedService,
       public UserNetworkConfigurationUpdater::WebTrustedCertsObserver {
  public:
   PolicyCertService(UserNetworkConfigurationUpdater* net_conf_updater,
-                    PrefService* user_prefs);
+                    const std::string& user_id,

[pneubeck (no reviews), 2013/12/17 15:25:31]

nit: const parameters should be first.

[Joao da Silva, 2013/12/17 16:36:41]

Done.

+                    chromeos::UserManager* user_manager);
   virtual ~PolicyCertService();
 
   // Creates an associated PolicyCertVerifier. The returned object must only be
   // used on the IO thread and must outlive this object.
   scoped_ptr<PolicyCertVerifier> CreatePolicyCertVerifier();
 
   // Returns true if the profile with |user_prefs| has used certificates

[pneubeck (no reviews), 2013/12/17 15:25:31]

not up-to-date.

[Joao da Silva, 2013/12/17 16:36:41]

Done.

   // installed via policy to establish a secure connection before. This means
   // that it may have cached content from an untrusted source.
   bool UsedPolicyCertificates() const;
 
+  // Returns true if the profile has used certificates installed via policy
+  // before, or if it currently has certificates installed via policy but
+  // hasn't used them yet.
+  bool IsTainted() const;

[pneubeck (no reviews), 2013/12/17 15:25:31]

the function name doesn't fit / hides details behind a vague name.
if there's not better name, maybe instead make a HasTrustAnchors() and move the
|| to the call-side.

[Joao da Silva, 2013/12/17 16:36:41]

Done.

+
   // UserNetworkConfigurationUpdater::WebTrustedCertsObserver:
   virtual void OnTrustAnchorsChanged(const net::CertificateList& trust_anchors)
       OVERRIDE;
 
   // BrowserContextKeyedService:
   virtual void Shutdown() OVERRIDE;
 
  private:
-  void SetUsedPolicyCertificatesOnce();
-
   PolicyCertVerifier* cert_verifier_;
   UserNetworkConfigurationUpdater* net_conf_updater_;
-  PrefService* user_prefs_;
+  std::string user_id_;
+  chromeos::UserManager* user_manager_;
+  bool has_trust_anchors_;
 
   // Weak pointers to handle callbacks from PolicyCertVerifier on the IO thread.
   // The factory and the created WeakPtrs must only be used on the UI thread.
   base::WeakPtrFactory<PolicyCertService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyCertService);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_POLICY_CERT_SERVICE_H_