[+]新增redis指纹

m0s30 · Jan 10, 2022 · e14752f · e14752f
1 parent 2812a33
commit e14752f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/lib/hydra/hydra.go b/lib/hydra/hydra.go
@@ -145,8 +145,8 @@ func InitDefaultAuthMap() {
 
 func InitCustomAuthMap(user, pass []string) {
 	CustomAuthMap = NewAuthList()
-	CustomAuthMap.Password = user
-	CustomAuthMap.Username = pass
+	CustomAuthMap.Username = user
+	CustomAuthMap.Password = pass
 }
 
 func Ok(protocol string) bool {
@@ -177,5 +177,5 @@ func (c *Cracker) OutWatchDog() {
 }
 
 func (c *Cracker) Length() int {
-	return len(c.authList.Password) + len(c.authList.Username) + len(c.authList.Special)
+	return c.authList.Length()
 }
diff --git a/lib/hydra/type-authlist.go b/lib/hydra/type-authlist.go
@@ -1,6 +1,8 @@
 package hydra
 
-import "kscan/lib/misc"
+import (
+	"kscan/lib/misc"
+)
 
 type AuthList struct {
 	Username []string
@@ -15,7 +17,7 @@ func NewAuthList() *AuthList {
 }
 
 func (a *AuthList) IsEmpty() bool {
-	if len(a.Username) > 0 && len(a.Password) > 0 {
+	if len(a.Username) > 0 || len(a.Password) > 0 {
 		return false
 	}
 	return true
@@ -30,9 +32,20 @@ func (a *AuthList) Merge(list *AuthList) {
 }
 
 func (a *AuthList) Replace(list *AuthList) {
-	a.Username = list.Username
-	a.Password = list.Password
+	if len(list.Username) > 0 {
+		a.Username = list.Username
+	}
+	if len(list.Password) > 0 {
+		a.Password = list.Password
+	}
 	a.Special = list.Special
 	a.Username = misc.RemoveDuplicateElement(a.Username)
 	a.Password = misc.RemoveDuplicateElement(a.Password)
 }
+
+func (a *AuthList) Length() int {
+	if len(a.Username) == 0 {
+		return len(a.Password) + len(a.Special)
+	}
+	return (len(a.Password) * len(a.Username)) + len(a.Special)
+}