fix pop3 not import message 2022-09-28

Author: hktalent

.github/build/mac.yml

@@ -7,7 +7,7 @@ project_name: scan4all
 builds:
   - id: scan4all-darwin
     ldflags:
-      - -s -w
+      - -s -w -X main.Version={{.Version}}
     binary: scan4all
     env:
       - CGO_ENABLED=1

HomebrewFormula/scan4all.rb

@@ -0,0 +1,16 @@
+class Rage < Formula
+    desc "Official repository vuls Scan: 15000+PoCs; 23 kinds of application password crack; 7000+Web fingerprints; 146 protocols and 90000+ rules Port scanning; Fuzz, HW, awesome BugBounty( ͡° ͜ʖ ͡°)..."
+    homepage "https://scan4all.51pwn.com"
+    url "https://github.com/hktalent/scan4all/releases/download/2.8.1/scan4all_2.8.1_macOS_amd64.zip"
+    sha256 "2af8d9f67bae7c03ef20d064b2f23e7bef4c95f0cf7e1da33cbd42fcceabeb39"
+    version "2.8.1"
+
+    depends_on "rust" => :build
+
+    def install
+        system "cargo", "install", *std_cargo_args(path: './scan4all_2.8.1_macOS_amd64')
+    end
+
+    test do
+    end
+end

README.md

@@ -43,7 +43,7 @@
   * Tomcat
   * Jboss
   * Winrm(wsman)
-  * POP3
+  * POP3/POP3S
 - By default, http password intelligent blasting is enabled, and it will be automatically activated when an HTTP password is required, without manual intervention
 - Detect whether there is nmap in the system, and enable nmap for fast scanning through priorityNmap=true, which is enabled by default, and the optimized nmap parameters are faster than masscan
   Disadvantages of using nmap: Is the network bad, because the traffic network packet is too large, which may lead to incomplete results

README_CN.md

@@ -43,7 +43,7 @@ Vulnerabilities Scan；15000+PoC漏洞扫描；[ 23 ] 种应用弱口令爆破
   * Tomcat
   * Jboss
   * Winrm(wsman)
-  * POP3
+  * POP3/POP3S
 - 默认开启http密码智能爆破，需要 HTTP 密码时才会自动启动，无需人工干预
 - 检测系统是否存在 nmap ，存在通过 priorityNmap=true 启用 nmap 进行快速扫描，默认开启，优化过的 nmap 参数比 masscan 快
   使用 nmap 的弊端：网络不好的是否，因为流量网络包过大可能会导致结果不全

go.mod

@@ -92,6 +92,7 @@ require (
 	github.com/denisenkom/go-mssqldb v0.12.2
 	github.com/dgraph-io/badger v1.6.2
 	github.com/dlclark/regexp2 v1.7.0
+	github.com/emersion/go-message v0.16.0
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/go-routeros/routeros v0.0.0-20210123142807-2a44d57c6730
 	github.com/go-sql-driver/mysql v1.6.0
@@ -104,7 +105,6 @@ require (
 	github.com/icodeface/tls v0.0.0-20190904083142-17aec93c60e5
 	github.com/jlaffaye/ftp v0.1.0
 	github.com/karlseguin/ccache v2.0.3+incompatible
-	github.com/lair-framework/go-nmap v0.0.0-20191202052157-3507e0b03523
 	github.com/lcvvvv/gonmap v1.2.1
 	github.com/lib/pq v1.10.7
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40
@@ -113,6 +113,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/olivere/elastic v6.2.37+incompatible
+	github.com/panjf2000/ants/v2 v2.5.0
 	github.com/projectdiscovery/folderutil v0.0.0-20220523100846-d6161a49c221
 	github.com/projectdiscovery/iputil v0.0.0-20220620153941-036d511e4097
 	github.com/projectdiscovery/nuclei-updatecheck-api v0.0.0-20220726130814-981d44a34f84
@@ -174,6 +175,7 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fortytw2/leaktest v1.3.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
@@ -245,7 +247,6 @@ require (
 	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/openrdap/rdap v0.9.1-0.20191017185644-af93e7ef17b7 // indirect
 	github.com/owenrumney/go-sarif/v2 v2.1.2 // indirect
-	github.com/panjf2000/ants/v2 v2.5.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect

go.sum

@@ -249,6 +249,10 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eggsampler/acme/v3 v3.2.1/go.mod h1:/qh0rKC/Dh7Jj+p4So7DbWmFNzC4dpcpK53r226Fhuo=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/emersion/go-message v0.16.0 h1:uZLz8ClLv3V5fSFF/fFdW9jXjrZkXIpE1Fn8fKx7pO4=
+github.com/emersion/go-message v0.16.0/go.mod h1:pDJDgf/xeUIF+eicT6B/hPX/ZbEorKkUMPOxrPVG2eQ=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
+github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -602,8 +606,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
-github.com/lair-framework/go-nmap v0.0.0-20191202052157-3507e0b03523 h1:N4NQR4on0n3Kc3xlBXUYzCZorFdordwkR2kcZMk9te0=
-github.com/lair-framework/go-nmap v0.0.0-20191202052157-3507e0b03523/go.mod h1:7Em1Lxm3DFdLvXWUZ6bQ/xIbGlxFy7jl07bziQMZ/kU=
 github.com/lcvvvv/gonmap v1.2.1 h1:Itbo0mnH45X9HBdzjn92e0ZTaBbBdfyfxWY21uGUAw8=
 github.com/lcvvvv/gonmap v1.2.1/go.mod h1:USOReUnvvGX9/3h8arU3c6ViJ0dCilM+bTwJWQI4e0A=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=

lib/util/update.go

@@ -11,7 +11,7 @@ import (
 	"runtime"
 )
 
-const Version = `2.7.9`
+var Version = `2.7.9`
 
 var MyName = "scan4all"
 

main.go

@@ -9,15 +9,28 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 	"runtime"
+	"runtime/debug"
 )
 
 //go:embed config/*
 var config embed.FS
 
+// Version can be set at link time to override debug.BuildInfo.Main.Version,
+// which is "(devel)" when building from within the module. See
+// golang.org/issue/29814 and golang.org/issue/29228.
+var Version string
+
 func main() {
 	//os.Args = []string{"", "-host", "http://127.0.0.1"}
 	runtime.GOMAXPROCS(runtime.NumCPU())
 	util.DoInit(&config)
+	// set version
+	if buildInfo, ok := debug.ReadBuildInfo(); ok {
+		util.Version = buildInfo.Main.Version
+	} else {
+		Version = util.Version
+	}
+
 	szTip := ""
 	if util.GetValAsBool("enablDevDebug") {
 		// debug 优化时启用///////////////////////

pkg/hydra/pop3/pop3.go

@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"github.com/emersion/go-message"
 	"net"
 	"strconv"
 	"strings"