fix 1、优先使用环境变量，再使用config.json变量；2、优化密码破解代码 2022-07-10 02:12:1657390321

Author: x51pwn

pkg/config.go

@@ -36,11 +36,15 @@ var (
 
 // 优先使用配置文件中的配置，否则从环境变量中读取
 func GetVal(key string) string {
-	key = strings.ToLower(key)
-	if s, ok := mData[key]; ok {
+	key1 := os.Getenv(key)
+	if "" != key1 {
+		return key1
+	}
+	key1 = strings.ToLower(key)
+	if s, ok := mData[key1]; ok {
 		return fmt.Sprintf("%v", s)
 	}
-	return os.Getenv(key)
+	return key1
 }
 func GetValByDefault(key, dftvl string) string {
 	s := GetVal(key)

pkg/hydra/hydra.go

@@ -5,6 +5,7 @@ import (
 	"github.com/hktalent/scan4all/pkg/kscan/lib/gotelnet"
 	"github.com/hktalent/scan4all/pkg/kscan/lib/misc"
 	"github.com/hktalent/scan4all/pkg/kscan/lib/pool"
+	"strings"
 	"time"
 )
 
@@ -19,20 +20,7 @@ type Cracker struct {
 var (
 	DefaultAuthMap map[string]*AuthList
 	CustomAuthMap  *AuthList
-	ProtocolList   = []string{
-		"ssh", "rdp", "ftp", "smb", "telnet",
-		"mysql", "mssql", "oracle", "postgresql", "mongodb", "redis",
-		"rsh-spx",
-		//110:   "pop3",
-		//995:   "pop3",
-		//25:    "smtp",
-		//994:   "smtp",
-		//143:   "imap",
-		//993:   "imap",
-		//389:   "ldap",
-		//23:   "telnet",
-		//50000: "db2",
-	}
+	ProtocolList   = strings.Split("rdp,ssh,rsh-spx,mysql,mssql,oracle,postgresql,redis,ftp,mongodb,smb,telnet", ",")
 )
 
 func NewCracker(info *AuthInfo, isAuthUpdate bool, threads int) *Cracker {
@@ -92,6 +80,7 @@ func (c *Cracker) Run() {
 	case "ldap":
 
 	case "rsh-spx":
+		c.Pool.Function = sshCracker
 	case "ssh":
 		c.Pool.Function = sshCracker
 	case "telnet":
@@ -141,32 +130,22 @@ func (c *Cracker) Run() {
 
 func InitDefaultAuthMap() {
 	m := make(map[string]*AuthList)
-	m = map[string]*AuthList{
-		"rdp":        NewAuthList(),
-		"ssh":        NewAuthList(),
-		"mysql":      NewAuthList(),
-		"mssql":      NewAuthList(),
-		"oracle":     NewAuthList(),
-		"postgresql": NewAuthList(),
-		"redis":      NewAuthList(),
-		"telnet":     NewAuthList(),
-		"mongodb":    NewAuthList(),
-		"smb":        NewAuthList(),
-		"ldap":       NewAuthList(),
-		//"db2":        NewAuthList(),
-
+	m = map[string]*AuthList{}
+	for _, x := range ProtocolList {
+		m[x] = GetDefaultFtpList(x)
 	}
-	m["rdp"] = GetDefaultFtpList("rdp")
-	m["ssh"] = GetDefaultFtpList("ssh")
-	m["mysql"] = GetDefaultFtpList("mysql")
-	m["mssql"] = GetDefaultFtpList("mssql")
-	m["oracle"] = GetDefaultFtpList("oracle")
-	m["postgresql"] = GetDefaultFtpList("postgresql")
-	m["redis"] = GetDefaultFtpList("redis")
-	m["ftp"] = GetDefaultFtpList("ftp")
-	m["mongodb"] = GetDefaultFtpList("mongodb")
-	m["smb"] = GetDefaultFtpList("smb")
-	m["telnet"] = GetDefaultFtpList("telnet")
+	//m["rdp"] = GetDefaultFtpList("rdp")
+	//m["ssh"] = GetDefaultFtpList("ssh")
+	//m["rsh-spx"] = GetDefaultFtpList("ssh")
+	//m["mysql"] = GetDefaultFtpList("mysql")
+	//m["mssql"] = GetDefaultFtpList("mssql")
+	//m["oracle"] = GetDefaultFtpList("oracle")
+	//m["postgresql"] = GetDefaultFtpList("postgresql")
+	//m["redis"] = GetDefaultFtpList("redis")
+	//m["ftp"] = GetDefaultFtpList("ftp")
+	//m["mongodb"] = GetDefaultFtpList("mongodb")
+	//m["smb"] = GetDefaultFtpList("smb")
+	//m["telnet"] = GetDefaultFtpList("telnet")
 	DefaultAuthMap = m
 }
 

pkg/hydra/loadDicts.go

@@ -120,9 +120,9 @@ func init() {
 		DefaultUp: pkg.GetVal4Filedefault("ftp_default", ftp_default),
 	}
 	md["ssh"] = PPDict{
-		Username:  pkg.GetVal4File("ssh_username", ftpusername),
-		Paswd:     pkg.GetVal4File("ssh_pswd", ftp_pswd),
-		DefaultUp: pkg.GetVal4Filedefault("ssh_default", ftp_default),
+		Username:  pkg.GetVal4File("ssh_username", username),
+		Paswd:     pkg.GetVal4File("ssh_pswd", pswd),
+		DefaultUp: pkg.GetVal4Filedefault("ssh_default", ssh_default),
 	}
 	md["rsh-spx"] = md["ssh"]
 	md["mongodb"] = PPDict{