fix 1、-v -debug未显示成功爆破密码的bug \n2、优化密码字典 2022-07-02 22:34:1656772441

main.go

@@ -6,6 +6,8 @@ import (
 	"github.com/hktalent/scan4all/pkg/hydra"
 	naaburunner "github.com/hktalent/scan4all/pkg/naabu/v2/pkg/runner"
 	"github.com/projectdiscovery/gologger"
+	"io"
+	"log"
 	"os"
 	"runtime"
 )
@@ -21,6 +23,11 @@ func main() {
 		}
 	}()
 	options := naaburunner.ParseOptions()
+	if false == options.Debug && false == options.Verbose {
+		// disable standard logger (ref: /~https://github.com/golang/go/issues/19895)
+		log.SetFlags(0)
+		log.SetOutput(io.Discard)
+	}
 	pkg.G_Options = options
 	if runtime.GOOS == "windows" {
 		options.NoColor = true

nuclei_Yaml/internal/runner/options.go

@@ -2,8 +2,6 @@ package runner
 
 import (
 	"bufio"
-	"io"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -152,10 +150,6 @@ func configureOutput(options *types.Options) {
 	if options.Silent {
 		gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
 	}
-
-	// disable standard logger (ref: /~https://github.com/golang/go/issues/19895)
-	log.SetFlags(0)
-	log.SetOutput(io.Discard)
 }
 
 // loadResolvers loads resolvers from both user provided flag and file

pkg/config.go

@@ -111,6 +111,15 @@ func GetVal4File(key, szDefault string) string {
 	return szDefault
 }
 
+// 读区配置中的字典文件
+func GetVal4Filedefault(key, szDefault string) string {
+	s := GetVal4File(key,szDefault)
+	if 2 == len(strings.Split(strings.Split(s,"\n")[0],":"){
+		s = strings.ReplaceAll(s,":","\t")
+	}
+	return s
+}
+
 func init() {
 	var ConfigName = "config/config.json"
 	config := viper.New()

pkg/hydra/dicts/ftp_default.txt

@@ -1,4 +1,66 @@
 anonymous	anonymous
-ftp	ftp
+root	rootpasswd
+root	12hrs37
+ftp	b1uRR3
 admin	admin
-admin	123456
+localadmin	localadmin
+admin	1234
+apc	apc
+admin	nas
+Root	wago
+Admin	wago
+User	user
+Guest	guest
+ftp	ftp
+admin	password
+a	avery
+admin	123456
+adtec	none
+admin	admin12345
+none	dpstelecom
+instrument	instrument
+user	password
+root	password
+default	default
+admin	default
+nmt	1234
+admin	Janitza
+supervisor	supervisor
+user1	pass1
+avery	avery
+IEIeMerge	eMerge
+ADMIN	12345
+beijer	beijer
+Admin	admin
+admin	1234
+admin	1111
+root	admin
+se	1234
+admin	stingray
+device	apc
+apc	apc
+dm	ftp
+dmftp	ftp
+httpadmin	fhttpadmin
+user	system
+MELSEC	MELSEC
+QNUDECPU	QNUDECPU
+ftp_boot	ftp_boot
+uploader	ZYPCOM
+ftpuser	password
+USER	USER
+qbf77101	hexakisoctahedron
+ntpupdate	ntpupdate
+sysdiag	factorycast@schneider
+wsupgrade	wsupgrade
+pcfactory	pcfactory
+loader	fwdownload
+test	testingpw
+webserver	webpages
+fdrusers	sresurdf
+nic2212	poiuypoiuy
+user	user00
+su	ko2003wa
+MayGion	maygion.com
+admin	9999
+PlcmSpIp	PlcmSpIp