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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/os_crypt/kwallet_dbus.cc

Issue 2150543002: OSCrypt supports encryption with KWallet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 5 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
« components/os_crypt/key_storage_linux.cc ('K') | « components/os_crypt/kwallet_dbus.h ('k') | components/os_crypt/kwallet_dbus_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/os_crypt/kwallet_dbus.cc
diff --git a/components/os_crypt/kwallet_dbus.cc b/components/os_crypt/kwallet_dbus.cc
index f6ec2a1fcec6940aa99522634d12233cd94e5844..eb057e63e7e4a622bb9889264abc60bf77d71a0b 100644
--- a/components/os_crypt/kwallet_dbus.cc
+++ b/components/os_crypt/kwallet_dbus.cc
@@ -68,7 +68,7 @@ bool KWalletDBus::StartKWalletd() {
builder.AppendBool(false); // blind
std::unique_ptr<dbus::Response> response(klauncher->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting klauncher to start " << kwalletd_name_;
return false;
}
@@ -96,7 +96,7 @@ KWalletDBus::Error KWalletDBus::IsEnabled(bool* enabled) {
dbus::MethodCall method_call(kKWalletInterface, "isEnabled");
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (isEnabled)";
return CANNOT_CONTACT;
}
@@ -119,7 +119,7 @@ KWalletDBus::Error KWalletDBus::NetworkWallet(std::string* wallet_name) {
dbus::MethodCall method_call(kKWalletInterface, "networkWallet");
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (networkWallet)";
return CANNOT_CONTACT;
}
@@ -143,7 +143,7 @@ KWalletDBus::Error KWalletDBus::Open(const std::string& wallet_name,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (open)";
return CANNOT_CONTACT;
}
@@ -169,7 +169,7 @@ KWalletDBus::Error KWalletDBus::HasEntry(const int wallet_handle,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (hasEntry)";
return CANNOT_CONTACT;
}
@@ -195,7 +195,7 @@ KWalletDBus::Error KWalletDBus::ReadEntry(const int wallet_handle,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (readEntry)";
return CANNOT_CONTACT;
}
@@ -227,7 +227,7 @@ KWalletDBus::Error KWalletDBus::EntryList(
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (entryList)";
return CANNOT_CONTACT;
}
@@ -253,7 +253,7 @@ KWalletDBus::Error KWalletDBus::RemoveEntry(const int wallet_handle,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (removeEntry)";
return CANNOT_CONTACT;
}
@@ -282,7 +282,7 @@ KWalletDBus::Error KWalletDBus::WriteEntry(const int wallet_handle,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (writeEntry)";
return CANNOT_CONTACT;
}
@@ -306,7 +306,7 @@ KWalletDBus::Error KWalletDBus::HasFolder(const int handle,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
+ if (!response) {
LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (hasFolder)";
return CANNOT_CONTACT;
}
@@ -330,8 +330,8 @@ KWalletDBus::Error KWalletDBus::CreateFolder(const int handle,
builder.AppendString(app_name); // appid
std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
- if (!response.get()) {
- LOG(ERROR) << "Error contacting << " << kwalletd_name_ << " (createFolder)";
+ if (!response) {
+ LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (createFolder)";
return CANNOT_CONTACT;
}
dbus::MessageReader reader(response.get());
@@ -342,3 +342,85 @@ KWalletDBus::Error KWalletDBus::CreateFolder(const int handle,
}
return SUCCESS;
}
+
+KWalletDBus::Error KWalletDBus::WritePassword(const int handle,
+ const std::string& folder_name,
+ const std::string& key,
+ const std::string& password,
+ const std::string& app_name,
+ bool* const write_success_ptr) {
+ dbus::MethodCall method_call(kKWalletInterface, "writePassword");
+ dbus::MessageWriter builder(&method_call);
+ builder.AppendInt32(handle);
+ builder.AppendString(folder_name);
+ builder.AppendString(key);
+ builder.AppendString(password);
+ builder.AppendString(app_name);
+ std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
+ &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
+ if (!response) {
+ LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (writePassword)";
+ return CANNOT_CONTACT;
+ }
+ dbus::MessageReader reader(response.get());
+ int return_code;
+ if (!reader.PopInt32(&return_code)) {
+ LOG(ERROR) << "Error reading response from " << kwalletd_name_
+ << " (writePassword): " << response->ToString();
+ return CANNOT_READ;
+ }
+ *write_success_ptr = return_code == 0;
+ return SUCCESS;
+}
+
+KWalletDBus::Error KWalletDBus::ReadPassword(const int handle,
+ const std::string& folder_name,
+ const std::string& key,
+ const std::string& app_name,
+ std::string* const password_ptr) {
+ dbus::MethodCall method_call(kKWalletInterface, "readPassword");
+ dbus::MessageWriter builder(&method_call);
+ builder.AppendInt32(handle);
+ builder.AppendString(folder_name);
+ builder.AppendString(key);
+ builder.AppendString(app_name);
+ std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
+ &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
+ if (!response) {
+ LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (readPassword)";
+ return CANNOT_CONTACT;
+ }
+ dbus::MessageReader reader(response.get());
+ if (!reader.PopString(password_ptr)) {
+ LOG(ERROR) << "Error reading response from " << kwalletd_name_
+ << " (readPassword): " << response->ToString();
+ return CANNOT_READ;
+ }
+ return SUCCESS;
+}
+
+KWalletDBus::Error KWalletDBus::Close(const int handle,
+ const bool force,
+ const std::string& app_name,
+ bool* success_ptr) {
+ dbus::MethodCall method_call(kKWalletInterface, "close");
+ dbus::MessageWriter builder(&method_call);
+ builder.AppendInt32(handle);
+ builder.AppendBool(force);
+ builder.AppendString(app_name);
+ std::unique_ptr<dbus::Response> response(kwallet_proxy_->CallMethodAndBlock(
+ &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
+ if (!response) {
+ LOG(ERROR) << "Error contacting " << kwalletd_name_ << " (close)";
+ return CANNOT_CONTACT;
+ }
+ dbus::MessageReader reader(response.get());
+ int return_code = 1;
+ if (!reader.PopInt32(&return_code)) {
+ LOG(ERROR) << "Error reading response from " << kwalletd_name_
+ << " (close): " << response->ToString();
+ return CANNOT_READ;
+ }
+ *success_ptr = return_code == 0;
+ return SUCCESS;
+}
« components/os_crypt/key_storage_linux.cc ('K') | « components/os_crypt/kwallet_dbus.h ('k') | components/os_crypt/kwallet_dbus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698