hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1525 Check exact match first when checking host

Browse Source 
Given a rule like

  ...
  users %@127.0.0.1 match any rules ...

the code started with %@127.0.0.%, which meant that the exact
match rule would be missed.
This commit is contained in:
Johan Wikman
2017-11-16 13:52:28 +02:00
parent 11a240cb15
commit decd5578bc
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/filter/dbfwfilter/dbfwfilter.cc
View File

@ -1272,11 +1272,16 @@ static SUser find_user_data(const UserMap& users, std::string name, std::string
if (it == users.end())
{
snprintf(nameaddr, sizeof(nameaddr), "%%@%s", remote.c_str());
ip_start = strchr(nameaddr, '@') + 1;
it = users.find(nameaddr);
while (it == users.end() && next_ip_class(ip_start))
if (it == users.end())
{
it = users.find(nameaddr);
ip_start = strchr(nameaddr, '@') + 1;
while (it == users.end() && next_ip_class(ip_start))
{
it = users.find(nameaddr);
}
}
}
}