Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: components/os_crypt/libsecret_util_posix.cc

Issue 1973483002: OSCrypt for POSIX uses libsecret to store a randomised encryption key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Recommendations Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/os_crypt/libsecret_util_posix.h ('k') | components/os_crypt/os_crypt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/os_crypt/libsecret_util_posix.cc
diff --git a/components/os_crypt/libsecret_util_posix.cc b/components/os_crypt/libsecret_util_posix.cc
deleted file mode 100644
index 58ba9d0518aa4495a097fe4cba51de127d5a09ff..0000000000000000000000000000000000000000
--- a/components/os_crypt/libsecret_util_posix.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/os_crypt/libsecret_util_posix.h"
-
-#include <dlfcn.h>
-
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-
-decltype(
- &::secret_password_store_sync) LibsecretLoader::secret_password_store_sync;
-decltype(
- &::secret_service_search_sync) LibsecretLoader::secret_service_search_sync;
-decltype(
- &::secret_password_clear_sync) LibsecretLoader::secret_password_clear_sync;
-decltype(&::secret_item_get_secret) LibsecretLoader::secret_item_get_secret;
-decltype(&::secret_value_get_text) LibsecretLoader::secret_value_get_text;
-decltype(
- &::secret_item_get_attributes) LibsecretLoader::secret_item_get_attributes;
-decltype(&::secret_item_load_secret_sync)
- LibsecretLoader::secret_item_load_secret_sync;
-decltype(&::secret_value_unref) LibsecretLoader::secret_value_unref;
-
-bool LibsecretLoader::libsecret_loaded_ = false;
-
-const LibsecretLoader::FunctionInfo LibsecretLoader::kFunctions[] = {
- {"secret_password_store_sync",
- reinterpret_cast<void**>(&secret_password_store_sync)},
- {"secret_service_search_sync",
- reinterpret_cast<void**>(&secret_service_search_sync)},
- {"secret_password_clear_sync",
- reinterpret_cast<void**>(&secret_password_clear_sync)},
- {"secret_item_get_secret",
- reinterpret_cast<void**>(&secret_item_get_secret)},
- {"secret_value_get_text", reinterpret_cast<void**>(&secret_value_get_text)},
- {"secret_item_get_attributes",
- reinterpret_cast<void**>(&secret_item_get_attributes)},
- {"secret_item_load_secret_sync",
- reinterpret_cast<void**>(&secret_item_load_secret_sync)},
- {"secret_value_unref", reinterpret_cast<void**>(&secret_value_unref)}};
-
-// static
-bool LibsecretLoader::EnsureLibsecretLoaded() {
- return LoadLibsecret() && LibsecretIsAvailable();
-}
-
-// static
-bool LibsecretLoader::LoadLibsecret() {
- if (libsecret_loaded_)
- return true;
-
- void* handle = dlopen("libsecret-1.so.0", RTLD_NOW | RTLD_GLOBAL);
- if (!handle) {
- // We wanted to use libsecret, but we couldn't load it. Warn, because
- // either the user asked for this, or we autodetected it incorrectly. (Or
- // the system has broken libraries, which is also good to warn about.)
- // TODO(crbug.com/607435): Channel this message to the user-facing log
- VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror();
- return false;
- }
-
- for (const auto& function : kFunctions) {
- dlerror();
- *function.pointer = dlsym(handle, function.name);
- const char* error = dlerror();
- if (error) {
- VLOG(1) << "Unable to load symbol " << function.name << ": " << error;
- dlclose(handle);
- return false;
- }
- }
-
- libsecret_loaded_ = true;
- // We leak the library handle. That's OK: this function is called only once.
- return true;
-}
-
-// static
-bool LibsecretLoader::LibsecretIsAvailable() {
- if (!libsecret_loaded_)
- return false;
- // A dummy query is made to check for availability, because libsecret doesn't
- // have a dedicated availability function. For performance reasons, the query
- // is meant to return an empty result.
- LibsecretAttributesBuilder attrs;
- attrs.Append("application", "chrome-string_to_get_empty_result");
- const SecretSchema kDummySchema = {
- "_chrome_dummy_schema",
- SECRET_SCHEMA_DONT_MATCH_NAME,
- {{"application", SECRET_SCHEMA_ATTRIBUTE_STRING},
- {nullptr, SECRET_SCHEMA_ATTRIBUTE_STRING}}};
-
- GError* error = nullptr;
- GList* found =
- secret_service_search_sync(nullptr, // default secret service
- &kDummySchema, attrs.Get(), SECRET_SEARCH_ALL,
- nullptr, // no cancellable ojbect
- &error);
- bool success = (error == nullptr);
- if (error)
- g_error_free(error);
- if (found)
- g_list_free(found);
-
- return success;
-}
-
-LibsecretAttributesBuilder::LibsecretAttributesBuilder() {
- attrs_ = g_hash_table_new_full(g_str_hash, g_str_equal,
- nullptr, // no deleter for keys
- nullptr); // no deleter for values
-}
-
-LibsecretAttributesBuilder::~LibsecretAttributesBuilder() {
- g_hash_table_destroy(attrs_);
-}
-
-void LibsecretAttributesBuilder::Append(const std::string& name,
- const std::string& value) {
- name_values_.push_back(name);
- gpointer name_str =
- static_cast<gpointer>(const_cast<char*>(name_values_.back().c_str()));
- name_values_.push_back(value);
- gpointer value_str =
- static_cast<gpointer>(const_cast<char*>(name_values_.back().c_str()));
- g_hash_table_insert(attrs_, name_str, value_str);
-}
-
-void LibsecretAttributesBuilder::Append(const std::string& name,
- int64_t value) {
- Append(name, base::Int64ToString(value));
-}
« no previous file with comments | « components/os_crypt/libsecret_util_posix.h ('k') | components/os_crypt/os_crypt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698