From b4e33c512788bdb47cc131dd51cc353c1edce125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=B1=E8=88=9E=E8=80=85?= <shadow1ng@qq.com>
Date: Sat, 11 Sep 2021 16:43:38 +0800
Subject: [PATCH] update ParseUser()

---
 common/Parse.go  | 24 +++++++++++-------------
 common/config.go |  4 +++-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/Parse.go b/common/Parse.go
index 7431b24..6e56fac 100644
--- a/common/Parse.go
+++ b/common/Parse.go
@@ -19,17 +19,14 @@ func Parse(Info *HostInfo) {
 }
 
 func ParseUser(Info *HostInfo) {
-	if Info.Username != "" {
-		users := strings.Split(Info.Username, ",")
-		for _, user := range users {
-			if user != "" {
-				Info.Usernames = append(Info.Usernames, user)
-			}
-		}
-		for name := range Userdict {
-			Userdict[name] = Info.Usernames
-		}
+	if Info.Username == "" && Userfile == "" {
+		return
 	}
+
+	if Info.Username != "" {
+		Info.Usernames = strings.Split(Info.Username, ",")
+	}
+
 	if Userfile != "" {
 		users, err := Readfile(Userfile)
 		if err == nil {
@@ -38,12 +35,13 @@ func ParseUser(Info *HostInfo) {
 					Info.Usernames = append(Info.Usernames, user)
 				}
 			}
-			for name := range Userdict {
-				Userdict[name] = Info.Usernames
-			}
 		}
 	}
 
+	Info.Usernames = RemoveDuplicate(Info.Usernames)
+	for name := range Userdict {
+		Userdict[name] = Info.Usernames
+	}
 }
 
 func ParsePass(Info *HostInfo) {
diff --git a/common/config.go b/common/config.go
index c947451..ac2d9c9 100644
--- a/common/config.go
+++ b/common/config.go
@@ -10,7 +10,7 @@ var Userdict = map[string][]string{
 	"mongodb":    {"root", "admin"},
 }
 
-var Passwords = []string{"123456", "admin", "admin123", "root", "", "pass123", "pass@123", "password", "123123", "654321", "111111", "123", "1", "admin@123", "Admin@123", "admin123!@#", "{user}", "{user}1", "{user}111", "{user}123", "{user}@123", "{user}_123", "{user}#123", "{user}@111", "{user}@2019", "{user}@123#4", "P@ssw0rd!", "P@ssw0rd", "Passw0rd", "qwe123", "12345678", "test", "test123", "123qwe!@#", "123456789", "123321", "666666", "a123456.", "123456~a", "123456!a", "000000", "1234567890", "8888888", "!QAZ2wsx", "1qaz2wsx", "abc123", "abc123456", "1qaz@WSX", "a11111", "a12345", "Aa1234", "Aa1234.", "Aa12345", "a123456", "a123123", "Aa123123", "Aa123456", "Aa12345.", "sysadmin", "system", "1qaz!QAZ", "2wsx@WSX", "qwe123!@#", "Aa123456!", "A123456s!", "sa123456"}
+var Passwords = []string{"123456", "admin", "admin123", "root", "", "pass123", "pass@123", "password", "123123", "654321", "111111", "123", "1", "admin@123", "Admin@123", "admin123!@#", "{user}", "{user}1", "{user}111", "{user}123", "{user}@123", "{user}_123", "{user}#123", "{user}@111", "{user}@2019", "{user}@123#4", "P@ssw0rd!", "P@ssw0rd", "Passw0rd", "qwe123", "12345678", "test", "test123", "123qwe!@#", "123456789", "123321", "666666", "a123456.", "123456~a", "123456!a", "000000", "1234567890", "8888888", "!QAZ2wsx", "1qaz2wsx", "abc123", "abc123456", "1qaz@WSX", "a11111", "a12345", "Aa1234", "Aa1234.", "Aa12345", "a123456", "a123123", "Aa123123", "Aa123456", "Aa12345.", "sysadmin", "system", "1qaz!QAZ", "2wsx@WSX", "qwe123!@#", "Aa123456!", "A123456s!", "sa123456", "1q2w3e"}
 var PORTList = map[string]int{
 	"ftp":         21,
 	"ssh":         22,
@@ -28,6 +28,7 @@ var PORTList = map[string]int{
 	"cve20200796": 1000002,
 	"web":         1000003,
 	"smb2":        1000004,
+	"wmi":         1000005,
 	"all":         0,
 	"portscan":    0,
 	"icmp":        0,
@@ -77,6 +78,7 @@ var (
 	TmpOutputfile string
 	TmpSave       bool
 	IsPing        bool
+	IsWmi         bool
 	Ping          bool
 	Pocinfo       PocInfo
 	IsWebCan      bool