增加-ping 参数,作用是存活探测模块用ping代替icmp发包。

Plugins/icmp.go

@@ -18,6 +18,8 @@ var icmp ICMP
 
 var AliveHosts []string
 
+var SysInfo = GetSys()
+
 type ICMP struct {
 	Type        uint8
 	Code        uint8
@@ -136,20 +138,23 @@ func IcmpCheck(hostslist []string,IcmpThreads int) {
 	wg.Wait()
 }
 
-
 func ExecCommandPing(ip string, bsenv string) bool {
-	command := exec.Command(bsenv, "-c", "ping -c 1 -w 1 "+ip+" >/dev/null && echo true || echo false")  //ping -c 1 -i 0.5 -t 4 -W 2 -w 5 "+ip+" >/dev/null && echo true || echo false"
+	var command *exec.Cmd
+	if SysInfo.OS == "windows" {
+		command = exec.Command("cmd", "/c", "ping -n 1 -w 1 "+ip+" && echo true || echo false") //ping -c 1 -i 0.5 -t 4 -W 2 -w 5 "+ip+" >/dev/null && echo true || echo false"
+	} else {
+		command = exec.Command(bsenv, "-c", "ping -c 1 -w 1 "+ip+" >/dev/null && echo true || echo false") //ping -c 1 -i 0.5 -t 4 -W 2 -w 5 "+ip+" >/dev/null && echo true || echo false"
+	}
 	outinfo := bytes.Buffer{}
 	command.Stdout = &outinfo
 	err := command.Start()
 	if err != nil {
 		return false
 	}
-
 	if err = command.Wait(); err != nil {
 		return false
 	} else {
-		if(strings.Contains(outinfo.String(), "true")) {
+		if strings.Contains(outinfo.String(), "true") {
 			return true
 		} else {
 			return false
@@ -177,25 +182,34 @@ func PingCMDcheck(hostslist []string,bsenv string) {
 	}
 	wg.Wait()
 }
+func ICMPRun(hostslist []string, IcmpThreads int, Ping bool) []string {
 
-func ICMPRun(hostslist []string,IcmpThreads int)  []string{
+	if SysInfo.OS == "windows" {
-	var sysinfo SystemInfo
+		if Ping == false {
-	sysinfo = GetSys()
-
-	if sysinfo.OS == "windows" {
 			IcmpCheck(hostslist, IcmpThreads)
-	}else if sysinfo.OS == "linux" {
+		} else {
-		if (sysinfo.Groupid == "0" || sysinfo.Userid == "0" || sysinfo.Username == "root") {
+			PingCMDcheck(hostslist, "")
+		}
+	} else if SysInfo.OS == "linux" {
+		if SysInfo.Groupid == "0" || SysInfo.Userid == "0" || SysInfo.Username == "root" {
+			if Ping == false {
 				IcmpCheck(hostslist, IcmpThreads)
 			} else {
 				PingCMDcheck(hostslist, "/bin/bash")
 			}
-	}else if sysinfo.OS == "darwin" {
+		} else {
-		if (sysinfo.Groupid == "0" || sysinfo.Userid == "0" || sysinfo.Username == "root") {
+			PingCMDcheck(hostslist, "/bin/bash")
+		}
+	} else if SysInfo.OS == "darwin" {
+		if SysInfo.Groupid == "0" || SysInfo.Userid == "0" || SysInfo.Username == "root" {
+			if Ping == false {
 				IcmpCheck(hostslist, IcmpThreads)
 			} else {
 				PingCMDcheck(hostslist, "/usr/local/bin/bash")
 			}
+		} else {
+			PingCMDcheck(hostslist, "/usr/local/bin/bash")
+		}
 	}
 	return AliveHosts
 }

Plugins/scanner.go

@@ -15,10 +15,8 @@ func scan_func(m map[string]interface{}, name string, infos ...interface{}) (res
 	f := reflect.ValueOf(m[name])
 	if len(infos) != f.Type().NumIn() {
 		err = errors.New("The number of infos is not adapted.")
-		if err != nil {
 		fmt.Println(err.Error())
 	}
-	}
 	in := make([]reflect.Value, len(infos))
 	for k, info := range infos {
 		in[k] = reflect.ValueOf(info)
@@ -39,7 +37,7 @@ func Scan(info common.HostInfo) {
 	fmt.Println("scan start")
 	Hosts, _ := common.ParseIP(info.Host, info.HostFile)
 	if info.Isping == false {
-		Hosts = ICMPRun(Hosts, info.IcmpThreads)
+		Hosts = ICMPRun(Hosts, info.IcmpThreads, info.Ping)
 		fmt.Println("icmp alive hosts len is:", len(Hosts))
 	}
 	_, AlivePorts := TCPportScan(Hosts, info.Ports, "icmp", 3) //return AliveHosts,AlivePorts

Plugins/webtitle.go

@@ -4,13 +4,12 @@ import (
 	"crypto/tls"
 	"fmt"
 	"github.com/shadow1ng/fscan/WebScan"
+	"github.com/shadow1ng/fscan/common"
 	"io/ioutil"
 	"net/http"
 	"regexp"
 	"sync"
 	"time"
-
-	"github.com/shadow1ng/fscan/common"
 )
 
 func WebTitle(info *common.HostInfo, ch chan int, wg *sync.WaitGroup) (err error, result string) {
@@ -33,7 +32,6 @@ func WebTitle(info *common.HostInfo, ch chan int, wg *sync.WaitGroup) (err error
 
 func geturl(info *common.HostInfo) (err error, result string) {
 	url := info.Url
-	info.Timeout = 20
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}

README.md

@@ -14,6 +14,7 @@
    因为用习惯了f-scrack，习惯一条命令跑完所有模块，省去一个个模块单独调用的时间，当然我附加了-m 指定模块的功能。
 
 ## 最近更新
+[+] 2020/11/17 增加-ping 参数,作用是存活探测模块用ping代替icmp发包。 
 [+] 2020/11/17 增加WebScan模块,新增shiro简单识别。https访问时,跳过证书认证。将服务模块和web模块的超时分开,增加-wt 参数(WebTimeout)。    
 [+] 2020/11/16 对icmp模块进行优化,增加-it 参数(IcmpThreads),默认11000,适合扫B段  
 [+] 2020/11/15 支持ip以文件导入,-hs ip.txt,并对去重做了处理
@@ -46,7 +47,7 @@ fscan.exe -h 192.168.1.1/24 -m ms17010 (指定模块)
   -hf string
         host file, -hs ip.txt
   -it int
-        Icmp Threads nums (default 3000)
+        Icmp Threads nums (default 11000)
   -m string
         Select scan type ,as: -m ssh (default "all")
   -no
@@ -57,6 +58,8 @@ fscan.exe -h 192.168.1.1/24 -m ms17010 (指定模块)
         Outputfile (default "result.txt")
   -p string
         Select a port,for example: 22 | 1-65535 | 22,80,3306 (default "21,22,23,80,135,443,445,1433,1521,3306,5432,6379,7001,8080,8089,9000,9200,11211,27017")
+  -ping
+        using ping replace icmp
   -pwd string
         password
   -pwdf string
@@ -73,6 +76,8 @@ fscan.exe -h 192.168.1.1/24 -m ms17010 (指定模块)
         username
   -userf string
         username file
+  -wt int
+        Set web timeout (default 3)
 
 ```
 

common/config.go

@@ -1,4 +1,5 @@
 package common
+
 //fscan version 1.3
 var Userdict = map[string][]string{
 	"ftp":        {"www", "admin", "root", "db", "wwwroot", "data", "web", "ftp"},
@@ -54,7 +55,6 @@ var IsSave = true
 
 var DefaultPorts = "21,22,23,80,135,443,445,1433,1521,3306,5432,6379,7001,8080,8089,9000,9200,11211,27017"
 
-
 type HostInfo struct {
 	Host        string
 	HostFile    string
@@ -63,6 +63,7 @@ type HostInfo struct {
 	Timeout     int64
 	WebTimeout  int64
 	Scantype    string
+	Ping        bool
 	Isping      bool
 	Threads     int
 	IcmpThreads int
@@ -78,5 +79,3 @@ type HostInfo struct {
 	RedisFile   string
 	RedisShell  string
 }
-
-

common/flag.go

@@ -16,9 +16,6 @@ func Banner(){
 	print(banner)
 }
 
-
-
-
 func Flag(Info *HostInfo) {
 	Banner()
 	flag.StringVar(&Info.Host, "h", "", "IP address of the host you want to scan,for example: 192.168.11.11 | 192.168.11.11-255 | 192.168.11.11,192.168.11.12")
@@ -28,6 +25,7 @@ func Flag(Info *HostInfo)  {
 	flag.IntVar(&Info.Threads, "t", 200, "Thread nums")
 	flag.IntVar(&Info.IcmpThreads, "it", 11000, "Icmp Threads nums")
 	flag.BoolVar(&Info.Isping, "np", false, "not to ping")
+	flag.BoolVar(&Info.Ping, "ping", false, "using ping replace icmp")
 	flag.BoolVar(&Info.IsSave, "no", false, "not to save output log")
 	flag.StringVar(&Info.Username, "user", "", "username")
 	flag.StringVar(&Info.Userfile, "userf", "", "username file")