Skip to content

Flex more for grant super local lookups #9

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 2 commits into from
Mar 6, 2024
Merged

Flex more for grant super local lookups #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
894ebd3
Flex more for grant super lookups.
joel-rieke Mar 6, 2024
46971fb
Flex more for grant super local lookups
joel-rieke Mar 6, 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
12 changes: 9 additions & 3 deletions sql/mysql_db/mysql_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,15 @@ func (db *MySQLDb) GetUser(user string, host string, roleSearch bool) *User {
if len(userEntries) == 1 {
readUserEntry := userEntries[0].(*User)

if host == readUserEntry.Host ||
(host == "127.0.0.1" && readUserEntry.Host == "localhost") ||
(host == "localhost" && readUserEntry.Host == "127.0.0.1") ||
(readUserEntry.Host == "%" && (!roleSearch || host == "")) {
if readUserEntry.IsSuperUser {
return readUserEntry
}
}

if lockTime, isLocked := lockUserMap.GetUser(readUserEntry); isLocked {
if time.Since(lockTime) > time.Hour {
readUserEntry.Locked = false
Expand All @@ -324,9 +333,6 @@ func (db *MySQLDb) GetUser(user string, host string, roleSearch bool) *User {
return nil
}
} else {
if readUserEntry.IsSuperUser {
return readUserEntry
}
return nil
}
}
Expand Down