Skip to content

Commit db5b0a6

Browse files
committed
refactor(param): move GetDupUserNames to objUtil.go
1 parent 70b8351 commit db5b0a6

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

src/param/main.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,3 @@ type Param struct {
6565
AccessLog string
6666
ErrorLog string
6767
}
68-
69-
func (param *Param) GetDupUserNames() []string {
70-
usersGroups := [][]*user{
71-
param.UsersPlain,
72-
param.UsersBase64,
73-
param.UsersMd5,
74-
param.UsersSha1,
75-
param.UsersSha256,
76-
param.UsersSha512,
77-
}
78-
79-
userMap := map[string]bool{}
80-
dupUserMap := map[string]bool{}
81-
82-
for _, users := range usersGroups {
83-
for _, user := range users {
84-
if userMap[user.Username] {
85-
dupUserMap[user.Username] = true
86-
}
87-
userMap[user.Username] = true
88-
}
89-
}
90-
91-
dupUserNames := make([]string, 0, len(dupUserMap))
92-
for username, _ := range dupUserMap {
93-
dupUserNames = append(dupUserNames, username)
94-
}
95-
return dupUserNames
96-
}

src/param/objUtil.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,32 @@ func WildcardToRegexp(wildcards []string, found bool) (*regexp.Regexp, error) {
4949
exp := strings.Join(normalizedWildcards, "|")
5050
return regexp.Compile(exp)
5151
}
52+
53+
func (param *Param) GetDupUserNames() []string {
54+
usersGroups := [][]*user{
55+
param.UsersPlain,
56+
param.UsersBase64,
57+
param.UsersMd5,
58+
param.UsersSha1,
59+
param.UsersSha256,
60+
param.UsersSha512,
61+
}
62+
63+
userMap := map[string]bool{}
64+
dupUserMap := map[string]bool{}
65+
66+
for _, users := range usersGroups {
67+
for _, user := range users {
68+
if userMap[user.Username] {
69+
dupUserMap[user.Username] = true
70+
}
71+
userMap[user.Username] = true
72+
}
73+
}
74+
75+
dupUserNames := make([]string, 0, len(dupUserMap))
76+
for username, _ := range dupUserMap {
77+
dupUserNames = append(dupUserNames, username)
78+
}
79+
return dupUserNames
80+
}

0 commit comments

Comments
 (0)