jriou/pgterminate
1
0
Fork 0
Code Issues Pull requests Activity

fix: Filters from list and regex both match (#2)

Browse source 
Signed-off-by: Julien Riou <julien@riou.xyz>
This commit is contained in:
Julien Riou 2023-01-20 11:17:44 +01:00
commit 9cff851021
No known key found for this signature in database
GPG key ID: A2EB1F2CA8E3F677
6 changed files with 254 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

78
terminator/terminator.go
View file

@ -84,65 +84,69 @@ func (t *Terminator) filterListeners(sessions []*base.Session) (filtered []*base
// filterUsers include and exclude users based on filters
func (t *Terminator) filterUsers(sessions []*base.Session) []*base.Session {
var included []*base.Session
if t.config.IncludeUsersFilters == nil {
included = sessions
} else {
for _, filter := range t.config.IncludeUsersFilters {
for _, session := range sessions {
if filter.Include(session.User) {
included = append(included, session)
}
for _, filter := range t.config.IncludeUsersFilters {
for _, session := range sessions {
if filter.Include(session.User) && !session.InSlice(included) {
included = append(included, session)
}
}
}
var filtered []*base.Session
if t.config.ExcludeUsersFilters == nil {
filtered = included
} else {
for _, filter := range t.config.ExcludeUsersFilters {
for _, session := range included {
if filter.Include(session.User) {
filtered = append(filtered, session)
}
var excluded []*base.Session
for _, filter := range t.config.ExcludeUsersFilters {
for _, session := range sessions {
if !filter.Include(session.User) && !session.InSlice(excluded) {
excluded = append(excluded, session)
}
}
}
if included == nil {
included = sessions
}
var filtered []*base.Session
for _, session := range included {
if !session.InSlice(excluded) && !session.InSlice(filtered) {
filtered = append(filtered, session)
}
}
return filtered
}
// filterUsers include and exclude databases based on filters
// filterDatabases include and exclude databases based on filters
func (t *Terminator) filterDatabases(sessions []*base.Session) []*base.Session {
var included []*base.Session
if t.config.IncludeDatabasesFilters == nil {
included = sessions
} else {
for _, filter := range t.config.IncludeDatabasesFilters {
for _, session := range sessions {
if filter.Include(session.Db) {
included = append(included, session)
}
for _, filter := range t.config.IncludeDatabasesFilters {
for _, session := range sessions {
if filter.Include(session.Db) && !session.InSlice(included) {
included = append(included, session)
}
}
}
var filtered []*base.Session
if t.config.ExcludeDatabasesFilters == nil {
filtered = included
} else {
for _, filter := range t.config.ExcludeDatabasesFilters {
for _, session := range included {
if filter.Include(session.Db) {
filtered = append(filtered, session)
}
var excluded []*base.Session
for _, filter := range t.config.ExcludeDatabasesFilters {
for _, session := range sessions {
if !filter.Include(session.Db) && !session.InSlice(excluded) {
excluded = append(excluded, session)
}
}
}
if included == nil {
included = sessions
}
var filtered []*base.Session
for _, session := range included {
if !session.InSlice(excluded) && !session.InSlice(filtered) {
filtered = append(filtered, session)
}
}
return filtered
}