PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
create-pull-request/patch-cdf415c
cromite/build/patches/Chrome-web-store-protection.patch
T
Carmelo Messina 0bf212cf9b Patches for v148
2026-05-19 10:48:25 +02:00

1208 lines
57 KiB
Diff
Raw Permalink Blame History

From: uazo <uazo@users.noreply.github.com>
Date: Thu, 28 Dec 2023 14:58:09 +0000
Subject: Chrome web store protection
The amount of information sent is minimized without disabling
the ability to install extensions (which is under user control)
It became possible to activate the autoupdate of extensions by sending the minimum of values.
Installation with the chrome web store is allowed, but the website
by default cannot retrieve the list of installed extensions and their status (under flag)
All http calls related to requesting and downloading updates are cookie-free,
but the ip and the list of extensions are traceable, that information cannot be omitted.
Auto-update is disabled by default: it is possible to activate it with chrome://extensions/
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
chrome/app/extensions_strings.grdp | 6 ++
.../developer_private_api.cc | 28 +++++++++
.../developer_private/developer_private_api.h | 3 +
.../developer_private_functions.cc | 8 ++-
.../profile_info_generator.cc | 3 +
.../webstore_private/webstore_private_api.cc | 14 ++++-
.../extensions/chrome_extension_system.cc | 1 +
.../extensions/cws_info_service_factory.cc | 3 +-
.../extensions/extension_management.cc | 1 +
.../extension_safety_check_utils.cc | 3 +-
.../browser/extensions/extension_service.cc | 5 +-
.../chrome_extension_downloader_factory.cc | 1 -
.../extensions/updater/extension_updater.cc | 26 ++++++--
.../extensions/updater/extension_updater.h | 4 ++
.../extensions/webstore_install_helper.cc | 2 +-
.../resources/extensions/manager.html.ts | 1 +
.../browser/resources/extensions/manager.ts | 5 ++
.../browser/resources/extensions/service.ts | 5 ++
.../browser/resources/extensions/toolbar.css | 5 ++
.../resources/extensions/toolbar.html.ts | 7 +++
.../browser/resources/extensions/toolbar.ts | 17 +++++
.../resources/webstore_app/manifest.json | 7 +--
.../ui/webui/extensions/extensions_ui.cc | 7 +++
.../chrome_update_query_params_delegate.cc | 13 ++--
.../extensions/api/developer_private.webidl | 2 +
.../update_client/update_query_params.cc | 5 +-
.../about_flags_cc/Webstore-protection.inc | 19 ++++++
.../browser/api/management/management_api.cc | 62 +++++++++++++------
.../browser/updater/extension_downloader.cc | 53 ++++++----------
.../browser/updater/extension_downloader.h | 1 -
.../browser/updater/manifest_fetch_data.cc | 8 +--
.../browser/updater/safe_manifest_parser.cc | 1 +
extensions/browser/webstore_installer.cc | 2 +-
extensions/common/extension_features.cc | 7 +++
extensions/common/extension_features.h | 10 +++
.../definitions/developer_private.d.ts | 2 +
36 files changed, 250 insertions(+), 97 deletions(-)
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
--- a/chrome/app/extensions_strings.grdp
+++ b/chrome/app/extensions_strings.grdp
@@ -79,6 +79,12 @@
<message name="IDS_EXTENSIONS_DISABLED_UNSUPPORTED_DEVELOPER_MODE_TOAST" desc="Text displayed in a toast popup message when extensions are disabled due to unsupported developer mode.">
Developer Mode Off. Some extensions were disabled.
</message>
+ <message name="IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED" desc="The text displayed next to the checkbox to toggle extension auto update.">
+ Enable Auto-Update
+ </message>
+ <message name="IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED_NR" desc="The text displayed next to the checkbox to toggle extension auto update.">
+ Need restart
+ </message>
<message name="IDS_EXTENSIONS_DISABLED_UPDATE_REQUIRED_BY_POLICY" desc="Text shown in the extensions settings for extensions disabled due to minimum version requirement from enterprise policy">
This extension is outdated and disabled by enterprise policy. It might become enabled automatically when a newer version is available.
</message>
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -28,6 +28,12 @@
static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
+#include "chrome/browser/about_flags.h"
+#include "chrome/browser/browser_process.h"
+#include "components/webui/flags/pref_service_flags_storage.h"
+#include "components/webui/flags/feature_entry.h"
+#include "components/webui/flags/flags_storage.h"
+
namespace extensions {
namespace developer = api::developer_private;
@@ -70,6 +76,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
return g_developer_private_api_factory.Pointer();
}
+// static
+bool DeveloperPrivateAPI::IsExtensionAutoupdateEnabled() {
+ const std::string enabled_entry = "enable-extension-autoupdate@1";
+ flags_ui::PrefServiceFlagsStorage flags_storage(
+ g_browser_process->local_state());
+ std::set<std::string> entries = flags_storage.GetFlags();
+ return entries.count(enabled_entry) > 0;
+}
+
+// static
+void DeveloperPrivateAPI::SetExtensionAutoupdateEnabled(bool enable) {
+ flags_ui::PrefServiceFlagsStorage flags_storage(
+ g_browser_process->local_state());
+ if (enable) {
+ about_flags::SetFeatureEntryEnabled(
+ &flags_storage, "enable-extension-autoupdate@1", true);
+ } else {
+ about_flags::SetFeatureEntryEnabled(
+ &flags_storage, "enable-extension-autoupdate", false);
+ }
+}
+
template <>
void BrowserContextKeyedAPIFactory<
DeveloperPrivateAPI>::DeclareFactoryDependencies() {
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
@@ -37,6 +37,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
static BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>*
GetFactoryInstance();
+ static bool IsExtensionAutoupdateEnabled();
+ static void SetExtensionAutoupdateEnabled(bool enable);
+
// Convenience method to get the DeveloperPrivateAPI for a profile.
static DeveloperPrivateAPI* Get(content::BrowserContext* context);
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions.cc
--- a/chrome/browser/extensions/api/developer_private/developer_private_functions.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_functions.cc
@@ -451,6 +451,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
ExtensionUpdater::CheckParams params;
params.fetch_priority = DownloadFetchPriority::kForeground;
params.install_immediately = true;
+ params.user_initiated = true;
params.callback =
base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
updater->CheckNow(std::move(params));
@@ -587,7 +588,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
const developer::ProfileConfigurationUpdate& update = params->update;
- if (update.in_developer_mode) {
+ if (update.in_developer_mode.has_value() && update.in_developer_mode) {
Profile* profile = Profile::FromBrowserContext(browser_context());
CHECK(profile);
if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
@@ -601,6 +602,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
->MarkNoticeAsAcknowledgedGlobally();
}
+ if (update.is_extension_autoupdate_enabled.has_value()) {
+ DeveloperPrivateAPI::SetExtensionAutoupdateEnabled(
+ *update.is_extension_autoupdate_enabled);
+ }
+
return RespondNow(NoArguments());
}
diff --git a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
--- a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/supervised_user/supervised_user_browser_utils.h"
+#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
#include "chrome/common/pref_names.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "components/prefs/pref_service.h"
@@ -42,6 +43,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
ManifestV2ExperimentManager::Get(profile)
->DidUserAcknowledgeNoticeGlobally();
+ info.is_extension_autoupdate_enabled =
+ DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
return info;
}
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -253,6 +253,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
// there was previously stored data, or an empty string otherwise. The Set will
// overwrite any previous login.
std::string GetWebstoreLogin(Profile* profile) {
+ if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
+ return std::string();
if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
return profile->GetPrefs()->GetString(kWebstoreLogin);
}
@@ -260,11 +262,15 @@ std::string GetWebstoreLogin(Profile* profile) {
}
void SetWebstoreLogin(Profile* profile, const std::string& login) {
+ if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
+ return;
profile->GetPrefs()->SetString(kWebstoreLogin, login);
}
api::webstore_private::ExtensionInstallStatus
ConvertExtensionInstallStatusForAPI(ExtensionInstallStatus status) {
+ if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
+ return api::webstore_private::ExtensionInstallStatus::kInstallable;
switch (status) {
case kCanRequest:
return api::webstore_private::ExtensionInstallStatus::kCanRequest;
@@ -1321,7 +1327,8 @@ ExtensionFunction::ResponseAction
WebstorePrivateIsInIncognitoModeFunction::Run() {
Profile* profile = GetProfileInIncognito(Profile::FromBrowserContext(browser_context()));
return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
- profile != profile->GetOriginalProfile())));
+ base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore)
+ && profile != profile->GetOriginalProfile())));
}
WebstorePrivateIsPendingCustodianApprovalFunction::
@@ -1418,11 +1425,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
recent_navigations_to_collect);
+ std::string serialized_referrer_proto = request.SerializeAsString();
+ if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
+ serialized_referrer_proto = "";
// Base64 encode the request to avoid issues with base::Value rejecting
// strings which are not valid UTF8.
return RespondNow(
ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
- base::Base64Encode(request.SerializeAsString()))));
+ base::Base64Encode(serialized_referrer_proto))));
#else
return RespondNow(ArgumentList(
api::webstore_private::GetReferrerChain::Results::Create("")));
diff --git a/chrome/browser/extensions/chrome_extension_system.cc b/chrome/browser/extensions/chrome_extension_system.cc
--- a/chrome/browser/extensions/chrome_extension_system.cc
+++ b/chrome/browser/extensions/chrome_extension_system.cc
@@ -100,6 +100,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
Profile* profile,
const Extension* extension,
UninstallReason reason) {
+ if ((true)) return UninstallPingSender::DO_NOT_SEND_PING;
ExtensionManagement* extension_management =
ExtensionManagementFactory::GetForBrowserContext(profile);
if (extension && (extension->from_webstore() ||
diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/browser/extensions/cws_info_service_factory.cc
--- a/chrome/browser/extensions/cws_info_service_factory.cc
+++ b/chrome/browser/extensions/cws_info_service_factory.cc
@@ -50,7 +50,8 @@ CWSInfoServiceFactory::CWSInfoServiceFactory()
std::unique_ptr<KeyedService>
CWSInfoServiceFactory::BuildServiceInstanceForBrowserContext(
content::BrowserContext* context) const {
- return std::make_unique<CWSInfoService>(Profile::FromBrowserContext(context));
+ // Disallow periodic retrieval of extensions metadata from the Chrome Web Store
+ return nullptr;
}
bool CWSInfoServiceFactory::ServiceIsCreatedWithBrowserContext() const {
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -436,6 +436,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
const Extension* extension) {
+ if ((true)) return true;
// This policy only applies to extensions that update from CWS.
if (!UpdatesFromWebstore(*extension)) {
return true;
diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/browser/extensions/extension_safety_check_utils.cc
--- a/chrome/browser/extensions/extension_safety_check_utils.cc
+++ b/chrome/browser/extensions/extension_safety_check_utils.cc
@@ -244,8 +244,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
developer::SafetyCheckWarningReason acknowledged_reason =
GetPrefAcknowledgeSafetyCheckWarningReason(extension,
ExtensionPrefs::Get(profile));
- std::optional<CWSInfoService::CWSInfo> cws_info =
- cws_info_service->GetCWSInfo(extension);
+ std::optional<CWSInfoService::CWSInfo> cws_info;
bool valid_cws_info = cws_info.has_value() && cws_info->is_present;
if (unpublished_only) {
if (valid_cws_info && cws_info->unpublished_long_ago) {
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -250,9 +250,6 @@ ExtensionService::ExtensionService(
UpgradeDetector::GetInstance()->AddObserver(this);
#endif
- cws_info_service_observation_.Observe(
- CWSInfoServiceFactory::GetForProfile(profile_));
-
ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
if (auto* extension_install_policy_service =
@@ -775,7 +772,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
// unpublished extensions should not be enabled. This update allows
// unpublished extensions to be disabled sooner rather than waiting till the
// next regularly scheduled fetch.
- if (profile_->GetPrefs()->GetInteger(
+ if (((false)) && profile_->GetPrefs()->GetInteger(
pref_names::kExtensionUnpublishedAvailability) !=
kAllowUnpublishedExtensions) {
CWSInfoServiceFactory::GetForProfile(profile_)->CheckAndMaybeFetchInfo();
diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
--- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
+++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
@@ -53,7 +53,6 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
manifest_query_params += "&testrequest=1";
}
downloader->set_manifest_query_params(manifest_query_params);
- downloader->set_ping_enabled_domain("google.com");
return downloader;
}
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -56,6 +56,7 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_id.h"
+#include "extensions/common/extension_features.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/extension_updater_uma.h"
#include "extensions/common/extension_urls.h"
@@ -230,6 +231,10 @@ void ExtensionUpdater::Start() {
DCHECK(!weak_ptr_factory_.HasWeakPtrs());
DCHECK(registry_);
alive_ = true;
+ if (first_start_) {
+ first_start_ = false;
+ CheckSoon();
+ }
// Check soon, and set up the first delayed check.
if (!g_skip_scheduled_checks_for_tests) {
CheckSoon();
@@ -411,6 +416,8 @@ void ExtensionUpdater::EraseUnupdatableIds(std::set<ExtensionId>& ids) const {
}
// Remove extensions that aren't in an autoupdatable location.
if (!Manifest::IsAutoUpdateableLocation(extension->location())) {
+ LOG(INFO) << "Extension " << extension->id() << " is not auto updateable: "
+ << "location=" << extension->location();
return true;
}
} else {
@@ -427,6 +434,12 @@ void ExtensionUpdater::EraseUnupdatableIds(std::set<ExtensionId>& ids) const {
}
void ExtensionUpdater::CheckNow(CheckParams params) {
+ if (!params.user_initiated &&
+ !base::FeatureList::IsEnabled(
+ extensions_features::kEnableExtensionAutoupdate)) {
+ LOG(INFO) << "Extensions autoupdate is disabled.";
+ return;
+ }
std::unique_ptr<ScopedProfileKeepAlive> keep_alive =
ScopedProfileKeepAlive::TryAcquire(
profile_, ProfileKeepAliveOrigin::kExtensionUpdater);
@@ -440,7 +453,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
CHECK(pending_extension_manager_);
int request_id = next_request_id_++;
- VLOG(2) << "Starting update check " << request_id;
+ LOG(INFO) << "Starting extensions update check id: " << request_id;
EnsureDownloaderCreated();
@@ -513,7 +526,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
// Note: If an extension is both installed and pending, but can't use
// update_service, pending_info takes priority.
- if (CanUseUpdateService(extension, pending_info)) {
+ if ((false) && CanUseUpdateService(extension, pending_info)) {
update_check_params.update_info[id] = GetExtensionUpdateData(id);
update_check_params.update_info[id].is_corrupt_reinstall =
is_corrupt_reinstall;
@@ -525,6 +538,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
InstallStageTrackerFactory::GetForBrowserContext(profile_)
->ReportInstallationStage(id,
InstallStageTracker::Stage::DOWNLOADING);
+ LOG(INFO) << "Extension " << id << " is auto updateable "
+ << "from " << pending_info->update_url();
} else if (pending_info) {
InstallStageTrackerFactory::GetForBrowserContext(profile_)->ReportFailure(
id, InstallStageTracker::FailureReason::DOWNLOADER_ADD_FAILED);
@@ -676,7 +691,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
InstallStageTracker::Stage::INSTALLING);
UpdatePingData(file.extension_id, ping);
- VLOG(2) << download_url << " written to " << file.path.value();
+ LOG(INFO) << download_url << " written to " << file.path.value();
FetchedCRXFile fetched(file, file_ownership_passed, request_ids,
std::move(callback));
@@ -687,6 +702,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
DownloadPingData* ping_data) {
+ if ((true)) return false;
DCHECK(alive_);
ping_data->rollcall_days =
CalculatePingDaysForExtension(extension_prefs_->LastPingDay(id));
@@ -798,7 +814,7 @@ bool ExtensionUpdater::CanUseUpdateService(
void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
std::set<int> request_ids;
- VLOG(2) << "updating " << crx_file.info.extension_id << " with "
+ LOG(INFO) << "Updating " << crx_file.info.extension_id << " with "
<< crx_file.info.path.value();
// The delegate is now responsible for cleaning up the temp file at
@@ -1008,7 +1024,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
if (!request.in_progress_ids.empty() || request.awaiting_update_service) {
return; // This request is not done yet.
}
- VLOG(2) << "Finished update check " << request_id;
+ LOG(INFO) << "Finished update check id: " << request_id;
if (!request.callback.is_null()) {
std::move(request.callback).Run();
}
diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
--- a/chrome/browser/extensions/updater/extension_updater.h
+++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -91,6 +91,8 @@ class ExtensionUpdater : public KeyedService,
// right away.
bool install_immediately = false;
+ bool user_initiated = false;
+
// An extension update check can be originated by a user or by a scheduled
// task. When the value of |fetch_priority| is FOREGROUND, the update
// request was initiated by a user.
@@ -398,6 +400,8 @@ class ExtensionUpdater : public KeyedService,
base::TimeDelta frequency_;
bool will_check_soon_ = false;
+ bool first_start_ = true;
+
raw_ptr<ExtensionPrefs> extension_prefs_ = nullptr;
raw_ptr<PrefService> prefs_ = nullptr;
raw_ptr<Profile> profile_ = nullptr;
diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -49,7 +49,7 @@ void WebstoreInstallHelper::Start(
data_decoder::DataDecoder::ParseJsonIsolated(
manifest_, base::BindOnce(&WebstoreInstallHelper::OnJSONParsed, this));
- if (icon_url_.is_empty()) {
+ if ((true) || icon_url_.is_empty()) {
icon_decode_complete_ = true;
} else {
// No existing |icon_fetcher_| to avoid unbalanced AddRef().
diff --git a/chrome/browser/resources/extensions/manager.html.ts b/chrome/browser/resources/extensions/manager.html.ts
--- a/chrome/browser/resources/extensions/manager.html.ts
+++ b/chrome/browser/resources/extensions/manager.html.ts
@@ -12,6 +12,7 @@ export function getHtml(this: ExtensionsManagerElement) {
<extensions-drop-overlay ?drag-enabled="${this.inDevMode}">
</extensions-drop-overlay>
<extensions-toolbar id="toolbar" ?in-dev-mode="${this.inDevMode}"
+ ?is-ext-update-enabled="${this.isExtUpdateEnabled}"
?can-load-unpacked="${this.canLoadUnpacked}"
?is-child-account="${this.isChildAccount_}"
?dev-mode-controlled-by-policy="${this.devModeControlledByPolicy}"
diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/resources/extensions/manager.ts
--- a/chrome/browser/resources/extensions/manager.ts
+++ b/chrome/browser/resources/extensions/manager.ts
@@ -143,6 +143,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
*/
didInitPage_: {type: Boolean},
+ isExtUpdateEnabled: {type: Boolean},
+
narrow_: {type: Boolean},
showDrawer_: {type: Boolean},
@@ -164,6 +166,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
accessor inDevMode: boolean = loadTimeData.getBoolean('inDevMode');
accessor isMv2DeprecationNoticeDismissed: boolean =
loadTimeData.getBoolean('MV2DeprecationNoticeDismissed');
+ accessor isExtUpdateEnabled: boolean =
+ loadTimeData.getBoolean('isExtUpdateEnabled');
accessor showActivityLog: boolean =
loadTimeData.getBoolean('showActivityLog');
accessor enableEnhancedSiteControls: boolean =
@@ -247,6 +251,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
this.canLoadUnpacked = profileInfo.canLoadUnpacked;
this.isMv2DeprecationNoticeDismissed =
profileInfo.isMv2DeprecationNoticeDismissed;
+ this.isExtUpdateEnabled = profileInfo.isExtensionAutoupdateEnabled;
};
service.getProfileStateChangedTarget().addListener(onProfileStateChanged);
service.getProfileConfiguration().then(onProfileStateChanged);
diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
--- a/chrome/browser/resources/extensions/service.ts
+++ b/chrome/browser/resources/extensions/service.ts
@@ -356,6 +356,11 @@ export class Service implements ServiceInterface {
{inDeveloperMode: inDevMode});
}
+ setExtUpdateEnabled(enabled: boolean) {
+ chrome.developerPrivate.updateProfileConfiguration(
+ {isExtensionAutoupdateEnabled: enabled});
+ }
+
loadUnpacked(): Promise<boolean> {
return this.loadUnpackedHelper_();
}
diff --git a/chrome/browser/resources/extensions/toolbar.css b/chrome/browser/resources/extensions/toolbar.css
--- a/chrome/browser/resources/extensions/toolbar.css
+++ b/chrome/browser/resources/extensions/toolbar.css
@@ -73,6 +73,11 @@ cr-tooltip-icon {
margin-inline-end: 16px;
}
+#need-update {
+ color: red;
+ margin-inline: 0;
+}
+
cr-toolbar {
--cr-toolbar-center-basis: 680px;
--cr-toolbar-field-max-width: var(--cr-toolbar-center-basis);
diff --git a/chrome/browser/resources/extensions/toolbar.html.ts b/chrome/browser/resources/extensions/toolbar.html.ts
--- a/chrome/browser/resources/extensions/toolbar.html.ts
+++ b/chrome/browser/resources/extensions/toolbar.html.ts
@@ -33,6 +33,13 @@ export function getHtml(this: ToolbarElement) {
<img srcset="images/product_logo.png" role="presentation">
</picture>
</if>
+ <div class="more-actions">
+ <span>$i18n{toolbarExtensionUpdateEnabled}
+ <span id="need-update" ?hidden="${!this.shouldShowRelaunchDialog}">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
+ </span>
+ <cr-toggle @change="${this.onExtUpdateEnabledChange_}" ?checked="${this.isExtUpdateEnabled}">
+ </cr-toggle>
+ </div>
</cr-toolbar>
${this.showPackDialog_ ? html`
<extensions-pack-dialog .delegate="${this.delegate as ServiceInterface}"
diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts
--- a/chrome/browser/resources/extensions/toolbar.ts
+++ b/chrome/browser/resources/extensions/toolbar.ts
@@ -26,6 +26,8 @@ export interface ToolbarDelegate {
*/
setProfileInDevMode(inDevMode: boolean): void;
+ setExtUpdateEnabled(enabled: boolean): void;
+
/** Opens the dialog to load unpacked extensions. */
loadUnpacked(): Promise<boolean>;
@@ -42,6 +44,7 @@ class DummyToolbarDelegate {
updateAllExtensions(_extensions: chrome.developerPrivate.ExtensionInfo[]) {
return Promise.resolve();
}
+ setExtUpdateEnabled(_enabled: boolean) {}
}
export interface ExtensionsToolbarElement {
@@ -80,6 +83,11 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
reflect: true,
},
+ isExtUpdateEnabled: {
+ type: Boolean,
+ reflect: true,
+ },
+
devModeControlledByPolicy: {type: Boolean},
isChildAccount: {type: Boolean},
@@ -92,6 +100,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
expanded_: {type: Boolean},
showPackDialog_: {type: Boolean},
+ shouldShowRelaunchDialog: {type: Boolean},
/**
* Prevents initiating update while update is in progress.
@@ -103,6 +112,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
accessor extensions: chrome.developerPrivate.ExtensionInfo[] = [];
accessor delegate: ToolbarDelegate = new DummyToolbarDelegate();
accessor inDevMode: boolean = false;
+ accessor isExtUpdateEnabled: boolean = false;
+ accessor shouldShowRelaunchDialog: boolean = false;
accessor devModeControlledByPolicy: boolean = false;
accessor isChildAccount: boolean = false;
@@ -155,6 +166,12 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
}
+ protected onExtUpdateEnabledChange_(e: CustomEvent<boolean>) {
+ this.delegate.setExtUpdateEnabled(e.detail);
+ this.shouldShowRelaunchDialog = true;
+ this.isExtUpdateEnabled = e.detail;
+ }
+
private onInDevModeChanged_(_current: boolean, previous: boolean) {
const drawer = this.$.devDrawer;
if (this.inDevMode) {
diff --git a/chrome/browser/resources/webstore_app/manifest.json b/chrome/browser/resources/webstore_app/manifest.json
--- a/chrome/browser/resources/webstore_app/manifest.json
+++ b/chrome/browser/resources/webstore_app/manifest.json
@@ -17,11 +17,6 @@
},
"permissions": [
"webstorePrivate",
- "management",
- "system.cpu",
- "system.display",
- "system.memory",
- "system.network",
- "system.storage"
+ "management"
]
}
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -16,6 +16,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
#include "chrome/browser/extensions/mv2_experiment_stage.h"
#include "chrome/browser/extensions/permissions_url_constants.h"
@@ -386,6 +387,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
{"itemSuspiciousInstallLearnMore",
IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
{"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
+ {"toolbarExtensionUpdateEnabled", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED},
+ {"toolbarExtensionUpdateEnabledNeedRestart", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED_NR},
{"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
{"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
{"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
@@ -471,6 +474,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
"hostPermissionsLearnMoreLink",
extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
source->AddBoolean(kInDevModeKey, in_dev_mode);
+
+ source->AddBoolean("isExtUpdateEnabled",
+ DeveloperPrivateAPI::IsExtensionAutoupdateEnabled());
+
source->AddBoolean(kShowActivityLogKey,
base::CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kEnableExtensionActivityLogging));
diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc b/chrome/browser/update_client/chrome_update_query_params_delegate.cc
--- a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
+++ b/chrome/browser/update_client/chrome_update_query_params_delegate.cc
@@ -33,15 +33,10 @@ ChromeUpdateQueryParamsDelegate::GetInstance() {
}
std::string ChromeUpdateQueryParamsDelegate::GetExtraParams() {
- std::string channel_name;
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- channel_name = extensions::GetChannelForExtensionUpdates();
-#else
- channel_name = chrome::GetChannelName(chrome::WithExtendedStable(true));
-#endif
-
- return base::StrCat({"&prodchannel=", channel_name, "&prodversion=",
- version_info::GetVersionNumber(), "&lang=", GetLang()});
+ return base::StrCat({
+ "&prodversion=",
+ version_info::GetMajorVersionNumber().c_str(),
+ ".0.0.0"});
}
// static
diff --git a/chrome/common/extensions/api/developer_private.webidl b/chrome/common/extensions/api/developer_private.webidl
--- a/chrome/common/extensions/api/developer_private.webidl
+++ b/chrome/common/extensions/api/developer_private.webidl
@@ -264,6 +264,7 @@ dictionary ProfileInfo {
required boolean isIncognitoAvailable;
required boolean isChildAccount;
required boolean isMv2DeprecationNoticeDismissed;
+ boolean isExtensionAutoupdateEnabled;
};
dictionary GetExtensionsInfoOptions {
@@ -287,6 +288,7 @@ dictionary ExtensionConfigurationUpdate {
dictionary ProfileConfigurationUpdate {
boolean inDeveloperMode;
boolean isMv2DeprecationNoticeDismissed;
+ boolean? isExtensionAutoupdateEnabled;
};
dictionary ExtensionCommandUpdate {
diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc
--- a/components/update_client/update_query_params.cc
+++ b/components/update_client/update_query_params.cc
@@ -87,8 +87,7 @@ UpdateQueryParamsDelegate* g_delegate = nullptr;
// static
std::string UpdateQueryParams::Get(ProdId prod) {
return base::StringPrintf(
- "os=%s&arch=%s&os_arch=%s&prod=%s%s&acceptformat=crx3,puff", kOs, kArch,
- base::SysInfo().OperatingSystemArchitecture().c_str(),
+ "prod=%s%s&acceptformat=crx3",
GetProdIdString(prod),
g_delegate ? g_delegate->GetExtraParams().c_str() : "");
}
@@ -120,7 +119,7 @@ std::string_view UpdateQueryParams::GetArch() {
// static
std::string UpdateQueryParams::GetProdVersion() {
- return std::string(version_info::GetVersionNumber());
+ return version_info::GetMajorVersionNumber();
}
// static
diff --git a/cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc b/cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
new file mode 100644
--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
@@ -0,0 +1,19 @@
+#ifdef FLAG_SECTION
+
+#if !BUILDFLAG(IS_ANDROID)
+
+ {"enable-extension-autoupdate",
+ "Enable Extensions Autoupdate",
+ "Allows the auto-updating of installed extensions by sending the "
+ "minimum required data.", kOsDesktop,
+ FEATURE_VALUE_TYPE(extensions_features::kEnableExtensionAutoupdate)},
+
+ {"enable-extension-management-to-chrome-store",
+ "Allow full use of management api to chrome web store",
+ "When deactivated (default) allows installation but hide "
+ "to the webstore which extensions are installed on the device.", kOsDesktop,
+ FEATURE_VALUE_TYPE(extensions_features::kEnableExtensionManagementToChromeStore)},
+
+#endif // !BUILDFLAG(IS_ANDROID)
+
+#endif // ifdef FLAG_SECTION
diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.cc
@@ -26,6 +26,9 @@
#include "components/supervised_user/core/common/buildflags.h"
#include "components/supervised_user/core/common/features.h"
#include "content/public/browser/browser_context.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
#include "extensions/browser/api/extensions_api_client.h"
#include "extensions/browser/api/management/management_api_constants.h"
#include "extensions/browser/disable_reason.h"
@@ -42,6 +45,7 @@
#include "extensions/common/api/management.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_features.h"
#include "extensions/common/extension_id.h"
#include "extensions/common/extension_urls.h"
#include "extensions/common/icons/extension_icon_set.h"
@@ -104,6 +108,29 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
return warnings_list;
}
+const Extension* GetExtensionById(content::WebContents* web_contents,
+ content::BrowserContext* context,
+ const std::string& id,
+ int include_mask) {
+ bool enabled = base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore);
+ if (web_contents) {
+ if (content::RenderFrameHost* rfh = web_contents->GetPrimaryMainFrame()) {
+ url::Origin top_frame_origin = rfh->GetMainFrame()->GetLastCommittedOrigin();
+ std::string scheme = top_frame_origin.scheme();
+ if (scheme == content::kChromeUIScheme) {
+ enabled = true;
+ }
+ }
+ }
+ if (!enabled)
+ return nullptr;
+
+ ExtensionRegistry* registry = ExtensionRegistry::Get(context);
+ const Extension* target_extension =
+ registry->GetExtensionById(id, include_mask);
+ return target_extension;
+}
+
std::vector<management::LaunchType> GetAvailableLaunchTypes(
const Extension& extension) {
std::vector<management::LaunchType> launch_type_list;
@@ -281,6 +308,8 @@ void AddExtensionInfo(const Extension* source_extension,
const ExtensionSet& extensions,
ExtensionInfoList* extension_list,
content::BrowserContext* context) {
+ if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
+ return;
for (ExtensionSet::const_iterator iter = extensions.begin();
iter != extensions.end(); ++iter) {
const Extension& extension = **iter;
@@ -314,10 +343,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
std::optional<management::Get::Params> params =
management::Get::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
- ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
const Extension* target_extension =
- registry->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
if (!target_extension) {
return RespondNow(Error(keys::kNoExtensionError, params->id));
}
@@ -338,8 +366,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
EXTENSION_FUNCTION_VALIDATE(params);
const Extension* extension =
- ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
if (!extension) {
return RespondNow(Error(keys::kNoExtensionError, params->id));
}
@@ -410,8 +437,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
}
const Extension* extension =
- ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
if (!extension) {
return RespondNow(Error(keys::kNoExtensionError, params->id));
}
@@ -552,8 +578,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
// Extension could have been uninstalled externally while previous check was
// happening.
const Extension* extension =
- ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_,
+ ExtensionRegistry::EVERYTHING);
if (!extension) {
FinishEnable(Error(keys::kNoExtensionError));
return;
@@ -596,8 +622,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
// Extension can be uninstalled externally while the previous check was
// happening async.
const Extension* extension =
- ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_,
+ ExtensionRegistry::EVERYTHING);
if (!extension) {
FinishEnable(Error(keys::kNoExtensionError));
return;
@@ -741,8 +767,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
}
const Extension* ManagementSetEnabledFunction::GetExtension() {
- return ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
+ return GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_,
+ ExtensionRegistry::EVERYTHING);
}
ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() = default;
@@ -767,8 +793,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
->GetDelegate();
target_extension_id_ = target_extension_id;
const Extension* target_extension =
- extensions::ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(target_extension_id_,
+ GetExtensionById(GetSenderWebContents(), browser_context(), target_extension_id_,
ExtensionRegistry::EVERYTHING);
if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
return RespondNow(Error(keys::kNoExtensionError, target_extension_id_));
@@ -833,8 +858,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
// The extension can be uninstalled in another window while the UI was
// showing. Do nothing in that case.
const Extension* target_extension =
- extensions::ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(target_extension_id_,
+ GetExtensionById(GetSenderWebContents(), browser_context(), target_extension_id_,
ExtensionRegistry::EVERYTHING);
std::string error;
bool success = false;
@@ -918,8 +942,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
management::CreateAppShortcut::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
const Extension* extension =
- ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
if (!extension) {
return RespondNow(Error(
ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id)));
@@ -973,8 +996,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
management::SetLaunchType::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
const Extension* extension =
- ExtensionRegistry::Get(browser_context())
- ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
+ GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
const ManagementAPIDelegate* delegate = ManagementAPI::GetFactoryInstance()
->Get(browser_context())
->GetDelegate();
diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -486,8 +486,8 @@ void ExtensionDownloader::CreateManifestLoader() {
std::vector<std::string_view> id_vector(extension_ids.begin(),
extension_ids.end());
std::string id_list = base::JoinString(id_vector, ",");
- VLOG(2) << "Fetching " << active_request->full_url() << " for " << id_list;
- VLOG(2) << "Update interactivity: "
+ LOG(INFO) << "Fetching " << active_request->full_url() << " for " << id_list;
+ LOG(INFO) << "Update interactivity: "
<< (active_request->foreground_check()
? kUpdateInteractivityForeground
: kUpdateInteractivityBackground);
@@ -512,7 +512,7 @@ void ExtensionDownloader::CreateManifestLoader() {
destination: WEBSITE
}
policy {
- cookies_allowed: YES
+ cookies_allowed: NO
cookies_store: "user"
setting:
"This feature cannot be disabled. It is only enabled when the user "
@@ -529,6 +529,7 @@ void ExtensionDownloader::CreateManifestLoader() {
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = active_request->full_url(),
resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+ resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
if (active_request->fetch_priority() == DownloadFetchPriority::kForeground) {
resource_request->priority = net::MEDIUM;
@@ -537,10 +538,6 @@ void ExtensionDownloader::CreateManifestLoader() {
// Send traffic-management headers to the webstore, and omit credentials.
// https://bugs.chromium.org/p/chromium/issues/detail?id=647516
if (extension_urls::IsWebstoreUpdateUrl(active_request->full_url())) {
- resource_request->headers.SetHeader(kUpdateInteractivityHeader,
- active_request->foreground_check()
- ? kUpdateInteractivityForeground
- : kUpdateInteractivityBackground);
resource_request->headers.SetHeader(kUpdateAppIdHeader, id_list);
resource_request->headers.SetHeader(
kUpdateUpdaterHeader,
@@ -825,20 +822,6 @@ void ExtensionDownloader::HandleManifestResults(
update.second->info);
}
- // If the manifest response included a <daystart> element, we want to save
- // that value for any extensions which had sent a ping in the request.
- if (fetch_data->base_url().DomainIs(kGoogleDotCom) &&
- results->daystart_elapsed_seconds >= 0) {
- Time day_start =
- Time::Now() - base::Seconds(results->daystart_elapsed_seconds);
-
- for (const ExtensionId& id : extension_ids) {
- ExtensionDownloaderDelegate::PingResult& result = ping_results_[id];
- result.did_ping = fetch_data->DidPing(id, ManifestFetchData::ROLLCALL);
- result.day_start = day_start;
- }
- }
-
ExtensionIdSet extension_ids_with_errors;
for (const auto& failure : failures)
extension_ids_with_errors.insert(failure.first.id);
@@ -861,7 +844,7 @@ ExtensionDownloader::GetUpdateAvailability(
// extensions that have already existed in the system.
if (!delegate_->GetExtensionExistingVersion(extension_id,
&extension_version)) {
- VLOG(2) << extension_id << " is not installed";
+ LOG(INFO) << extension_id << " is not installed";
return UpdateAvailability::kBadUpdateSpecification;
}
VLOG(2) << extension_id << " is at '" << extension_version << "'";
@@ -872,11 +855,11 @@ ExtensionDownloader::GetUpdateAvailability(
const std::string& update_version_str = update->version;
if (VLOG_IS_ON(2)) {
if (update_version_str.empty())
- VLOG(2) << "Manifest indicates " << extension_id
+ LOG(INFO) << "Manifest indicates " << extension_id
<< " has no update (info: " << update->info.value_or("no info")
<< ")";
else
- VLOG(2) << "Manifest indicates " << extension_id
+ LOG(INFO) << "Manifest indicates " << extension_id
<< " latest version is '" << update_version_str << "'";
}
@@ -886,14 +869,14 @@ ExtensionDownloader::GetUpdateAvailability(
// we don't want it.
if (update_version_str.empty()) {
// If update manifest doesn't have version number => no update.
- VLOG(2) << extension_id << " has empty version";
+ LOG(INFO) << extension_id << " has empty version";
has_noupdate = true;
continue;
}
const base::Version update_version(update_version_str);
if (!update_version.IsValid()) {
- VLOG(2) << extension_id << " has invalid version '"
+ LOG(INFO) << extension_id << " has invalid version '"
<< update_version_str << "'";
continue;
}
@@ -921,7 +904,7 @@ ExtensionDownloader::GetUpdateAvailability(
update->browser_min_version)) {
// TODO(asargent) - We may want this to show up in the extensions UI
// eventually. (http://crbug.com/12547).
- DLOG(WARNING) << "Updated version of extension " << extension_id
+ LOG(INFO) << "Updated version of extension " << extension_id
<< " available, but requires chrome version "
<< update->browser_min_version;
has_noupdate = true;
@@ -929,7 +912,9 @@ ExtensionDownloader::GetUpdateAvailability(
}
// Stop checking as soon as an update for |extension_id| is found.
- VLOG(2) << "Will try to update " << extension_id;
+ LOG(INFO) << "Will try to update " << extension_id
+ << " at " << extension_version
+ << " update to " << update_version_str;
*update_result_out = const_cast<UpdateManifestResult*>(update);
return UpdateAvailability::kAvailable;
}
@@ -1175,7 +1160,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
int load_flags = net::LOAD_DISABLE_CACHE;
bool is_secure = fetch->url.SchemeIsCryptographic();
extension_loader_resource_request_->load_flags = load_flags;
- if (fetch->credentials != ExtensionFetch::CREDENTIALS_COOKIES || !is_secure) {
+ if ((true) || fetch->credentials != ExtensionFetch::CREDENTIALS_COOKIES || !is_secure) {
extension_loader_resource_request_->credentials_mode =
network::mojom::CredentialsMode::kOmit;
} else {
@@ -1183,7 +1168,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
net::SiteForCookies::FromUrl(fetch->url);
}
- if (fetch->credentials == ExtensionFetch::CREDENTIALS_OAUTH2_TOKEN &&
+ if ((false) && fetch->credentials == ExtensionFetch::CREDENTIALS_OAUTH2_TOKEN &&
is_secure) {
if (access_token_.empty()) {
// We should try OAuth2, but we have no token cached. This
@@ -1206,7 +1191,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
base::StringPrintf("Bearer %s", access_token_.c_str()));
}
- VLOG(2) << "Starting load of " << fetch->url << " for " << fetch->id;
+ LOG(INFO) << "Starting load of " << fetch->url << " for " << fetch->id;
StartExtensionLoader();
}
@@ -1228,7 +1213,7 @@ void ExtensionDownloader::StartExtensionLoader() {
destination: WEBSITE
}
policy {
- cookies_allowed: YES
+ cookies_allowed: NO
cookies_store: "user"
setting:
"This feature cannot be disabled. It is only enabled when the user "
@@ -1299,6 +1284,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
RETRY_HISTOGRAM("CrxFetchSuccess",
extensions_queue_.active_request_failure_count(),
url);
+ LOG(INFO) << "Extension fetch success url " << url.possibly_invalid_spec();
std::unique_ptr<ExtensionFetch> fetch_data =
std::move(extensions_queue_.reset_active_request().fetch);
delegate_->OnExtensionDownloadStageChanged(
@@ -1319,7 +1305,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
} else {
const std::set<int> request_ids = active_request.GetRequestIds();
const ExtensionDownloaderDelegate::PingResult& ping = ping_results_[id];
- VLOG(1) << "Failed to fetch extension '" << url.possibly_invalid_spec()
+ LOG(INFO) << "Failed to fetch extension '" << url.possibly_invalid_spec()
<< "' response code:" << response_code;
if (ShouldRetryRequest(extension_loader_.get()) &&
extensions_queue_.active_request_failure_count() < kMaxRetries) {
@@ -1413,6 +1399,7 @@ void ExtensionDownloader::NotifyExtensionsDownloadFailedWithList(
bool ExtensionDownloader::IterateFetchCredentialsAfterFailure(
ExtensionFetch* fetch,
int response_code) {
+ if ((true)) return false;
bool auth_failure = response_code == net::HTTP_UNAUTHORIZED ||
response_code == net::HTTP_FORBIDDEN;
if (!auth_failure) {
diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/browser/updater/extension_downloader.h
--- a/extensions/browser/updater/extension_downloader.h
+++ b/extensions/browser/updater/extension_downloader.h
@@ -113,7 +113,6 @@ class ExtensionDownloader {
}
void set_ping_enabled_domain(const std::string& domain) {
- ping_enabled_domain_ = domain;
}
// Set backoff policy for manifest and extension queue. Set `std::nullopt` to
diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/browser/updater/manifest_fetch_data.cc
--- a/extensions/browser/updater/manifest_fetch_data.cc
+++ b/extensions/browser/updater/manifest_fetch_data.cc
@@ -107,7 +107,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
: base_url_(update_url),
full_url_(update_url),
brand_code_(brand_code),
- ping_mode_(ping_mode),
+ ping_mode_(NO_PING),
fetch_priority_(fetch_priority) {
UpdateFullUrl(base_query_params);
request_ids_.insert(request_id);
@@ -160,18 +160,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
// Compute the string we'd append onto the full_url_, and see if it fits.
std::vector<std::string> parts;
parts.push_back("id=" + id);
- parts.push_back("v=" + version);
- if (!install_source.empty())
- parts.push_back("installsource=" + install_source);
- if (!install_location.empty())
- parts.push_back("installedby=" + install_location);
parts.push_back("uc");
if (!update_url_data.empty()) {
// Make sure the update_url_data string is escaped before using it so that
// there is no chance of overriding the id or v other parameter value
// we place into the x= value.
- parts.push_back("ap=" + base::EscapeQueryParamValue(update_url_data, true));
}
// Append brand code, rollcall and active ping parameters.
diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/browser/updater/safe_manifest_parser.cc
--- a/extensions/browser/updater/safe_manifest_parser.cc
+++ b/extensions/browser/updater/safe_manifest_parser.cc
@@ -202,6 +202,7 @@ void ParseXmlDone(ParseUpdateManifestCallback callback,
std::move(callback).Run(/*results=*/nullptr, std::move(error));
});
+ LOG(INFO) << "Manifest: " << root;
auto results = std::make_unique<UpdateManifestResults>();
// Parse the first <daystart> if it's present.
diff --git a/extensions/browser/webstore_installer.cc b/extensions/browser/webstore_installer.cc
--- a/extensions/browser/webstore_installer.cc
+++ b/extensions/browser/webstore_installer.cc
@@ -604,7 +604,7 @@ void WebstoreInstaller::StartDownload(const ExtensionId& extension_id,
render_frame_host->CreateDownloadUrlParameters(download_url_,
traffic_annotation);
params->set_file_path(file);
- if (controller.GetVisibleEntry()) {
+ if (((false)) && controller.GetVisibleEntry()) {
content::Referrer referrer = content::Referrer::SanitizeForRequest(
download_url_,
content::Referrer(controller.GetVisibleEntry()->GetURL(),
diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc
--- a/extensions/common/extension_features.cc
+++ b/extensions/common/extension_features.cc
@@ -220,4 +220,11 @@ BASE_FEATURE(kWebRequestPersistFilteredEventsViaEventRouter,
BASE_FEATURE(kOptimizeWebRequestProxy, base::FEATURE_DISABLED_BY_DEFAULT);
+CROMITE_FEATURE(kEnableExtensionAutoupdate,
+ "EnableExtensionAutoupdate",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+
+CROMITE_FEATURE(kEnableExtensionManagementToChromeStore,
+ "EnableExtensionToChromeStore",
+ base::FEATURE_DISABLED_BY_DEFAULT);
} // namespace extensions_features
diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
--- a/extensions/common/extension_features.h
+++ b/extensions/common/extension_features.h
@@ -320,6 +320,16 @@ BASE_DECLARE_FEATURE(kWebRequestPersistFilteredEventsViaEventRouter);
// optimizations like preconnect.
BASE_DECLARE_FEATURE(kOptimizeWebRequestProxy);
+// Activates the auto update of extensions.
+// the only data provided by default is the list of extensions.
+BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
+
+// Modifies "management" and "webstorePrivate" extension api
+// by not allowing access to the list of installed extensions
+// and reading or changing status.
+// Allows the installation of new extensions.
+// If active, exposes all features to the chrome web store like chromium.
+BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore);
} // namespace extensions_features
#endif // EXTENSIONS_COMMON_EXTENSION_FEATURES_H_
diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts
--- a/tools/typescript/definitions/developer_private.d.ts
+++ b/tools/typescript/definitions/developer_private.d.ts
@@ -264,6 +264,7 @@ declare global {
isIncognitoAvailable: boolean;
isChildAccount: boolean;
isMv2DeprecationNoticeDismissed: boolean;
+ isExtensionAutoupdateEnabled: boolean;
}
export interface ExtensionConfigurationUpdate {
@@ -281,6 +282,7 @@ declare global {
export interface ProfileConfigurationUpdate {
inDeveloperMode?: boolean;
isMv2DeprecationNoticeDismissed?: boolean;
+ isExtensionAutoupdateEnabled?: boolean;
}
export interface ExtensionCommandUpdate {
--
Reference in New Issue View Git Blame Copy Permalink