Skip to content

fix: add proper printing of sha256 passwords #1728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 24, 2023
Merged

fix: add proper printing of sha256 passwords #1728

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6d8d1e
feat(AclFamily): add acl setuser command
kostasrim Aug 22, 2023
f4dbe93
chore: add tests, add overloaded header, improve implementation
kostasrim Aug 23, 2023
d37290a
fix: clang bug on Overloaded
kostasrim Aug 23, 2023
0cf215e
Merge branch 'main' into acl_part_4_add_acl_set_user
kostasrim Aug 23, 2023
20412b9
fix: revert accidental removal of a line in acl_family_test
kostasrim Aug 23, 2023
9d3b767
chore: address gh comments
kostasrim Aug 23, 2023
cc2432d
Merge branch 'main' into acl_part_4_add_acl_set_user
kostasrim Aug 23, 2023
a45e1b2
fix: proper printing of sha256 passwords
kostasrim Aug 23, 2023
1485bbc
chore: apply comments
kostasrim Aug 24, 2023
44d6cb9
chore: address gh comments
kostasrim Aug 24, 2023
9d84a91
Merge branch 'main' into add_pretty_print_of_hashed_passwords
kostasrim Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/server/acl/acl_family.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@

#include "server/acl/acl_family.h"

#include <cctype>
#include <optional>
#include <variant>

#include "absl/strings/ascii.h"
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "core/overloaded.h"
Expand Down Expand Up @@ -50,12 +52,16 @@ void AclFamily::Acl(CmdArgList args, ConnectionContext* cntx) {
void AclFamily::List(CmdArgList args, ConnectionContext* cntx) {
const auto registry_with_lock = ServerState::tlocal()->user_registry->GetRegistryWithLock();
const auto& registry = registry_with_lock.registry;

(*cntx)->StartArray(registry.size());

auto pretty_print_sha = [](std::string_view pass) {
return absl::BytesToHexString(pass.substr(15)).substr(15);
Copy link
Contributor

@dranikpg dranikpg Aug 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand 😄 bytes to hex string returns a string of length 30 (twice the size), why do you need only half of it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I want to print up to 15 characters :D

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay I'm just gonna trust you on this one 🤣

};

for (const auto& [username, user] : registry) {
std::string buffer = "user ";
const std::string_view pass = user.Password();
const std::string password = pass == "nopass" ? "nopass" : std::string(pass.substr(0, 15));
const std::string password = pass == "nopass" ? "nopass" : pretty_print_sha(pass);
const std::string acl_cat = AclToString(user.AclCategory());

using namespace std::string_view_literals;
Expand Down