diff --git a/Plugins/ssh.go b/Plugins/ssh.go index 1332955..bb7cf33 100644 --- a/Plugins/ssh.go +++ b/Plugins/ssh.go @@ -43,7 +43,7 @@ func SshConn(info *common.HostInfo, user string, pass string) (flag bool, err er Host, Port, Username, Password := info.Host, info.Ports, user, pass Auth := []ssh.AuthMethod{} if info.SshKey != "" { - pemBytes, err := ioutil.ReadFile("shadow") + pemBytes, err := ioutil.ReadFile(info.SshKey) if err != nil { return false, errors.New("read key failed" + err.Error()) } diff --git a/WebScan/info/rules.go b/WebScan/info/rules.go index 86a1e82..27e27b4 100644 --- a/WebScan/info/rules.go +++ b/WebScan/info/rules.go @@ -153,4 +153,5 @@ var Md5Datas = []Md5Data{ {"泛微OA", "9b1d3f08ede38dbe699d6b2e72a8febb"}, {"泛微OA", "281348dd57383c1f214ffb8aed3a1210"}, {"GitLab", "85c754581e1d4b628be5b7712c042224"}, + {"Hikvision-视频监控", "89b932fcc47cf4ca3faadb0cfdef89cf"}, } diff --git a/WebScan/lib/client.go b/WebScan/lib/client.go index 1fd0e73..87e5de0 100644 --- a/WebScan/lib/client.go +++ b/WebScan/lib/client.go @@ -60,11 +60,9 @@ func InitHttpClient(ThreadsNum int, DownProxy string, Timeout time.Duration) err Timeout: Timeout, } ClientNoRedirect = &http.Client{ - Transport: tr, - Timeout: Timeout, - } - ClientNoRedirect.CheckRedirect = func(req *http.Request, via []*http.Request) error { - return http.ErrUseLastResponse + Transport: tr, + Timeout: Timeout, + CheckRedirect: func(req *http.Request, via []*http.Request) error { return http.ErrUseLastResponse }, } return nil } diff --git a/common/config.go b/common/config.go index 98a37ab..a2a4e7e 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!"} +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 PORTList = map[string]int{ "ftp": 21, "ssh": 22,