Implement secret storage using libsecret #206
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* Gobby - GTK-based collaborative text editor | ||
| * Copyright (C) 2024 Philipp Kern | ||
| * | ||
| * Permission to use, copy, modify, and/or distribute this software for any | ||
| * purpose with or without fee is hereby granted, provided that the above | ||
| * copyright notice and this permission notice appear in all copies. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| */ | ||
|
|
||
| #include "features.hpp" | ||
| #include "secrets.hpp" | ||
|
|
||
| #ifdef HAVE_LIBSECRET | ||
| # include <libsecret/secret.h> | ||
| #endif | ||
|
|
||
| #include <iostream> | ||
| #include <memory> | ||
| #include <string> | ||
|
|
||
| namespace Gobby { | ||
|
|
||
| namespace { | ||
|
|
||
| #ifdef HAVE_LIBSECRET | ||
| const SecretSchema* get_schema() | ||
| { | ||
| static const SecretSchema secret_schema = { | ||
| "de.0x539.gobby.Password", SECRET_SCHEMA_NONE, | ||
| { | ||
| { "server", SECRET_SCHEMA_ATTRIBUTE_STRING }, | ||
| { "username", SECRET_SCHEMA_ATTRIBUTE_STRING }, | ||
| { "NULL", SECRET_SCHEMA_ATTRIBUTE_STRING }, | ||
| } | ||
| }; | ||
| return &secret_schema; | ||
| } | ||
|
|
||
| extern "C" | ||
| { | ||
pkern marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| void on_password_stored(GObject* source, GAsyncResult* result, gpointer unused) | ||
| { | ||
| GError* error = nullptr; | ||
| secret_password_store_finish(result, &error); | ||
| if (error != nullptr) | ||
| { | ||
| std::cerr << "Failed to store secret: " << error->message << std::endl; | ||
|
There was a problem hiding this comment. If I remember correctly, most other notifications in Gobby use the status bar? I would either make this a class that can have the status bar as a member, so it can show the error there, or propagate the error back to the caller. |
||
| g_error_free(error); | ||
| } | ||
| } | ||
|
|
||
| void on_password_lookup(GObject* source, GAsyncResult* result, gpointer user_data) | ||
| { | ||
| std::unique_ptr<LookupCallback> password_callback{reinterpret_cast<LookupCallback*>(user_data)}; | ||
| GError *error = nullptr; | ||
| gchar* password = secret_password_lookup_finish(result, &error); | ||
| if (error != nullptr) | ||
| { | ||
| std::cerr << "Failed to lookup secret: " << error->message << std::endl; | ||
|
There was a problem hiding this comment. Same here about error handling |
||
| g_error_free(error); | ||
| (*password_callback)(std::nullopt); | ||
| } | ||
| else if (password == nullptr) | ||
| { | ||
| (*password_callback)(std::nullopt); | ||
| } | ||
| else | ||
| { | ||
| (*password_callback)(password); | ||
| secret_password_free(password); | ||
| } | ||
| } | ||
|
|
||
| } // extern "C" | ||
| #endif | ||
|
|
||
| } // namespace | ||
|
|
||
| void store_secret(const std::string& server, const std::string& username, const std::string& password) | ||
| { | ||
| #ifdef HAVE_LIBSECRET | ||
| const std::string label = "Gobby password for \"" + username + "\" on \"" + server + "\""; | ||
| secret_password_store(get_schema(), | ||
| SECRET_COLLECTION_DEFAULT, | ||
| label.c_str(), | ||
| password.c_str(), | ||
| /*cancellable=*/NULL, | ||
| on_password_stored, | ||
| /*user_data=*/NULL, | ||
| "server", server.c_str(), | ||
| "username", username.c_str(), | ||
| NULL); | ||
| #endif | ||
| } | ||
|
|
||
| void lookup_secret(const std::string& server, const std::string& username, LookupCallback password_callback) | ||
| { | ||
| #ifdef HAVE_LIBSECRET | ||
| auto callback = std::make_unique<LookupCallback>(password_callback); | ||
| secret_password_lookup(get_schema(), | ||
| /*cancellable=*/NULL, | ||
| on_password_lookup, | ||
| /*user_data=*/static_cast<void*>(callback.release()), | ||
| "server", server.c_str(), | ||
| "username", username.c_str(), | ||
| NULL); | ||
| #else | ||
| password_callback(std::nullopt); | ||
| #endif | ||
| } | ||
|
|
||
| } // namespace Gobby | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* Gobby - GTK-based collaborative text editor | ||
| * Copyright (C) 2024 Philipp Kern | ||
| * | ||
| * Permission to use, copy, modify, and/or distribute this software for any | ||
| * purpose with or without fee is hereby granted, provided that the above | ||
| * copyright notice and this permission notice appear in all copies. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef _GOBBY_UTIL_SECRETS_HPP_ | ||
| #define _GOBBY_UTIL_SECRETS_HPP_ | ||
|
|
||
| #include <functional> | ||
| #include <optional> | ||
| #include <string> | ||
|
|
||
| namespace Gobby | ||
| { | ||
|
|
||
| using LookupCallback = std::function<void(std::optional<std::string> password)>; | ||
pkern marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // lookup_secret asynchronously attempts to lookup the password for the given | ||
| // server and username combination in the keyring. Once the lookup attempt | ||
| // completes, the callback is called. | ||
| void lookup_secret(const std::string& server, const std::string& username, LookupCallback password_callback); | ||
|
|
||
| // store_secret asynchronously attempts to store the password for the given server | ||
| // and username in the keyring. | ||
| void store_secret(const std::string& server, const std::string& username, const std::string& password); | ||
|
|
||
| } // namespace Gobby | ||
|
|
||
| #endif // _GOBBY_UTIL_SECRETS_HPP_ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggest to move this into the anonymous namespace at the top of the file