Skip to content

Commit

Permalink
Updating traffic annotation proto and annotations.
Browse files Browse the repository at this point in the history
Three fields in traffic annotation proto are updated and all fomer annotations
required update.
In proto3, we cannot specify default value for fields. Enum fields get their
first choice by default and boolean fields get false by default. This way if
one does not specify the value for one field, we cannot distinguish it from the
case that the default value is given as input. To overcome this problem, the
semantics::destination field and policy::cookies_allowed are updated.
Also an extra field named comments is added for possible extra required
human readable comments.

Bug: 656607
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: Ib6ac74f2abafb16e18283f1b2559f866f0539eea
Reviewed-on: https://chromium-review.googlesource.com/579188
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488633}
  • Loading branch information
Ramin Halavati authored and Commit Bot committed Jul 21, 2017
1 parent d7bea54 commit 3b97978
Show file tree
Hide file tree
Showing 163 changed files with 211 additions and 198 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ bool DigitalAssetLinksHandler::CheckDigitalAssetLinkRelationship(
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting: "Not user controlled. But the verification is a trusted API"
"that doesn't use user data"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/rlz/rlz_ping_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void RlzPingHandler::Ping(
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting: "Not user controlled. But it uses a trusted web end point"
"that doesn't use user data"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/apps/drive/drive_app_converter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class DriveAppConverter::IconFetcher : public net::URLFetcherDelegate,
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting: "Unconditionally enabled on ChromeOS"
policy_exception_justification:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ void ChromeAutocompleteProviderClient::PrefetchImage(const GURL& url) {
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"You can enable or disable this feature via 'Use a prediction "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/captive_portal/captive_portal_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void CaptivePortalService::DetectCaptivePortalInternal() {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can enable/disable this feature by toggling 'Use a web "
"service to resolve network errors' in Chromium settings under "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/devtools/devtools_ui_bindings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ void DevToolsUIBindings::LoadNetworkResource(const DispatchCallback& callback,
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"It's not possible to disable this feature from settings."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/api/downloads/downloads_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ bool DownloadsDownloadFunction::RunAsync() {
destination: OTHER
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"This feature cannot be disabled in settings, but disabling all "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void WriteFromUrlOperation::Download(const base::Closure& continuation) {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"This feature cannot be disabled by settings, it can only be used "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/blacklist_state_fetcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookies store"
setting:
"Users can enable or disable this feature by toggling 'Protect you "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/install_signer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ void InstallSigner::GetSignature(const SignatureCallback& callback) {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"This feature cannot be disabled, but it is only activated if "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/webstore_data_fetcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void WebstoreDataFetcher::Start() {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"This feature cannot be disabled in settings. It will only be "
"triggered if the user uses extensions."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/webstore_install_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void WebstoreInstallHelper::Start() {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"There's no direct Chromium's setting to disable this, but you "
"could uninstall all extensions and not install (or begin the "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/webstore_installer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ void WebstoreInstaller::StartDownload(const std::string& extension_id,
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"This feature cannot be disabled. It is only activated if the user "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/intranet_redirect_detector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void IntranetRedirectDetector::FinishSleep() {
destination: OTHER
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "This feature cannot be disabled by settings."
policy_exception_justification:
"Not implemented, considered not useful."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void DeviceDescriptionFetcher::Start() {
"A device in the local network."
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"This feature cannot be disabled by settings and can only be "
"disabled by media-router flag."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/media/webrtc/webrtc_log_uploader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ void WebRtcLogUploader::UploadCompressedLog(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"This feature can be disabled by unchecking 'Report additional "
"diagnostics to help improve Hangouts.' in Hangouts settings."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/plugins/plugins_resource_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "This feature cannot be disabled in settings."
policy_exception_justification:
"Not implemented. AllowOutdatedPlugins policy silences local "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/predictors/resource_prefetcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ void ResourcePrefetcher::SendRequest(const GURL& url) {
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"Users can control this feature via the 'Use prediction service to "
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/printing/cloud_print/gcd_api_flow_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation(
destination: OTHER
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "User triggered requests cannot be disabled."
policy_exception_justification: "Not implemented, it's good to do so."
})");
Expand All @@ -68,7 +68,7 @@ net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotation(
destination: OTHER
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "User triggered requests cannot be disabled."
policy_exception_justification: "Not implemented, it's good to do so."
})");
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/cloud_print/privet_http_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ std::unique_ptr<PrivetURLFetcher> PrivetHTTPClientImpl::CreateURLFetcher(
destination: OTHER
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can enable or disable background requests by 'Show "
"notifications when new printers are detected on the network' in "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ BrandcodeConfigFetcher::BrandcodeConfigFetcher(const FetchCallback& callback,
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"This feature cannot be disabled and is only invoked by user "
"request."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profile_resetter/reset_report_uploader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void ResetReportUploader::DispatchReport(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "None, the user needs to actively send the data."
policy_exception_justification:
"None, considered not useful because the user needs to actively "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profiles/profile_avatar_downloader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ProfileAvatarDownloader::ProfileAvatarDownloader(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
policy_exception_justification:
"No content is being uploaded or saved; this request merely "
"downloads a publicly available PNG file."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profiles/profile_downloader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void ProfileDownloader::FetchImageData() {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "This feature cannot be disabled by settings."
policy_exception_justification:
"Not implemented, considered not useful as no content is being "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profiles/profile_io_data.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ void ProfileIOData::Init(
destination: OTHER
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "This feature cannot be disabled by settings."
policy_exception_justification:
"Not implemented, this is a feature that websites can opt into and "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2223,7 +2223,7 @@ void RenderViewContextMenu::ExecSaveLinkAs() {
destination: WEBSITE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "user"
setting:
"This feature cannot be disabled by settings. The request is made "
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/safe_browsing/client_side_detection_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe browsing cookie store"
setting:
"Users can enable or disable this feature by toggling 'Protect "
Expand Down Expand Up @@ -387,7 +387,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe browsing cookie store"
setting:
"Users can enable or disable this feature by toggling 'Protect "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/safe_browsing/client_side_model_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void ModelLoader::StartFetch() {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can enable or disable this feature by toggling 'Protect "
"you and your device from dangerous sites' in Chromium settings "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/safe_browsing/download_feedback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void DownloadFeedbackImpl::Start(const base::Closure& finish_callback) {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing Cookie Store"
setting:
"Users can enable or disable this feature by stopping sending "
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/safe_browsing/download_protection_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookies store"
setting:
"Users can enable or disable the entire Safe Browsing service in "
Expand Down Expand Up @@ -1538,7 +1538,7 @@ class DownloadProtectionService::PPAPIDownloadRequest
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookies store"
setting:
"Users can enable or disable the entire Safe Browsing service in "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookie store"
setting:
"Users can control this feature via the 'Automatically report details "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can control this feature via the 'Automatically report "
"details of possible security incidents to Google' setting under "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/safe_browsing/permission_reporter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can control this feature via either of the 'Protect you and "
"your device from dangerous sites' setting under 'Privacy', or "
Expand Down
6 changes: 3 additions & 3 deletions chrome/browser/safe_browsing/protocol_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ constexpr net::NetworkTrafficAnnotationTag
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookie store"
setting:
"Users can disable Safe Browsing by unchecking 'Protect you and "
Expand Down Expand Up @@ -270,7 +270,7 @@ void SafeBrowsingProtocolManager::GetFullHash(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookie store"
setting:
"Users can disable Safe Browsing by unchecking 'Protect you and "
Expand Down Expand Up @@ -668,7 +668,7 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: true
cookies_allowed: YES
cookies_store: "Safe Browsing cookie store"
setting:
"Users can disable Safe Browsing by unchecking 'Protect you and "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ void OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GotAccessToken(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can control this feature via selecting a non-Google default "
"search engine in Chrome settings under 'Search Engine'."
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/search/thumbnail_source.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void ThumbnailSource::StartDataRequest(
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can disable this feature by signing out of Chrome, or "
"disabling Sync or History Sync in Chrome settings under 'Advanced "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) {
destination: GOOGLE_OWNED_SERVICE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"You can prevent downloading dictionaries by not selecting 'Use "
"this language for spell checking.' in Chrome's settings under "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ssl/chrome_expect_ct_reporter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
destination: OTHER
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting: "This feature cannot be disabled by settings."
policy_exception_justification:
"Not implemented, this is a feature that websites can opt into and "
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ssl/common_name_mismatch_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void CommonNameMismatchHandler::CheckSuggestedUrl(
destination: WEBSITE
}
policy {
cookies_allowed: false
cookies_allowed: NO
setting:
"Users can disable this feature by command line flag "
"'--disable-feature=SSLCommonNameMismatchHandling'."
Expand Down
Loading

0 comments on commit 3b97978

Please sign in to comment.