Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Omaha config IDs to configurator. #4401

Merged
merged 3 commits into from
Nov 13, 2024
+165 −30
Merged

Add Omaha config IDs to configurator. #4401

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
470bd8e
Add Omaha config IDs to configurator.
yjzhang111 Nov 8, 2024
20afff8
Preserve the functionality for trunk binary to get on ltsnightly chan…
yjzhang111 Nov 9, 2024
46e4f94
Address comments.
yjzhang111 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 80 additions & 8 deletions chrome/updater/configurator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "chrome/updater/configurator.h"

#include <regex>
#include <set>
#include <utility>
#include "base/command_line.h"
Expand All @@ -29,14 +30,62 @@ using starboard::kSystemPropertyMaxLength;

namespace {

// Map of Omaha config IDs with channel and starboard version as indices.
static const std::unordered_map<std::string, std::string> kChannelAndSbVersionToOmahaIdMap = {
{"control14", "{5F96FC23-F232-40B6-B283-FAD8DB21E1A7}"},
{"control15", "{409F15C9-4E10-4224-9DD1-BEE7E5A2A55B}"},
{"control16", "{30061C09-D926-4B82-8D42-600C06B6134C}"},
{"experiment14", "{9BCC272B-3F78-43FD-9B34-A3810AE1B85D}"},
{"experiment15", "{C412A665-9BAD-4981-93C0-264233720222}"},
{"experiment16", "{32B5CF5A-96A4-4F64-AD0E-7C62705222FF}"},
{"prod14", "{B3F9BCA2-8AD1-448F-9829-BB9F432815DE}"},
{"prod15", "{14ED1D09-DAD2-4FB2-A89B-3ADC82137BCD}"},
{"prod16", "{10F11416-0D9C-4CB1-A82A-0168594E8256}"},
{"qa14","{94C5D27F-5981-46E8-BD4F-4645DBB5AFD3}"},
{"qa15", "{14ED1D09-DAD2-4FB2-A89B-3ADC82137BCD}"},
{"qa16", "{B725A22D-553A-49DC-BD61-F042B07C6B22}"},
{"rollback14", "{A83768A9-9556-48C2-8D5E-D7C845C16C19}"},
{"rollback15", "{1526831E-B130-43C1-B31A-AEE6E90063ED}"},
{"rollback16", "{2A1FCBE4-E4F9-4DC3-9E1A-700FBC1D551B}"},
{"static14", "{8001FE2C-F523-4AEC-A753-887B5CC35EBB}"},
{"static15", "{F58B7C5F-8DC5-4E32-8CF1-455F1302D609}"},
{"static16", "{A68BE0E4-7EE3-451A-9395-A789518FF7C5}"},
{"t1app14", "{7C8BCB72-705D-41A6-8189-D8312E795302}"},
{"t1app15", "{12A94004-F661-42A7-9DFC-325A4DA72D29}"},
{"t1app16", "{B677F645-A8DB-4014-BD95-C6C06715C7CE}"},
{"tcrash14", "{328C380E-75B4-4D7A-BF98-9B443ABA8FFF}"},
{"tcrash15", "{1A924F1C-A46D-4104-8CCE-E8DB3C6E0ED1}"},
{"tcrash16", "{0F876BD6-7C15-4B09-8C95-9FBBA2F93E94}"},
{"test14", "{DB2CC00C-4FA9-4DB8-A947-647CEDAEBF29}"},
{"test15", "{24A8A3BF-5944-4D5C-A5C4-BE00DF0FB9E1}"},
{"test16", "{5EADD81E-A98E-4F8B-BFAA-875509A51991}"},
{"tfailv14", "{F06C3516-8706-4579-9493-881F84606E98}"},
{"tfailv15", "{36CFD9A7-1A73-4E8A-AC05-E3013CC4F75C}"},
{"tfailv16", "{8F9EC6E9-B89D-4C75-9E7E-A5B9B0254844}"},
{"tmsabi14", "{87EDA0A7-ED13-4A72-9CD9-EBD4BED081AB}"},
{"tmsabi15", "{60296D57-2572-4B16-89EC-C9DA5A558E8A}"},
{"tmsabi16", "{1B915523-8ADD-4C66-9E8F-D73FB48A4296}"},
{"tnoop14", "{C407CF3F-21A4-47AA-9667-63E7EEA750CB}"},
{"tnoop15", "{FC568D82-E608-4F15-95F0-A539AB3F6E9D}"},
{"tnoop16", "{5F4E8AD9-067B-443A-8B63-A7CC4C95B264}"},
{"tseries114", "{0A8A3F51-3FAB-4427-848E-28590DB75AA1}"},
{"tseries115", "{92B7AC78-1B3B-4CE6-BA39-E1F50C4F5F72}"},
{"tseries116", "{6E7C6582-3DC4-4B48-97F2-FA43614B2B4D}"},
{"tseries214", "{7CB65840-5FA4-4706-BC9E-86A89A56B4E0}"},
{"tseries215", "{7CCA7DB3-C27D-4CEB-B6A5-50A4D6DE40DA}"},
{"tseries216", "{012BF4F5-8463-490F-B6C8-E9B64D972152}"},
};
// Default time constants.
const int kDelayOneMinute = 60;
const int kDelayOneHour = kDelayOneMinute * 60;
const char kDefaultUpdaterChannel[] = "prod";
const char kOmahaCobaltAppID[] = "{6D4E53F3-CC64-4CB8-B6BD-AB0B8F300E1C}";
yuying-y marked this conversation as resolved.
Show resolved Hide resolved
const char kOmahaCobaltTrunkAppID[] = "{A9557415-DDCD-4948-8113-C643EFCF710C}";
const char kOmahaCobaltLTSNightlyAppID[] =
"{26CD2F67-091F-4680-A9A9-2229635B65A5}";
const char kOmahaCobaltTrunkAppID[] = "{A9557415-DDCD-4948-8113-C643EFCF710C}";
const char kOmahaCobaltAppID[] = "{6D4E53F3-CC64-4CB8-B6BD-AB0B8F300E1C}";
const char kOmahaCobaltProdSb14AppID[] = "{B3F9BCA2-8AD1-448F-9829-BB9F432815DE}";
const char kOmahaCobaltProdSb15AppID[] = "{14ED1D09-DAD2-4FB2-A89B-3ADC82137BCD}";
const char kOmahaCobaltProdSb16AppID[] = "{10F11416-0D9C-4CB1-A82A-0168594E8256}";

std::string GetDeviceProperty(SbSystemPropertyId id) {
char value[kSystemPropertyMaxLength];
Expand Down Expand Up @@ -259,20 +308,43 @@ std::vector<uint8_t> Configurator::GetRunActionKeyHash() const {
}

std::string Configurator::GetAppGuidHelper(const std::string& updater_channel,
const std::string& version) {
const std::string& version,
const int sb_version) {
if (updater_channel == "ltsnightly" || updater_channel == "ltsnightlyqa") {
return kOmahaCobaltLTSNightlyAppID;
}
if (version.find(".lts.") != std::string::npos &&
version.find(".master.") == std::string::npos) {
return kOmahaCobaltAppID;
if (version.find(".lts.") == std::string::npos &&
version.find(".master.") != std::string::npos) {
return kOmahaCobaltTrunkAppID;
}
std::string channel(updater_channel);
if (std::regex_match(updater_channel, std::regex("2[5-9]lts\\d+"))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if std::regex("\d+lts\d+") is more future proof.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also add a comment explaining what are you trying to match

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment and changed to "\d+lts\d+", but I was wondering if it needs to be future proof.

I was going to use "25lts\d+" since we don't expect Chrobalt to be compatible with SB14-16. These configs will only be used for C25. Given we don't know when we will ship Chrobalt, I used "2[5-9]lts\d+", but these should really just be used by C25.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The static channels should work universally even when setting a device to an older static channel. For example, if a device is running 25lts20 with this code, setting its channel to 24lts10 should work. This means the regex here should match all static channels, and the new config should contain cohorts and rules of all applicable static channels for the specific SB verison.

channel = "static";
}
auto it = kChannelAndSbVersionToOmahaIdMap.find(channel + std::to_string(sb_version));
if (it != kChannelAndSbVersionToOmahaIdMap.end()) {
return it->second;
}
LOG(INFO) << "Configurator::GetAppGuidHelper updater channel and starboard combination is invalid.";
yuying-y marked this conversation as resolved.
Show resolved Hide resolved

// All invalid channel requests get updates from prod config.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// All undefined channel requests go to prod configs.

if (sb_version == 14) {
return kOmahaCobaltProdSb14AppID;
}
if (sb_version == 15) {
return kOmahaCobaltProdSb15AppID;
}
if (sb_version == 16) {
return kOmahaCobaltProdSb16AppID;
}
return kOmahaCobaltTrunkAppID;
// Should not reach here.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to comment to:

// Requests with other SB versions go to the legacy config.

LOG(INFO) << "Configurator::GetAppGuidHelper starboard version is invalid.";
return kOmahaCobaltAppID;
}

std::string Configurator::GetAppGuid() const {
const std::string version(COBALT_VERSION);
return GetAppGuidHelper(updater_channel_, version);
return GetAppGuidHelper(updater_channel_, version, SB_API_VERSION);
}

std::unique_ptr<update_client::ProtocolHandlerFactory>
Expand Down
3 changes: 2 additions & 1 deletion chrome/updater/configurator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ class Configurator : public update_client::Configurator {
void SetUseCompressedUpdates(bool use_compressed_updates) override;
// Added for testing purposes.
static std::string GetAppGuidHelper(const std::string& updater_channel,
const std::string& version);
const std::string& version,
const int sb_version);

private:
friend class base::RefCountedThreadSafe<Configurator>;
Expand Down
111 changes: 96 additions & 15 deletions chrome/updater/configurator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,58 @@
#include "testing/gtest/include/gtest/gtest.h"

namespace {
static const std::unordered_map<std::string, std::string> kChannelAndSbVersionToOmahaIdMap = {
yuying-y marked this conversation as resolved.
Show resolved Hide resolved
{"control14", "{5F96FC23-F232-40B6-B283-FAD8DB21E1A7}"},
{"control15", "{409F15C9-4E10-4224-9DD1-BEE7E5A2A55B}"},
{"control16", "{30061C09-D926-4B82-8D42-600C06B6134C}"},
{"experiment14", "{9BCC272B-3F78-43FD-9B34-A3810AE1B85D}"},
{"experiment15", "{C412A665-9BAD-4981-93C0-264233720222}"},
{"experiment16", "{32B5CF5A-96A4-4F64-AD0E-7C62705222FF}"},
{"prod14", "{B3F9BCA2-8AD1-448F-9829-BB9F432815DE}"},
{"prod15", "{14ED1D09-DAD2-4FB2-A89B-3ADC82137BCD}"},
{"prod16", "{10F11416-0D9C-4CB1-A82A-0168594E8256}"},
{"qa14","{94C5D27F-5981-46E8-BD4F-4645DBB5AFD3}"},
{"qa15", "{14ED1D09-DAD2-4FB2-A89B-3ADC82137BCD}"},
{"qa16", "{B725A22D-553A-49DC-BD61-F042B07C6B22}"},
{"rollback14", "{A83768A9-9556-48C2-8D5E-D7C845C16C19}"},
{"rollback15", "{1526831E-B130-43C1-B31A-AEE6E90063ED}"},
{"rollback16", "{2A1FCBE4-E4F9-4DC3-9E1A-700FBC1D551B}"},
{"static14", "{8001FE2C-F523-4AEC-A753-887B5CC35EBB}"},
{"static15", "{F58B7C5F-8DC5-4E32-8CF1-455F1302D609}"},
{"static16", "{A68BE0E4-7EE3-451A-9395-A789518FF7C5}"},
{"t1app14", "{7C8BCB72-705D-41A6-8189-D8312E795302}"},
{"t1app15", "{12A94004-F661-42A7-9DFC-325A4DA72D29}"},
{"t1app16", "{B677F645-A8DB-4014-BD95-C6C06715C7CE}"},
{"tcrash14", "{328C380E-75B4-4D7A-BF98-9B443ABA8FFF}"},
{"tcrash15", "{1A924F1C-A46D-4104-8CCE-E8DB3C6E0ED1}"},
{"tcrash16", "{0F876BD6-7C15-4B09-8C95-9FBBA2F93E94}"},
{"test14", "{DB2CC00C-4FA9-4DB8-A947-647CEDAEBF29}"},
{"test15", "{24A8A3BF-5944-4D5C-A5C4-BE00DF0FB9E1}"},
{"test16", "{5EADD81E-A98E-4F8B-BFAA-875509A51991}"},
{"tfailv14", "{F06C3516-8706-4579-9493-881F84606E98}"},
{"tfailv15", "{36CFD9A7-1A73-4E8A-AC05-E3013CC4F75C}"},
{"tfailv16", "{8F9EC6E9-B89D-4C75-9E7E-A5B9B0254844}"},
{"tmsabi14", "{87EDA0A7-ED13-4A72-9CD9-EBD4BED081AB}"},
{"tmsabi15", "{60296D57-2572-4B16-89EC-C9DA5A558E8A}"},
{"tmsabi16", "{1B915523-8ADD-4C66-9E8F-D73FB48A4296}"},
{"tnoop14", "{C407CF3F-21A4-47AA-9667-63E7EEA750CB}"},
{"tnoop15", "{FC568D82-E608-4F15-95F0-A539AB3F6E9D}"},
{"tnoop16", "{5F4E8AD9-067B-443A-8B63-A7CC4C95B264}"},
{"tseries114", "{0A8A3F51-3FAB-4427-848E-28590DB75AA1}"},
{"tseries115", "{92B7AC78-1B3B-4CE6-BA39-E1F50C4F5F72}"},
{"tseries116", "{6E7C6582-3DC4-4B48-97F2-FA43614B2B4D}"},
{"tseries214", "{7CB65840-5FA4-4706-BC9E-86A89A56B4E0}"},
{"tseries215", "{7CCA7DB3-C27D-4CEB-B6A5-50A4D6DE40DA}"},
{"tseries216", "{012BF4F5-8463-490F-B6C8-E9B64D972152}"},
};
const char kOmahaCobaltAppID[] = "{6D4E53F3-CC64-4CB8-B6BD-AB0B8F300E1C}";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: kOmahaCobaltAppID, kOmahaCobaltTrunkAppID and kOmahaCobaltLTSNightlyAppID can be moved to utils and shared. kOmahaCobaltProdSb15AppID and kOmahaCobaltProdSb14AppID can be removed and accessed by the same method in configurator.cc.

const char kOmahaCobaltLTSNightlyAppID[] =
"{26CD2F67-091F-4680-A9A9-2229635B65A5}";
const char kOmahaCobaltProdSb14AppID[] = "{B3F9BCA2-8AD1-448F-9829-BB9F432815DE}";
const char kOmahaCobaltProdSb15AppID[] = "{14ED1D09-DAD2-4FB2-A89B-3ADC82137BCD}";
const char kOmahaCobaltTrunkAppID[] = "{A9557415-DDCD-4948-8113-C643EFCF710C}";
const char kOmahaCobaltAppID[] = "{6D4E53F3-CC64-4CB8-B6BD-AB0B8F300E1C}";
const int kTestSbVersion14 = 14;
const int kTestSbVersion15 = 15;
} // namespace

namespace cobalt {
Expand All @@ -34,46 +82,79 @@ class ConfiguratorTest : public testing::Test {

TEST_F(ConfiguratorTest, GetAppGuidReturnsTrunkIdWithVersionMaster) {
CHECK_EQ(
cobalt::updater::Configurator::GetAppGuidHelper("prod", "23.master.0"),
cobalt::updater::Configurator::GetAppGuidHelper("prod",
"23.master.0",
kTestSbVersion14),
kOmahaCobaltTrunkAppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsLtsIdWithVersionMaster) {
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("ltsnightly",
"23.master.0"),
"23.master.0",
kTestSbVersion14),
kOmahaCobaltLTSNightlyAppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsLtsIdWithVersionLts) {
CHECK_EQ(
cobalt::updater::Configurator::GetAppGuidHelper("ltsnightly", "23.lts.0"),
cobalt::updater::Configurator::GetAppGuidHelper("ltsnightly",
"23.lts.0",
kTestSbVersion14),
kOmahaCobaltLTSNightlyAppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsTrunkIdWithVersionMain) {
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("prod", "23.main.0"),
kOmahaCobaltTrunkAppID);
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("prod",
"23.main.0",
kTestSbVersion14),
kOmahaCobaltProdSb14AppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsProdIdWithVersionLts) {
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("prod", "23.lts.0"),
kOmahaCobaltAppID);
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("prod",
"23.lts.0",
kTestSbVersion14),
kOmahaCobaltProdSb14AppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsProdIdWithChannelEmpty) {
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("", "23.lts.0"),
kOmahaCobaltAppID);
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("",
"23.lts.0",
kTestSbVersion15),
kOmahaCobaltProdSb15AppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsTrunkIdWithVersionEmpty) {
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("", ""),
kOmahaCobaltTrunkAppID);
TEST_F(ConfiguratorTest, GetAppGuidReturnsTrunkIdWithInvalidSbVersion) {
CHECK_EQ(cobalt::updater::Configurator::GetAppGuidHelper("", "", 0),
kOmahaCobaltAppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsTrunkIdWithVersionMasterLts) {
CHECK_EQ(
cobalt::updater::Configurator::GetAppGuidHelper("", "23.master.lts.0"),
kOmahaCobaltTrunkAppID);
cobalt::updater::Configurator::GetAppGuidHelper("",
"23.master.lts.0",
kTestSbVersion14),
kOmahaCobaltProdSb14AppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsProdIdWithInvalidChannel) {
CHECK_EQ(
cobalt::updater::Configurator::GetAppGuidHelper("invalid",
"23.lts.0",
kTestSbVersion14),
kOmahaCobaltProdSb14AppID);
}

TEST_F(ConfiguratorTest, GetAppGuidReturnsCorrectNewConfigId) {
for (auto kvpair : kChannelAndSbVersionToOmahaIdMap) {
std::string channel = kvpair.first.substr(0, kvpair.first.size() - 2);
int sb_version = std::stoi(kvpair.first.substr(kvpair.first.size() - 2, 2));
CHECK_EQ(
cobalt::updater::Configurator::GetAppGuidHelper(channel,
"23.lts.0",
sb_version),
kvpair.second);
}
}

} // namespace updater
Expand Down
Loading