poc模块加入指定目录或文件 -pocpath poc路径,端口可以指定文件-portf port.txt,rdp模块加入多线程爆破demo, -br xx指定线程

WebScan/lib/http.pb.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	"gopkg.in/yaml.v3"
+	"io/ioutil"
 	"math"
 	"strings"
 )
@@ -17,7 +18,7 @@ type Poc struct {
 	Set    map[string]string   `yaml:"set"`
 	Sets   map[string][]string `yaml:"sets"`
 	Rules  []Rules             `yaml:"rules"`
-	Groups map[string][]Rules `yaml:"groups"`
+	Groups map[string][]Rules  `yaml:"groups"`
 	Detail Detail              `yaml:"detail"`
 }
 
@@ -38,7 +39,6 @@ type Detail struct {
 	Version     string   `yaml:"version"`
 }
 
-
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
@@ -383,29 +383,29 @@ var fileDescriptor_11b04836674e6f94 = []byte{
 	0xff, 0xff, 0x2a, 0xe0, 0x6d, 0x45, 0x24, 0x03, 0x00, 0x00,
 }
 
-
-
 func LoadMultiPoc(Pocs embed.FS, pocname string) []*Poc {
 	var pocs []*Poc
 	for _, f := range SelectPoc(Pocs, pocname) {
-		if p, err := loadPoc(f, Pocs); err == nil {
+		if p, err := LoadPoc(f, Pocs); err == nil {
 			pocs = append(pocs, p)
-		}else {
-			fmt.Println("[-] load poc ",f," error:",err)
+		} else {
+			fmt.Println("[-] load poc ", f, " error:", err)
 		}
 	}
 	return pocs
 }
 
-func loadPoc(fileName string, Pocs embed.FS) (*Poc, error) {
+func LoadPoc(fileName string, Pocs embed.FS) (*Poc, error) {
 	p := &Poc{}
 	yamlFile, err := Pocs.ReadFile("pocs/" + fileName)
 
 	if err != nil {
+		fmt.Printf("[-] load poc %s error: %v", fileName, err)
 		return nil, err
 	}
 	err = yaml.Unmarshal(yamlFile, p)
 	if err != nil {
+		fmt.Printf("[-] load poc %s error: %v", fileName, err)
 		return nil, err
 	}
 	return p, err
@@ -424,3 +424,18 @@ func SelectPoc(Pocs embed.FS, pocname string) []string {
 	}
 	return foundFiles
 }
+
+func LoadPocbyPath(fileName string) (*Poc, error) {
+	p := &Poc{}
+	data, err := ioutil.ReadFile(fileName)
+	if err != nil {
+		fmt.Printf("[-] load poc %s error: %v", fileName, err)
+		return nil, err
+	}
+	err = yaml.Unmarshal(data, p)
+	if err != nil {
+		fmt.Printf("[-] load poc %s error: %v", fileName, err)
+		return nil, err
+	}
+	return p, err
+}