1、优化 pop3、pop3s 密码破解算法，每个目标相同端口，多个密码破解复用一次网络链接，提高破解效率; 2、支持pop3s 995port破解 2022-09-27

Author: hktalent

config/config.json

@@ -58,6 +58,7 @@
   "snmp_user": "pkg/hydra/dicts/snmp_user.txt",
   "snmp_pswd": "pkg/hydra/dicts/snmp_pswd.txt",
   "snmp_default": "pkg/hydra/dicts/snmp_default.txt",
+  "nmapScan": "echo 'Miracle!@#123'|sudo -S nmap ",
   "nmap": "nmap -n --unique --resolve-all -Pn --min-hostgroup 64 --max-retries 0 --host-timeout 10m --script-timeout 3m -oX {filename} --version-intensity 9 --min-rate 10000 -T4 ",
   "HydraUser": "",
   "HydraPass": "",

engine/engine.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/codegangsta/inject"
 	"github.com/hktalent/scan4all/lib/util"
+	"github.com/hktalent/scan4all/pkg/portScan"
 	"github.com/hktalent/scan4all/pocs_go"
-	"github.com/hktalent/scan4all/projectdiscovery/nuclei_Yaml/masscan"
 	"github.com/panjf2000/ants/v2"
 	"log"
 	"sync"
@@ -63,7 +63,9 @@ func (e *Engine) DoCase(ed *EventData) interface{} {
 	if nil != ed {
 		switch ed.EventType {
 		case "masscan":
-			return masscan.ScanTarget
+			return portScan.ScanTarget
+		case "nmap":
+			return portScan.ScanTarget
 		default:
 			return nil
 		}
@@ -128,6 +130,7 @@ func init() {
 						}(x1)
 					})
 				default:
+					util.DoDelayClear()
 					//var f01 float32 = float32(nCnt) / float32(nMax) * float32(100)
 					//fmt.Printf(" Asynchronous go PoCs detection task %%%0.2f ....\r", f01)
 					//<-time.After(time.Duration(1) * time.Second)

lib/util/delayClear.go

@@ -0,0 +1,84 @@
+package util
+
+import (
+	"sync"
+	"time"
+)
+
+// 延时自动初对象
+type delayClearObj struct {
+	GetCacheObj func() interface{} // 返回缓存对象
+	FnCbk       func()             // 回调函数
+	Time        int64              // 开始及时的时间
+	DelayCall   int64              // 延时多少秒调用FnCbk
+}
+
+// cache 延时sec
+//var nCacheTime = time.Second * 60
+
+// 内存清理注册
+var delayClear sync.Map
+
+// 注册延时清理
+//
+//	n0 0表示60秒后执行
+func RegDelayCbk(szKey string, fnCbk func(), cache func() interface{}, n0 int64, DelayCall int64) {
+	delayClear.Store(szKey, &delayClearObj{Time: time.Now().Unix() - n0, FnCbk: fnCbk, GetCacheObj: cache})
+}
+
+// 重时间计数器
+func UpTime(szKey string) {
+	if o, ok := delayClear.Load(szKey); ok {
+		x1 := o.(*delayClearObj)
+		x1.Time = time.Now().Unix()
+		delayClear.Store(szKey, x1)
+	}
+}
+
+// 获取缓存对象
+func GetCache(szKey string, bUpTime bool) interface{} {
+	if o, ok := delayClear.Load(szKey); ok {
+		x1 := o.(*delayClearObj)
+		if bUpTime {
+			UpTime(szKey)
+		}
+		return x1.GetCacheObj()
+	}
+	return nil
+}
+
+// 立刻执行
+func DoNow(szKey string) {
+	if o, ok := delayClear.Load(szKey); ok {
+		x1 := o.(*delayClearObj)
+		x1.FnCbk()
+		delayClear.Delete(szKey)
+	}
+}
+
+// 单实例运行
+var IsDo = make(chan struct{}, 1)
+
+// 延时清理
+func DoDelayClear() {
+	defer func() {
+		<-IsDo
+	}()
+	nN := time.Now().Unix()
+	delayClear.Range(func(key, value any) bool {
+		if nil == value {
+			delayClear.Delete(key)
+			return true
+		}
+		x1 := value.(*delayClearObj)
+		n09 := nN - x1.Time
+		//log.Printf("n09 = %d, now = %d, x1.Time = %d", n09, nN, x1.Time)
+		if n09 >= x1.DelayCall {
+			x1.FnCbk()
+			delayClear.Delete(key)
+			//log.Println("nuclei is closed : ", key)
+		}
+		return true
+	})
+	return
+}

pkg/hydra/doNmapResult.go

@@ -97,7 +97,7 @@ func DoParseXml(s string, bf *bytes.Buffer) {
 							FinalURL:               szUlr,
 							Checklog4j:             false,
 						}
-					} else if bCheckWeakPassword && "110" == szPort && service == "pop3" {
+					} else if bCheckWeakPassword && ("110" == szPort || "995" == szPort) && service == "pop3" {
 						CheckWeakPassword(ip, service, port)
 					} else if "2181" == szPort {
 						util.PocCheck_pipe <- &util.PocCheck{