增加ips支持127.0.0.1:8080格式

cmd/all.go

@@ -64,10 +64,10 @@ func allRun(hostString string, portString string, jsonbool bool, runtime int, no
 		fmt.Println("----- [Yasso] Start do ping scan -----")
 		alive = execute(ips, RunICMP)
 	}
-	fmt.Println("[Yasoo get alive host] is", len(alive))
+	fmt.Println("[Yasso get alive host] is", len(alive))
 	// 做漏洞扫描
 	var out []JsonOut
-
+	//TODO:
 	if len(alive) > 0 {
 		fmt.Println("----- [Yasso] Start do vuln scan -----")
 		VulScan(alive, false, true, false) // 做漏洞扫描

cmd/brute.go

@@ -229,7 +229,7 @@ func ReadTextToDic(service, user, pass string) ([]string, []string) {
 		userdic = config.Userdict[service]
 		passdic = config.Passwords
 	)
-	// 入过不包含.txt的话，按照用户名和密码来算。其中
+	// 如果不包含.txt的话，按照用户名和密码来算。其中
 	if user != "" && !strings.Contains(user, ".txt") {
 		userdic = strings.Split(user, ",")
 	}

cmd/icmp.go

@@ -47,13 +47,25 @@ func execute(ips []string, r bool) []string {
 	var wg sync.WaitGroup
 	// 修改ants池的并发方式
 	p, _ := ants.NewPoolWithFunc(len(ips), func(ip interface{}) {
+		var ipt string
 		if r == true {
-			if icmp(ip.(string)) {
+			// 127.0.0.1:8080格式
+			if strings.Contains(ip.(string), ":") {
+				ipt = strings.Split(ip.(string), ":")[0]
+			} else {
+				ipt = ip.(string)
+			}
+			if icmp(ipt) {
 				Println(fmt.Sprintf("[+] Find %v (icmp)", ip))
 				Alive = append(Alive, ip.(string))
 			}
 		} else {
-			if ping(ip.(string)) {
+			if strings.Contains(ip.(string), ":") {
+				ipt = strings.Split(ip.(string), ":")[0]
+			} else {
+				ipt = ip.(string)
+			}
+			if ping(ipt) {
 				Println(fmt.Sprintf("[+] Find %v (ping)", ip))
 				Alive = append(Alive, ip.(string))
 			}

cmd/ps.go

@@ -6,6 +6,8 @@ import (
 	"github.com/spf13/cobra"
 	"math"
 	"net"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
@@ -74,8 +76,17 @@ func PortScan(host []string, ports []int) []PortResult {
 		})
 	})
 	for _, ip := range host {
-		wg.Add(1)
-		_ = p.Invoke(ip)
+		if strings.Contains(ip, ":") {
+			addr := strings.Split(ip, ":")[0]
+			port, _ := strconv.Atoi(strings.Split(ip, ":")[1])
+			if portConn(addr, port) {
+				Println(fmt.Sprintf("[+] %v %v open", addr, port))
+				tempPort = append(tempPort, PortResult{addr, []int{port}})
+			}
+		} else {
+			wg.Add(1)
+			_ = p.Invoke(ip)
+		}
 	}
 	wg.Wait()
 	return tempPort

cmd/vuln.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/panjf2000/ants/v2"
 	"github.com/spf13/cobra"
+	"strings"
 	"sync"
 )
 
@@ -67,6 +68,9 @@ func VulScan(ips []string, ms17010bool bool, allbool bool, smbGohstbool bool) {
 	})
 
 	for _, ip := range ips {
+		if strings.Contains(ip, ":") && !strings.Contains(ip, ":445") {
+			continue
+		}
 		wg.Add(1)
 		_ = p.Invoke(ip)
 	}