Skip to content

GitLab

T
tangled
Commit 1f727790 authored by Felipe Andrade's avatar Felipe Andrade Committed by Commit Bot
Browse files
Options

Isolate Kerberos settings functionalities 

Move Kerberos settings functionalities from PeopleSection into
KerberosAccountsHandler. This includes updating search tags, adding
load time strings and registering section hierarchy.

These methods will be called from PeopleSection
if KerberosSettingsSection flag is disabled. Otherwise, these methods
will be called from the new KerberosSection (to be created).

Bug: 983041
Change-Id: Ida54d5fb9979e9c784def21146e1e474175490dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2465917
Commit-Queue: Felipe Andrade <fsandrade@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarKush Sinha <sinhak@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826257}
parent 2cbe777d
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 127 deletions
chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
View file @ 1f727790
......@@ -11,10 +11,19 @@
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h"
#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/settings/chromeos/os_settings_section.h"
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/web_ui_data_source.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/time_format.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/webui/web_ui_util.h"
......@@ -23,19 +32,161 @@
namespace chromeos {
namespace settings {
namespace {
bool IsKerberosEnabled(
KerberosCredentialsManager* kerberos_credentials_manager) {
return kerberos_credentials_manager != nullptr &&
kerberos_credentials_manager->IsKerberosEnabled();
}
// Adds title for Kerberos subsection and Add Accounts page.
void AddKerberosTitleStrings(content::WebUIDataSource* html_source) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"kerberosAccountsSubMenuLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_SUBMENU_LABEL},
{"kerberosAccountsPageTitle", IDS_SETTINGS_KERBEROS_ACCOUNTS_PAGE_TITLE},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings);
}
// Adds load time strings to Kerberos Add Accounts dialog.
void AddKerberosAddAccountDialogStrings(content::WebUIDataSource* html_source) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"kerberosAccountsAdvancedConfigLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ADVANCED_CONFIG_LABEL},
{"kerberosAdvancedConfigTitle",
IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_TITLE},
{"kerberosAdvancedConfigDesc",
IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_DESC},
{"addKerberosAccountRememberPassword",
IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REMEMBER_PASSWORD},
{"kerberosPassword", IDS_SETTINGS_KERBEROS_PASSWORD},
{"kerberosUsername", IDS_SETTINGS_KERBEROS_USERNAME},
{"addKerberosAccountDescription",
IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_DESCRIPTION},
{"kerberosErrorNetworkProblem",
IDS_SETTINGS_KERBEROS_ERROR_NETWORK_PROBLEM},
{"kerberosErrorUsernameInvalid",
IDS_SETTINGS_KERBEROS_ERROR_USERNAME_INVALID},
{"kerberosErrorUsernameUnknown",
IDS_SETTINGS_KERBEROS_ERROR_USERNAME_UNKNOWN},
{"kerberosErrorDuplicatePrincipalName",
IDS_SETTINGS_KERBEROS_ERROR_DUPLICATE_PRINCIPAL_NAME},
{"kerberosErrorContactingServer",
IDS_SETTINGS_KERBEROS_ERROR_CONTACTING_SERVER},
{"kerberosErrorPasswordInvalid",
IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_INVALID},
{"kerberosErrorPasswordExpired",
IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_EXPIRED},
{"kerberosErrorKdcEncType", IDS_SETTINGS_KERBEROS_ERROR_KDC_ENC_TYPE},
{"kerberosErrorGeneral", IDS_SETTINGS_KERBEROS_ERROR_GENERAL},
{"kerberosConfigErrorSectionNestedInGroup",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NESTED_IN_GROUP},
{"kerberosConfigErrorSectionSyntax",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_SYNTAX},
{"kerberosConfigErrorExpectedOpeningCurlyBrace",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXPECTED_OPENING_CURLY_BRACE},
{"kerberosConfigErrorExtraCurlyBrace",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXTRA_CURLY_BRACE},
{"kerberosConfigErrorRelationSyntax",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_RELATION_SYNTAX_ERROR},
{"kerberosConfigErrorKeyNotSupported",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KEY_NOT_SUPPORTED},
{"kerberosConfigErrorSectionNotSupported",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NOT_SUPPORTED},
{"kerberosConfigErrorKrb5FailedToParse",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KRB5_FAILED_TO_PARSE},
{"addKerberosAccountRefreshButtonLabel",
IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REFRESH_BUTTON_LABEL},
{"addKerberosAccount", IDS_SETTINGS_ADD_KERBEROS_ACCOUNT},
{"refreshKerberosAccount", IDS_SETTINGS_REFRESH_KERBEROS_ACCOUNT},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings);
PrefService* local_state = g_browser_process->local_state();
// Whether the 'Remember password' checkbox is enabled.
html_source->AddBoolean(
"kerberosRememberPasswordEnabled",
local_state->GetBoolean(::prefs::kKerberosRememberPasswordEnabled));
// Kerberos default configuration.
html_source->AddString(
"defaultKerberosConfig",
chromeos::KerberosCredentialsManager::GetDefaultKerberosConfig());
}
// Adds load time strings to Kerberos Accounts page.
void AddKerberosAccountsPageStrings(
content::WebUIDataSource* html_source,
KerberosCredentialsManager* kerberos_credentials_manager) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"kerberosAccountsAddAccountLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ADD_ACCOUNT_LABEL},
{"kerberosAccountsRefreshNowLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_REFRESH_NOW_LABEL},
{"kerberosAccountsSetAsActiveAccountLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_SET_AS_ACTIVE_ACCOUNT_LABEL},
{"kerberosAccountsSignedOut", IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_OUT},
{"kerberosAccountsListHeader",
IDS_SETTINGS_KERBEROS_ACCOUNTS_LIST_HEADER},
{"kerberosAccountsRemoveAccountLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_REMOVE_ACCOUNT_LABEL},
{"kerberosAccountsReauthenticationLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_REAUTHENTICATION_LABEL},
{"kerberosAccountsTicketActive",
IDS_SETTINGS_KERBEROS_ACCOUNTS_TICKET_ACTIVE},
{"kerberosAccountsAccountRemovedTip",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REMOVED_TIP},
{"kerberosAccountsAccountRefreshedTip",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REFRESHED_TIP},
{"kerberosAccountsSignedIn", IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_IN},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings);
// Toggles the Chrome OS Kerberos Accounts submenu in the People section.
// Note that the handler is also dependent on this pref.
html_source->AddBoolean("isKerberosEnabled",
IsKerberosEnabled(kerberos_credentials_manager));
PrefService* local_state = g_browser_process->local_state();
// Whether new Kerberos accounts may be added.
html_source->AddBoolean(
"kerberosAddAccountsAllowed",
local_state->GetBoolean(::prefs::kKerberosAddAccountsAllowed));
// Kerberos accounts page with "Learn more" link.
html_source->AddString(
"kerberosAccountsDescription",
l10n_util::GetStringFUTF16(IDS_SETTINGS_KERBEROS_ACCOUNTS_DESCRIPTION,
OsSettingsSection::GetHelpUrlWithBoard(
chrome::kKerberosAccountsLearnMoreURL)));
}
} // namespace
// static
std::unique_ptr<KerberosAccountsHandler>
KerberosAccountsHandler::CreateIfKerberosEnabled(Profile* profile) {
KerberosCredentialsManager* kerberos_credentials_manager =
KerberosCredentialsManagerFactory::GetExisting(profile);
if (!kerberos_credentials_manager ||
!kerberos_credentials_manager->IsKerberosEnabled())
if (!IsKerberosEnabled(kerberos_credentials_manager))
return nullptr;
return base::WrapUnique(
new KerberosAccountsHandler(kerberos_credentials_manager));
}
// static
void KerberosAccountsHandler::AddLoadTimeKerberosStrings(
content::WebUIDataSource* html_source,
KerberosCredentialsManager* kerberos_credentials_manager) {
AddKerberosTitleStrings(html_source);
AddKerberosAccountsPageStrings(html_source, kerberos_credentials_manager);
AddKerberosAddAccountDialogStrings(html_source);
}
KerberosAccountsHandler::~KerberosAccountsHandler() = default;
KerberosAccountsHandler::KerberosAccountsHandler(
......
chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h
View file @ 1f727790
......@@ -17,9 +17,13 @@
#include "chromeos/dbus/kerberos/kerberos_service.pb.h"
#include "components/signin/public/identity_manager/identity_manager.h"
namespace content {
class WebUIDataSource;
} // namespace content
namespace kerberos {
class ListAccountsResponse;
}
} // namespace kerberos
class Profile;
......@@ -32,6 +36,11 @@ class KerberosAccountsHandler : public ::settings::SettingsPageUIHandler,
static std::unique_ptr<KerberosAccountsHandler> CreateIfKerberosEnabled(
Profile* profile);
// Adds load time strings to Kerberos settings UI.
static void AddLoadTimeKerberosStrings(
content::WebUIDataSource* html_source,
KerberosCredentialsManager* kerberos_credentials_manager);
~KerberosAccountsHandler() override;
// WebUIMessageHandler:
......
chrome/browser/ui/webui/settings/chromeos/os_settings_section.h
View file @ 1f727790
......@@ -142,8 +142,9 @@ class OsSettingsSection {
mojom::SearchResultPtr GenerateSectionSearchResult(
double relevance_score) const;
protected:
static base::string16 GetHelpUrlWithBoard(const std::string& original_url);
protected:
static void RegisterNestedSettingBulk(
mojom::Subpage,
const base::span<const mojom::Setting>& settings,
......
chrome/browser/ui/webui/settings/chromeos/people_section.cc
View file @ 1f727790
......@@ -354,72 +354,6 @@ void AddAccountManagerPageStrings(content::WebUIDataSource* html_source) {
chrome::kAccountManagerLearnMoreURL);
}
void AddKerberosAddAccountDialogStrings(content::WebUIDataSource* html_source) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"kerberosAccountsAdvancedConfigLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ADVANCED_CONFIG_LABEL},
{"kerberosAdvancedConfigTitle",
IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_TITLE},
{"kerberosAdvancedConfigDesc",
IDS_SETTINGS_KERBEROS_ADVANCED_CONFIG_DESC},
{"addKerberosAccountRememberPassword",
IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REMEMBER_PASSWORD},
{"kerberosPassword", IDS_SETTINGS_KERBEROS_PASSWORD},
{"kerberosUsername", IDS_SETTINGS_KERBEROS_USERNAME},
{"addKerberosAccountDescription",
IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_DESCRIPTION},
{"kerberosErrorNetworkProblem",
IDS_SETTINGS_KERBEROS_ERROR_NETWORK_PROBLEM},
{"kerberosErrorUsernameInvalid",
IDS_SETTINGS_KERBEROS_ERROR_USERNAME_INVALID},
{"kerberosErrorUsernameUnknown",
IDS_SETTINGS_KERBEROS_ERROR_USERNAME_UNKNOWN},
{"kerberosErrorDuplicatePrincipalName",
IDS_SETTINGS_KERBEROS_ERROR_DUPLICATE_PRINCIPAL_NAME},
{"kerberosErrorContactingServer",
IDS_SETTINGS_KERBEROS_ERROR_CONTACTING_SERVER},
{"kerberosErrorPasswordInvalid",
IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_INVALID},
{"kerberosErrorPasswordExpired",
IDS_SETTINGS_KERBEROS_ERROR_PASSWORD_EXPIRED},
{"kerberosErrorKdcEncType", IDS_SETTINGS_KERBEROS_ERROR_KDC_ENC_TYPE},
{"kerberosErrorGeneral", IDS_SETTINGS_KERBEROS_ERROR_GENERAL},
{"kerberosConfigErrorSectionNestedInGroup",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NESTED_IN_GROUP},
{"kerberosConfigErrorSectionSyntax",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_SYNTAX},
{"kerberosConfigErrorExpectedOpeningCurlyBrace",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXPECTED_OPENING_CURLY_BRACE},
{"kerberosConfigErrorExtraCurlyBrace",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_EXTRA_CURLY_BRACE},
{"kerberosConfigErrorRelationSyntax",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_RELATION_SYNTAX_ERROR},
{"kerberosConfigErrorKeyNotSupported",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KEY_NOT_SUPPORTED},
{"kerberosConfigErrorSectionNotSupported",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_SECTION_NOT_SUPPORTED},
{"kerberosConfigErrorKrb5FailedToParse",
IDS_SETTINGS_KERBEROS_CONFIG_ERROR_KRB5_FAILED_TO_PARSE},
{"addKerberosAccountRefreshButtonLabel",
IDS_SETTINGS_ADD_KERBEROS_ACCOUNT_REFRESH_BUTTON_LABEL},
{"addKerberosAccount", IDS_SETTINGS_ADD_KERBEROS_ACCOUNT},
{"refreshKerberosAccount", IDS_SETTINGS_REFRESH_KERBEROS_ACCOUNT},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings);
PrefService* local_state = g_browser_process->local_state();
// Whether the 'Remember password' checkbox is enabled.
html_source->AddBoolean(
"kerberosRememberPasswordEnabled",
local_state->GetBoolean(::prefs::kKerberosRememberPasswordEnabled));
// Kerberos default configuration.
html_source->AddString(
"defaultKerberosConfig",
chromeos::KerberosCredentialsManager::GetDefaultKerberosConfig());
}
void AddLockScreenPageStrings(content::WebUIDataSource* html_source,
PrefService* pref_service) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
......@@ -786,10 +720,7 @@ void PeopleSection::AddLoadTimeData(content::WebUIDataSource* html_source) {
{"accountManagerSubMenuLabel",
IDS_SETTINGS_ACCOUNT_MANAGER_SUBMENU_LABEL},
{"accountManagerPageTitle", IDS_SETTINGS_ACCOUNT_MANAGER_PAGE_TITLE},
{"kerberosAccountsSubMenuLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_SUBMENU_LABEL},
{"accountManagerPageTitle", IDS_SETTINGS_ACCOUNT_MANAGER_PAGE_TITLE},
{"kerberosAccountsPageTitle", IDS_SETTINGS_KERBEROS_ACCOUNTS_PAGE_TITLE},
{"lockScreenFingerprintTitle",
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
{"manageOtherPeople", IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE},
......@@ -840,8 +771,8 @@ void PeopleSection::AddLoadTimeData(content::WebUIDataSource* html_source) {
base::FeatureList::IsEnabled(omnibox::kDocumentProvider));
AddAccountManagerPageStrings(html_source);
AddKerberosAccountsPageStrings(html_source);
AddKerberosAddAccountDialogStrings(html_source);
KerberosAccountsHandler::AddLoadTimeKerberosStrings(
html_source, kerberos_credentials_manager_);
AddLockScreenPageStrings(html_source, profile()->GetPrefs());
AddFingerprintListStrings(html_source);
AddFingerprintStrings(html_source, AreFingerprintSettingsAllowed());
......@@ -1021,13 +952,13 @@ void PeopleSection::RegisterHierarchy(HierarchyGenerator* generator) const {
mojom::SearchResultIcon::kAvatar,
mojom::SearchResultDefaultRank::kMedium,
mojom::kKerberosAccountsSubpagePath);
static constexpr mojom::Setting kKerberosSettings[] = {
static constexpr mojom::Setting kKerberosAccountsSettings[] = {
mojom::Setting::kAddKerberosTicket,
mojom::Setting::kRemoveKerberosTicket,
mojom::Setting::kSetActiveKerberosTicket,
};
RegisterNestedSettingBulk(mojom::Subpage::kKerberosAccounts,
kKerberosSettings, generator);
kKerberosAccountsSettings, generator);
}
void PeopleSection::FetchAccounts() {
......@@ -1091,54 +1022,6 @@ void PeopleSection::OnKerberosEnabledStateChanged() {
updater.RemoveSearchTags(GetKerberosSearchConcepts());
}
void PeopleSection::AddKerberosAccountsPageStrings(
content::WebUIDataSource* html_source) const {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"kerberosAccountsAddAccountLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ADD_ACCOUNT_LABEL},
{"kerberosAccountsRefreshNowLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_REFRESH_NOW_LABEL},
{"kerberosAccountsSetAsActiveAccountLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_SET_AS_ACTIVE_ACCOUNT_LABEL},
{"kerberosAccountsSignedOut", IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_OUT},
{"kerberosAccountsListHeader",
IDS_SETTINGS_KERBEROS_ACCOUNTS_LIST_HEADER},
{"kerberosAccountsRemoveAccountLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_REMOVE_ACCOUNT_LABEL},
{"kerberosAccountsReauthenticationLabel",
IDS_SETTINGS_KERBEROS_ACCOUNTS_REAUTHENTICATION_LABEL},
{"kerberosAccountsTicketActive",
IDS_SETTINGS_KERBEROS_ACCOUNTS_TICKET_ACTIVE},
{"kerberosAccountsAccountRemovedTip",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REMOVED_TIP},
{"kerberosAccountsAccountRefreshedTip",
IDS_SETTINGS_KERBEROS_ACCOUNTS_ACCOUNT_REFRESHED_TIP},
{"kerberosAccountsSignedIn", IDS_SETTINGS_KERBEROS_ACCOUNTS_SIGNED_IN},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings);
// Toggles the Chrome OS Kerberos Accounts submenu in the People section.
// Note that the handler is also dependent on this pref.
html_source->AddBoolean(
"isKerberosEnabled",
kerberos_credentials_manager_ != nullptr &&
kerberos_credentials_manager_->IsKerberosEnabled());
PrefService* local_state = g_browser_process->local_state();
// Whether new Kerberos accounts may be added.
html_source->AddBoolean(
"kerberosAddAccountsAllowed",
local_state->GetBoolean(::prefs::kKerberosAddAccountsAllowed));
// Kerberos accounts page with "Learn more" link.
html_source->AddString(
"kerberosAccountsDescription",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_KERBEROS_ACCOUNTS_DESCRIPTION,
GetHelpUrlWithBoard(chrome::kKerberosAccountsLearnMoreURL)));
}
bool PeopleSection::AreFingerprintSettingsAllowed() {
return chromeos::quick_unlock::IsFingerprintEnabled(profile());
}
......
chrome/browser/ui/webui/settings/chromeos/people_section.h
View file @ 1f727790
......@@ -77,8 +77,6 @@ class PeopleSection : public OsSettingsSection,
// KerberosCredentialsManager::Observer:
void OnKerberosEnabledStateChanged() override;
void AddKerberosAccountsPageStrings(
content::WebUIDataSource* html_source) const;
bool AreFingerprintSettingsAllowed();
void FetchAccounts();
void UpdateAccountManagerSearchTags(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment