Add Constellation/STAR encryption for P3A

.gitignore

@@ -18,6 +18,7 @@ patches/**/*.patchinfo
 /third_party/argon2/src
 /third_party/ethash/src
 /third_party/bitcoin-core/src
+/third_party/constellation/crate
 /third_party/playlist_component/src
 /third_party/rapidjson/src
 /third_party/rust/cxx

DEPS

@@ -41,6 +41,7 @@ deps = {
       'dep_type': 'cipd',
   },
   "third_party/playlist_component/src": "https://github.com/brave/playlist-component.git@5434730bf7342f1ba5c057f1640882bb38604a85",
+  "third_party/constellation/crate": "https://github.com/brave/constellation.git@b6b8396abd98cc87a187e051c32a291c9faa43f7",
 }
 
 recursedeps = [

browser/brave_browser_main_extra_parts.cc

@@ -8,8 +8,8 @@
 #include "base/metrics/histogram_macros.h"
 #include "brave/browser/brave_browser_process_impl.h"
 #include "brave/components/brave_shields/browser/brave_shields_p3a.h"
-#include "brave/components/p3a/brave_p3a_service.h"
 #include "brave/components/p3a/buildflags.h"
+#include "brave/components/p3a/p3a_service.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -72,11 +72,11 @@ void BraveBrowserMainExtraParts::PostBrowserStart() {
 
 void BraveBrowserMainExtraParts::PreMainMessageLoopRun() {
   // Disabled on mobile platforms, see for instance issues/6176
-#if BUILDFLAG(BRAVE_P3A_ENABLED)
-  // TODO(iefremov): Maybe find a better place for this initialization.
-  g_brave_browser_process->brave_p3a_service()->Init(
-      g_browser_process->shared_url_loader_factory());
-#endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
+  if (g_brave_browser_process->p3a_service() != nullptr) {
+    // TODO(iefremov): Maybe find a better place for this initialization.
+    g_brave_browser_process->p3a_service()->Init(
+        g_browser_process->shared_url_loader_factory());
+  }
 
   RecordInitialP3AValues();
 

browser/brave_browser_process.h

@@ -21,7 +21,6 @@
 
 namespace brave {
 class BraveReferralsService;
-class BraveP3AService;
 class BraveFarblingService;
 class URLSanitizerComponentInstaller;
 }  // namespace brave
@@ -67,6 +66,10 @@ namespace ntp_background_images {
 class NTPBackgroundImagesService;
 }  // namespace ntp_background_images
 
+namespace p3a {
+class P3AService;
+}  // namespace p3a
+
 namespace tor {
 class BraveTorClientUpdater;
 class BraveTorPluggableTransportUpdater;
@@ -112,7 +115,7 @@ class BraveBrowserProcess {
 #if BUILDFLAG(ENABLE_IPFS)
   virtual ipfs::BraveIpfsClientUpdater* ipfs_client_updater() = 0;
 #endif
-  virtual brave::BraveP3AService* brave_p3a_service() = 0;
+  virtual p3a::P3AService* p3a_service() = 0;
   virtual brave::BraveReferralsService* brave_referrals_service() = 0;
   virtual brave_stats::BraveStatsUpdater* brave_stats_updater() = 0;
   virtual brave_ads::BraveStatsHelper* ads_brave_stats_helper() = 0;

browser/brave_browser_process_impl.cc

@@ -38,9 +38,10 @@
 #include "brave/components/https_upgrade_exceptions/browser/https_upgrade_exceptions_service.h"
 #include "brave/components/misc_metrics/menu_metrics.h"
 #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h"
-#include "brave/components/p3a/brave_p3a_service.h"
 #include "brave/components/p3a/buildflags.h"
 #include "brave/components/p3a/histograms_braveizer.h"
+#include "brave/components/p3a/p3a_config.h"
+#include "brave/components/p3a/p3a_service.h"
 #include "brave/services/network/public/cpp/system_request_handler.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"
@@ -119,11 +120,11 @@ BraveBrowserProcessImpl::BraveBrowserProcessImpl(StartupData* startup_data)
   brave_referrals_service();
 
   // Disabled on mobile platforms, see for instance issues/6176
-#if BUILDFLAG(BRAVE_P3A_ENABLED)
   // Create P3A Service early to catch more histograms. The full initialization
   // should be started once browser process impl is ready.
-  brave_p3a_service();
-  histogram_braveizer_ = brave::HistogramsBraveizer::Create();
+  p3a_service();
+#if BUILDFLAG(BRAVE_P3A_ENABLED)
+  histogram_braveizer_ = p3a::HistogramsBraveizer::Create();
 #endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
 
   // initialize ads stats helper
@@ -361,15 +362,20 @@ void BraveBrowserProcessImpl::OnTorEnabledChanged() {
 }
 #endif
 
-brave::BraveP3AService* BraveBrowserProcessImpl::brave_p3a_service() {
-  if (brave_p3a_service_) {
-    return brave_p3a_service_.get();
+p3a::P3AService* BraveBrowserProcessImpl::p3a_service() {
+#if BUILDFLAG(BRAVE_P3A_ENABLED)
+  if (p3a_service_) {
+    return p3a_service_.get();
   }
-  brave_p3a_service_ = base::MakeRefCounted<brave::BraveP3AService>(
+  p3a_service_ = base::MakeRefCounted<p3a::P3AService>(
       local_state(), brave::GetChannelName(),
-      local_state()->GetString(kWeekOfInstallation));
-  brave_p3a_service()->InitCallbacks();
-  return brave_p3a_service_.get();
+      local_state()->GetString(kWeekOfInstallation),
+      p3a::P3AConfig::LoadFromCommandLine());
+  p3a_service()->InitCallbacks();
+  return p3a_service_.get();
+#else
+  return nullptr;
+#endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
 }
 
 brave::BraveReferralsService*

browser/brave_browser_process_impl.h

@@ -24,8 +24,6 @@
 
 namespace brave {
 class BraveReferralsService;
-class BraveP3AService;
-class HistogramsBraveizer;
 class BraveFarblingService;
 }  // namespace brave
 
@@ -64,6 +62,11 @@ namespace ntp_background_images {
 class NTPBackgroundImagesService;
 }  // namespace ntp_background_images
 
+namespace p3a {
+class HistogramsBraveizer;
+class P3AService;
+}  // namespace p3a
+
 namespace tor {
 class BraveTorClientUpdater;
 class BraveTorPluggableTransportUpdater;
@@ -118,7 +121,7 @@ class BraveBrowserProcessImpl : public BraveBrowserProcess,
 #if BUILDFLAG(ENABLE_IPFS)
   ipfs::BraveIpfsClientUpdater* ipfs_client_updater() override;
 #endif
-  brave::BraveP3AService* brave_p3a_service() override;
+  p3a::P3AService* p3a_service() override;
   brave::BraveReferralsService* brave_referrals_service() override;
   brave_stats::BraveStatsUpdater* brave_stats_updater() override;
   brave_ads::BraveStatsHelper* ads_brave_stats_helper() override;
@@ -187,8 +190,8 @@ class BraveBrowserProcessImpl : public BraveBrowserProcess,
 #if BUILDFLAG(ENABLE_IPFS)
   std::unique_ptr<ipfs::BraveIpfsClientUpdater> ipfs_client_updater_;
 #endif
-  scoped_refptr<brave::BraveP3AService> brave_p3a_service_;
-  scoped_refptr<brave::HistogramsBraveizer> histogram_braveizer_;
+  scoped_refptr<p3a::P3AService> p3a_service_;
+  scoped_refptr<p3a::HistogramsBraveizer> histogram_braveizer_;
   std::unique_ptr<ntp_background_images::NTPBackgroundImagesService>
       ntp_background_images_service_;
   std::unique_ptr<brave_ads::ResourceComponent> resource_component_;

browser/brave_local_state_prefs.cc

@@ -28,8 +28,7 @@
 #include "brave/components/misc_metrics/page_metrics_service.h"
 #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h"
 #include "brave/components/ntp_background_images/browser/view_counter_service.h"
-#include "brave/components/p3a/brave_p3a_service.h"
-#include "brave/components/p3a/buildflags.h"
+#include "brave/components/p3a/p3a_service.h"
 #include "brave/components/skus/browser/skus_utils.h"
 #include "brave/components/tor/buildflags/buildflags.h"
 #include "build/build_config.h"
@@ -90,18 +89,15 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
       metrics::prefs::kMetricsReportingEnabled,
       base::Value(GetDefaultPrefValueForMetricsReporting()));
 
-#if BUILDFLAG(BRAVE_P3A_ENABLED)
-  brave::BraveP3AService::RegisterPrefs(registry,
+  p3a::P3AService::RegisterPrefs(registry,
 #if !BUILDFLAG(IS_ANDROID)
-                                        first_run::IsChromeFirstRun());
+                                 first_run::IsChromeFirstRun());
 #else
-                                        // BraveP3AService::RegisterPrefs
-                                        // doesn't use this arg on Android
-                                        false);
+                                 // BraveP3AService::RegisterPrefs
+                                 // doesn't use this arg on Android
+                                 false);
 #endif  // !BUILDFLAG(IS_ANDROID)
 
-#endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
-
   brave_shields::RegisterShieldsP3ALocalPrefs(registry);
 #if !BUILDFLAG(IS_ANDROID)
   BraveNewTabMessageHandler::RegisterLocalStatePrefs(registry);

browser/infobars/brave_confirm_p3a_infobar_delegate.cc

@@ -29,9 +29,9 @@ void BraveConfirmP3AInfoBarDelegate::Create(
   // - P3A is disabled
   // - notice has already been acknowledged
   if (local_state) {
-    if (!local_state->GetBoolean(brave::kP3AEnabled) ||
-        local_state->GetBoolean(brave::kP3ANoticeAcknowledged)) {
-      local_state->SetBoolean(brave::kP3ANoticeAcknowledged, true);
+    if (!local_state->GetBoolean(p3a::kP3AEnabled) ||
+        local_state->GetBoolean(p3a::kP3ANoticeAcknowledged)) {
+      local_state->SetBoolean(p3a::kP3ANoticeAcknowledged, true);
       return;
     }
   }
@@ -64,7 +64,7 @@ bool BraveConfirmP3AInfoBarDelegate::ShouldExpire(
 void BraveConfirmP3AInfoBarDelegate::InfoBarDismissed() {
   // Mark notice as acknowledged when infobar is dismissed
   if (local_state_) {
-    local_state_->SetBoolean(brave::kP3ANoticeAcknowledged, true);
+    local_state_->SetBoolean(p3a::kP3ANoticeAcknowledged, true);
   }
 }
 
@@ -98,7 +98,7 @@ GURL BraveConfirmP3AInfoBarDelegate::GetLinkURL() const {
 bool BraveConfirmP3AInfoBarDelegate::Accept() {
   // Mark notice as acknowledged when infobar is dismissed
   if (local_state_) {
-    local_state_->SetBoolean(brave::kP3ANoticeAcknowledged, true);
+    local_state_->SetBoolean(p3a::kP3ANoticeAcknowledged, true);
   }
   return true;
 }
@@ -107,7 +107,7 @@ bool BraveConfirmP3AInfoBarDelegate::Cancel() {
   // OK button is "Disable"
   // Clicking should disable P3A
   if (local_state_) {
-    local_state_->SetBoolean(brave::kP3AEnabled, false);
+    local_state_->SetBoolean(p3a::kP3AEnabled, false);
   }
   return true;
 }

browser/ntp_background/ntp_p3a_helper_impl.cc

@@ -16,8 +16,8 @@
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
-#include "brave/components/p3a/brave_p3a_service.h"
 #include "brave/components/p3a/metric_log_type.h"
+#include "brave/components/p3a/p3a_service.h"
 #include "brave/components/p3a_utils/bucket.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ -50,16 +50,16 @@ constexpr base::TimeDelta kLandingTime = base::Seconds(10);
 }  // namespace
 
 NTPP3AHelperImpl::NTPP3AHelperImpl(PrefService* local_state,
-                                   brave::BraveP3AService* p3a_service,
+                                   p3a::P3AService* p3a_service,
                                    brave_ads::AdsService* ads_service)
     : local_state_(local_state),
       p3a_service_(p3a_service),
       ads_service_(ads_service) {
   DCHECK(local_state);
   DCHECK(p3a_service);
   metric_sent_subscription_ =
-      p3a_service->RegisterMetricSentCallback(base::BindRepeating(
-          &NTPP3AHelperImpl::OnP3AMetricSent, base::Unretained(this)));
+      p3a_service->RegisterMetricCycledCallback(base::BindRepeating(
+          &NTPP3AHelperImpl::OnP3AMetricCycled, base::Unretained(this)));
   rotation_subscription_ =
       p3a_service->RegisterRotationCallback(base::BindRepeating(
           &NTPP3AHelperImpl::OnP3ARotation, base::Unretained(this)));
@@ -94,8 +94,9 @@ void NTPP3AHelperImpl::SetLastTabURL(const GURL& url) {
   last_tab_hostname_ = url.host();
 }
 
-void NTPP3AHelperImpl::OnP3ARotation(brave::MetricLogType log_type) {
-  if (log_type != brave::MetricLogType::kExpress) {
+void NTPP3AHelperImpl::OnP3ARotation(p3a::MetricLogType log_type,
+                                     bool is_star) {
+  if (log_type != p3a::MetricLogType::kExpress || is_star) {
     return;
   }
   ScopedDictPrefUpdate update(local_state_, kNewTabPageEventCountDictPref);
@@ -134,16 +135,22 @@ void NTPP3AHelperImpl::OnP3ARotation(brave::MetricLogType log_type) {
   if ((ads_service_ != nullptr && !ads_service_->IsEnabled()) ||
       total_active_creatives > 0) {
     p3a_service_->RegisterDynamicMetric(creative_total_histogram_name,
-                                        brave::MetricLogType::kExpress);
+                                        p3a::MetricLogType::kExpress);
     p3a_utils::RecordToHistogramBucket(creative_total_histogram_name.c_str(),
                                        kCountBuckets, total_active_creatives);
   } else {
     p3a_service_->RemoveDynamicMetric(creative_total_histogram_name);
   }
 }
 
-void NTPP3AHelperImpl::OnP3AMetricSent(const std::string& histogram_name) {
-  if (!base::StartsWith(histogram_name, brave::kCreativeMetricPrefix)) {
+void NTPP3AHelperImpl::OnP3AMetricCycled(const std::string& histogram_name,
+                                         bool is_star) {
+  if (is_star) {
+    // TODO(djandries): Monitor both STAR and JSON metric cycles once STAR is
+    // supported for express metrics
+    return;
+  }
+  if (!base::StartsWith(histogram_name, p3a::kCreativeMetricPrefix)) {
     return;
   }
 
@@ -195,7 +202,7 @@ std::string NTPP3AHelperImpl::BuildHistogramName(
     const std::string& creative_instance_id,
     const std::string& event_type) {
   return base::StrCat(
-      {brave::kCreativeMetricPrefix, creative_instance_id, ".", event_type});
+      {p3a::kCreativeMetricPrefix, creative_instance_id, ".", event_type});
 }
 
 void NTPP3AHelperImpl::UpdateMetricCount(
@@ -205,7 +212,7 @@ void NTPP3AHelperImpl::UpdateMetricCount(
       BuildHistogramName(creative_instance_id, event_type);
 
   p3a_service_->RegisterDynamicMetric(histogram_name,
-                                      brave::MetricLogType::kExpress);
+                                      p3a::MetricLogType::kExpress);
 
   ScopedDictPrefUpdate update(local_state_, kNewTabPageEventCountDictPref);
   base::Value::Dict& update_dict = update.Get();

browser/ntp_background/ntp_p3a_helper_impl.h

@@ -17,10 +17,10 @@
 class PrefRegistrySimple;
 class PrefService;
 
-namespace brave {
-class BraveP3AService;
+namespace p3a {
+class P3AService;
 enum class MetricLogType;
-}  // namespace brave
+}  // namespace p3a
 
 namespace brave_ads {
 class AdsService;
@@ -31,7 +31,7 @@ namespace ntp_background_images {
 class NTPP3AHelperImpl : public NTPP3AHelper {
  public:
   NTPP3AHelperImpl(PrefService* local_state,
-                   brave::BraveP3AService* p3a_service,
+                   p3a::P3AService* p3a_service,
                    brave_ads::AdsService* ads_service);
   ~NTPP3AHelperImpl() override;
 
@@ -44,9 +44,11 @@ class NTPP3AHelperImpl : public NTPP3AHelper {
 
   void SetLastTabURL(const GURL& url) override;
 
-  void OnP3ARotation(brave::MetricLogType log_type);
-
-  void OnP3AMetricSent(const std::string& histogram_name);
+  // See BraveP3AService::RegisterDynamicMetric and
+  // BraveP3AService::RegisterMetricCycledCallback header comments for more
+  // info.
+  void OnP3ARotation(p3a::MetricLogType log_type, bool is_star);
+  void OnP3AMetricCycled(const std::string& histogram_name, bool is_star);
 
  private:
   std::string BuildHistogramName(const std::string& creative_instance_id,
@@ -61,7 +63,7 @@ class NTPP3AHelperImpl : public NTPP3AHelper {
                          const std::string& expected_hostname);
 
   raw_ptr<PrefService> local_state_;
-  raw_ptr<brave::BraveP3AService> p3a_service_;
+  raw_ptr<p3a::P3AService> p3a_service_;
   raw_ptr<const brave_ads::AdsService> ads_service_;
 
   absl::optional<std::string> last_tab_hostname_;