Skip to content
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

fix:black list #2

Merged
merged 3 commits into from
Mar 7, 2024
Merged

fix:black list #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e097388
修复 bug
Mar 7, 2024
bdc2b83
support config get userblacklist
Mar 7, 2024
572a2d2
fix acl
Mar 7, 2024
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
2 changes: 1 addition & 1 deletion include/acl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ class Acl {
static std::vector<std::string> GetAllCategoryName();

static const std::string DefaultUser;
static const std::string Limit;
static const std::string DefaultLimitUser;
static const int64_t LogGroupingMaxTimeDelta;

// Adds a new entry in the ACL log, making sure to delete the old entry
Expand Down
16 changes: 10 additions & 6 deletions src/acl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ pstd::Status Acl::Initialization() {
UpdateDefaultUserPassword(g_pika_conf->requirepass());

auto status = LoadUsersAtStartup();
auto u = GetUser(Limit);
auto u = GetUser(DefaultLimitUser);
bool limit_exist = true;
if (nullptr == u) {
AddUser(CreatedUser(Limit));
AddUser(CreatedUser(DefaultLimitUser));
limit_exist = false;
}
InitLimitUser(g_pika_conf->GetUserBlackList(), limit_exist);
Expand Down Expand Up @@ -486,13 +486,16 @@ void Acl::InitLimitUser(const std::string& bl, bool limit_exist) {
std::vector<std::string> blacklist;
pstd::StringSplit(bl, ',', blacklist);
std::unique_lock wl(mutex_);
auto u = GetUser(Limit);
auto u = GetUser(DefaultLimitUser);
if (limit_exist) {
if (!bl.empty()) {
u->SetUser("+@all");
for(auto& i : blacklist) {
u->SetUser("-"+i);
}
if (!pass.empty()) {
u->SetUser(">"+pass);
}
}
} else {
if (pass.empty()) {
Expand All @@ -505,8 +508,9 @@ void Acl::InitLimitUser(const std::string& bl, bool limit_exist) {
u->SetUser("~*");
u->SetUser("&*");

for(auto& i : blacklist) {
u->SetUser("-"+i);
for(auto& cmd : blacklist) {
cmd = pstd::StringTrim(cmd, " ");
u->SetUser("-" + cmd);
}
}
}
Expand Down Expand Up @@ -763,7 +767,7 @@ std::array<std::pair<std::string, uint32_t>, 3> Acl::SelectorFlags = {{
}};

const std::string Acl::DefaultUser = "default";
const std::string Acl::Limit = "limit";
const std::string Acl::DefaultLimitUser = "limit";
const int64_t Acl::LogGroupingMaxTimeDelta = 60000;

void Acl::AddLogEntry(int32_t reason, int32_t context, const std::string& username, const std::string& object,
Expand Down
8 changes: 6 additions & 2 deletions src/pika_admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ void AuthCmd::Do() {
authResult = AuthenticateUser(name(), Acl::DefaultUser, pwd, conn, true);
if (authResult != AuthResult::OK) {
// Limit
authResult = AuthenticateUser(name(), Acl::Limit, pwd, conn, defaultAuth);
authResult = AuthenticateUser(name(), Acl::DefaultLimitUser, pwd, conn, defaultAuth);
}
} else {
authResult = AuthenticateUser(name(), userName, pwd, conn, defaultAuth);
Expand Down Expand Up @@ -1587,7 +1587,11 @@ void ConfigCmd::ConfigGet(std::string& ret) {
EncodeString(&config_body, "slow-cmd-thread-pool-size");
EncodeNumber(&config_body, g_pika_conf->slow_cmd_thread_pool_size());
}

if (pstd::stringmatch(pattern.data(), "userblacklist", 1) != 0) {
elements += 2;
EncodeString(&config_body, "userblacklist");
EncodeString(&config_body, g_pika_conf -> GetUserBlackList());
}
if (pstd::stringmatch(pattern.data(), "slow-cmd-list", 1) != 0) {
elements += 2;
EncodeString(&config_body, "slow-cmd-list");
Expand Down
2 changes: 1 addition & 1 deletion src/pika_conf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ int PikaConf::ConfigRewrite() {
SetConfStr("requirepass", requirepass_);
SetConfStr("masterauth", masterauth_);
SetConfStr("userpass", userpass_);
// SetConfStr("userblacklist", userblacklist_);
SetConfStr("userblacklist", userblacklist_);
SetConfStr("dump-prefix", bgsave_prefix_);
SetConfInt("maxclients", maxclients_);
SetConfInt("dump-expire", expire_dump_days_);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/acl.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ start_server {tags {"acl external:skip"}} {

test {Coverage: ACL USERS} {
r ACL USERS
} {default newuser}
} {default limit newuser}

test {Usernames can not contain spaces or null characters} {
catch {r ACL setuser "a a"} err
Expand Down
Loading