From b7d4e185aa585e16ce916563b6ed7fcf0ae6d5e9 Mon Sep 17 00:00:00 2001 From: ZacharyZcR <2903735704@qq.com> Date: Sat, 21 Dec 2024 02:00:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0FTP=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=9D=B6=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestDocker/FTP/README.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 TestDocker/FTP/README.txt diff --git a/TestDocker/FTP/README.txt b/TestDocker/FTP/README.txt new file mode 100644 index 0000000..da06c74 --- /dev/null +++ b/TestDocker/FTP/README.txt @@ -0,0 +1,2 @@ +docker run -d -p 20:20 -p 21:21 -p 47000-48000:47000-48000 -e FTP_USER=admin -e FTP_PASS=123456 -e PASV_ADDRESS=127.0.0.1 --name ftp bogem/ftp +Mac上可能有问题 \ No newline at end of file From 2bfd58663cd159cbeb5fa2f9345f195e55a072a9 Mon Sep 17 00:00:00 2001 From: ZacharyZcR <2903735704@qq.com> Date: Sat, 21 Dec 2024 02:00:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plugins/FTP.go | 3 ++- Plugins/SSH.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/FTP.go b/Plugins/FTP.go index e7e8c28..960ba4b 100644 --- a/Plugins/FTP.go +++ b/Plugins/FTP.go @@ -20,7 +20,8 @@ func FtpScan(info *Common.HostInfo) (tmperr error) { // 尝试匿名登录 flag, err := FtpConn(info, "anonymous", "") if flag && err == nil { - return err + // 匿名登录成功，不需要继续尝试其他密码 + return nil } errlog := fmt.Sprintf("[-] ftp %v:%v %v %v", info.Host, info.Ports, "anonymous", err) Common.LogError(errlog) diff --git a/Plugins/SSH.go b/Plugins/SSH.go index 040b601..960a46e 100644 --- a/Plugins/SSH.go +++ b/Plugins/SSH.go @@ -16,7 +16,7 @@ func SshScan(info *Common.HostInfo) (tmperr error) { return } - threads := 10 // 设置线程数 + threads := Common.BruteThreads // 使用 BruteThreads 来控制线程数 taskChan := make(chan struct { user string pass string From 8767c9bae477d4c0a40a4d3dbaf3f02ff66695ca Mon Sep 17 00:00:00 2001 From: shadow1ng Date: Sat, 21 Dec 2024 13:10:52 +0800 Subject: [PATCH 3/4] update --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 299f7da..fe76099 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/hirochachacha/go-smb2 v1.1.0 github.com/jlaffaye/ftp v0.2.0 github.com/lib/pq v1.10.9 + github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed github.com/satori/go.uuid v1.2.0 github.com/sijms/go-ora/v2 v2.5.29 github.com/stacktitan/smb v0.0.0-20190531122847-da9a425dceb8 @@ -38,7 +39,6 @@ require ( github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-isatty v0.0.3 // indirect - github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed // indirect github.com/stoewer/go-strcase v1.2.0 // indirect go.uber.org/atomic v1.5.0 // indirect go.uber.org/multierr v1.3.0 // indirect @@ -51,6 +51,6 @@ require ( honnef.co/go/tools v0.0.1-2019.2.3 // indirect ) -replace github.com/tomatome/grdp v0.0.0-20211231062539-be8adab7eaf3 => github.com/shadow1ng/grdp v1.0.3 +replace github.com/tomatome/grdp v0.0.0-20211231062539-be8adab7eaf3 => github.com/shadow1ng/grdp v1.0.5 replace github.com/C-Sto/goWMIExec v0.0.1-deva.0.20210704154847-b8ebd6464a06 => github.com/shadow1ng/goWMIExec v0.0.2 diff --git a/go.sum b/go.sum index 4d252f1..c5c710c 100644 --- a/go.sum +++ b/go.sum @@ -208,8 +208,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shadow1ng/goWMIExec v0.0.2 h1:tZdno/F0JVwwpX34fidRqnT7lvobUgelyb/wWd7YgcM= github.com/shadow1ng/goWMIExec v0.0.2/go.mod h1:SWfWb5+XTfacyp4OULdNsxOdsQTjFEpAUEn5JGTCMIA= -github.com/shadow1ng/grdp v1.0.3 h1:d29xgHDK4aa3ljm/e/yThdJxygf26zJyRPBunrWT65k= -github.com/shadow1ng/grdp v1.0.3/go.mod h1:3ZMSLWUvPOwoRr6IwpAQCzKbLEZqT80sbyxxe6YgcTg= +github.com/shadow1ng/grdp v1.0.5 h1:GsfDACbgvPSrVTJ3KcxQe+Fb03aCfWECSBmW9PhCg8s= +github.com/shadow1ng/grdp v1.0.5/go.mod h1:3ZMSLWUvPOwoRr6IwpAQCzKbLEZqT80sbyxxe6YgcTg= github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= From 17c85431ca3a6c064aa26101c842c45973a853ba Mon Sep 17 00:00:00 2001 From: shadow1ng Date: Sat, 21 Dec 2024 13:13:12 +0800 Subject: [PATCH 4/4] update --- Plugins/RDP.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Plugins/RDP.go b/Plugins/RDP.go index 1a642e3..a14255d 100644 --- a/Plugins/RDP.go +++ b/Plugins/RDP.go @@ -31,9 +31,7 @@ type Brutelist struct { // RdpScan 执行RDP服务扫描 func RdpScan(info *Common.HostInfo) (tmperr error) { defer func() { - if err := recover(); err != nil { - fmt.Printf("[!] 扫描错误 %v:%v - %v\n", info.Host, info.Ports, err) - } + recover() }() if Common.DisableBrute { return @@ -120,8 +118,7 @@ func incrNum(num *int, mutex *sync.Mutex) { // RdpConn 尝试RDP连接 func RdpConn(ip, domain, user, password string, port int, timeout int64) (bool, error) { defer func() { - if err := recover(); err != nil { - } + recover() }() target := fmt.Sprintf("%s:%d", ip, port)