RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:27:35 +00:00
Code Issues Activity Actions

LibCore: Make get_password return SecretString instead of String

Browse source 
We shouldn't let secrets sit around in memory, as they could potentially
be retrieved by an attacker, or left in memory during a core dump.
This commit is contained in:
Brian Gianforcaro 2021-09-11 09:53:25 -07:00 • committed by Andreas Kling
parent 3bf6902790
commit 9e667453c7
6 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibCore/GetPassword.cpp
View file

@ -13,7 +13,7 @@
namespace Core { namespace Core {
Result<String, OSError> get_password(const StringView& prompt) Result<SecretString, OSError> get_password(const StringView& prompt)
{ {
if (write(STDOUT_FILENO, prompt.characters_without_null_termination(), prompt.length()) < 0) if (write(STDOUT_FILENO, prompt.characters_without_null_termination(), prompt.length()) < 0)
return OSError(errno); return OSError(errno);
@ -44,8 +44,6 @@ Result<String, OSError> get_password(const StringView& prompt)
// Remove trailing '\n' read by getline(). // Remove trailing '\n' read by getline().
password[line_length - 1] = '\0'; password[line_length - 1] = '\0';
String s(password); return SecretString::take_ownership(password, line_length);
free(password);
return s;
} }
} }

3
Userland/Libraries/LibCore/GetPassword.h
View file

@ -9,9 +9,10 @@
#include <AK/OSError.h> #include <AK/OSError.h>
#include <AK/Result.h> #include <AK/Result.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibCore/SecretString.h>
namespace Core { namespace Core {
Result<String, OSError> get_password(const StringView& prompt = "Password: "); Result<SecretString, OSError> get_password(const StringView& prompt = "Password: "sv);
} }

3
Userland/Utilities/passwd.cpp
View file

@ -5,6 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/ScopeGuard.h>
#include <LibCore/Account.h> #include <LibCore/Account.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/GetPassword.h> #include <LibCore/GetPassword.h>
@ -114,7 +115,7 @@ int main(int argc, char** argv)
return 1; return 1;
} }
if (new_password.value() != new_password_retype.value()) { if (new_password.value().view() != new_password_retype.value().view()) {
warnln("Sorry, passwords don't match."); warnln("Sorry, passwords don't match.");
warnln("Password for user {} unchanged.", target_account.username()); warnln("Password for user {} unchanged.", target_account.username());
return 1; return 1;

1
Userland/Utilities/pls.cpp
View file

@ -5,6 +5,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/ScopeGuard.h>
#include <LibCore/Account.h> #include <LibCore/Account.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/GetPassword.h> #include <LibCore/GetPassword.h>

1
Userland/Utilities/su.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/ScopeGuard.h>
#include <LibCore/Account.h> #include <LibCore/Account.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/GetPassword.h> #include <LibCore/GetPassword.h>

8
Userland/Utilities/test-imap.cpp
View file

@ -22,7 +22,7 @@ int main(int argc, char** argv)
bool tls { false }; bool tls { false };
String username; String username;
String password; Core::SecretString password;
bool interactive_password; bool interactive_password;
@ -40,17 +40,17 @@ int main(int argc, char** argv)
warnln("{}", password_or_err.error().string()); warnln("{}", password_or_err.error().string());
return 1; return 1;
} }
password = password_or_err.value(); password = password_or_err.release_value();
} else { } else {
auto standard_input = Core::File::standard_input(); auto standard_input = Core::File::standard_input();
password = standard_input->read_all(); password = Core::SecretString::take_ownership(standard_input->read_all());
} }
Core::EventLoop loop; Core::EventLoop loop;
auto client = IMAP::Client(host, port, tls); auto client = IMAP::Client(host, port, tls);
client.connect()->await(); client.connect()->await();
auto response = client.login(username, password)->await().release_value(); auto response = client.login(username, password.view())->await().release_value();
outln("[LOGIN] Login response: {}", response.response_text()); outln("[LOGIN] Login response: {}", response.response_text());
response = move(client.send_simple_command(IMAP::CommandType::Capability)->await().value().get<IMAP::SolidResponse>()); response = move(client.send_simple_command(IMAP::CommandType::Capability)->await().value().get<IMAP::SolidResponse>());