From 8e055b4a8103b3d2dacf12b20933537f455c997e Mon Sep 17 00:00:00 2001
From: sairson <zirs0n@qq.com>
Date: Wed, 26 Jan 2022 18:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=AD=97=E5=85=B8=E6=8D=A2=E8=A1=8C=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E7=94=A8=E6=88=B7=E7=88=86=E7=A0=B4=E6=97=B6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=AD=97=E5=85=B8=E8=B7=AF=E5=BE=84=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0--ud=20"administrator"=20--pd=20"123456,11123?=
 =?UTF-8?q?"=20=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/brute.go | 18 ++++++++++++++++--
 cmd/ssh.go   |  1 +
 pass.txt     |  1 +
 user.txt     |  3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cmd/brute.go b/cmd/brute.go
index 642c57d..e99bf0f 100644
--- a/cmd/brute.go
+++ b/cmd/brute.go
@@ -85,6 +85,7 @@ func BurpCall(EncryptMap map[string]interface{}, name string, params ...interfac
 		args[k] = reflect.ValueOf(param)
 	}
 	//Println()(args)
+	//fmt.Println(args)
 	return f.Call(args) // 调用函数并返回结果
 }
 
@@ -209,6 +210,11 @@ func Readiness(file *os.File) []string {
 			return readiness
 		}
 		str := strings.TrimSpace(string(data))
+		// 修复读取时出现空的导致抛出panic
+		if str == "" {
+			continue
+		}
+
 		readiness = append(readiness, str) /*将去除换行符的字符串写入切片*/
 	}
 	return readiness
@@ -219,7 +225,15 @@ func ReadTextToDic(service, user, pass string) ([]string, []string) {
 		userdic = config.Userdict[service]
 		passdic = config.Passwords
 	)
-	if user != "" {
+	// 入过不包含.txt的话，按照用户名和密码来算。其中
+	if !strings.Contains(user, ".txt") {
+		userdic = strings.Split(user, ",")
+	}
+	if !strings.Contains(pass, ".txt") {
+		passdic = strings.Split(pass, ",")
+	}
+
+	if user != "" && strings.Contains(user, ".txt") {
 		userive, err := os.Open(user)
 		if err != nil {
 			Println(fmt.Sprintf(Clearln+"[ERROR] Open %s is failed,please check your user dic path", UserDic))
@@ -227,7 +241,7 @@ func ReadTextToDic(service, user, pass string) ([]string, []string) {
 		}
 		userdic = Readiness(userive)
 	}
-	if pass != "" {
+	if pass != "" && strings.Contains(pass, ".txt") {
 		passive, err := os.Open(pass)
 		if err != nil {
 			Println(fmt.Sprintf(Clearln+"[ERROR] Open %s is failed,please check your pass dic path", PassDic))
diff --git a/cmd/ssh.go b/cmd/ssh.go
index 1b91f0e..6b41ca9 100644
--- a/cmd/ssh.go
+++ b/cmd/ssh.go
@@ -48,6 +48,7 @@ func BruteSshByUser() {
 		}
 		if BruteFlag == true {
 			users, pass := ReadTextToDic("ssh", UserDic, PassDic)
+			fmt.Println(users, pass)
 			Println(Clearln + "[*] Brute Module [ssh]")
 			Println(fmt.Sprintf(Clearln+"[*] Have [user:%v] [pass:%v] [request:%v]", len(users), len(pass), len(users)*len(pass)*len(ips)))
 			SwitchBurp("ssh", users, pass, ips, BrutePort, Runtime, TimeDuration, "")
diff --git a/pass.txt b/pass.txt
index b82149f..5d7cf4e 100644
--- a/pass.txt
+++ b/pass.txt
@@ -1,3 +1,4 @@
 123456
 P@ssw0rd
 930517
+kali
diff --git a/user.txt b/user.txt
index 78b2058..dafb523 100644
--- a/user.txt
+++ b/user.txt
@@ -1,2 +1,5 @@
 administrator
 Oadmin
+kali
+root
+