flags to struct

WebScan/WebScan.go

@@ -3,13 +3,14 @@ package WebScan
 import (
 	"embed"
 	"fmt"
-	"github.com/shadow1ng/fscan/WebScan/lib"
-	"github.com/shadow1ng/fscan/common"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 	"sync"
+
+	"github.com/shadow1ng/fscan/WebScan/lib"
+	"github.com/shadow1ng/fscan/common"
 )
 
 //go:embed pocs
@@ -17,23 +18,23 @@ var Pocs embed.FS
 var once sync.Once
 var AllPocs []*lib.Poc
 
-func WebScan(info *common.HostInfo) {
-	once.Do(initpoc)
-	var pocinfo = common.Pocinfo
+func WebScan(info common.HostInfo, flags common.Flags) {
+	once.Do(func() { initpoc(flags.PocPath) })
+	var pocinfo = flags.Pocinfo
 	buf := strings.Split(info.Url, "/")
 	pocinfo.Target = strings.Join(buf[:3], "/")
 
 	if pocinfo.PocName != "" {
-		Execute(pocinfo)
+		Execute(pocinfo, flags)
 	} else {
 		for _, infostr := range info.Infostr {
 			pocinfo.PocName = lib.CheckInfoPoc(infostr)
-			Execute(pocinfo)
+			Execute(pocinfo, flags)
 		}
 	}
 }
 
-func Execute(PocInfo common.PocInfo) {
+func Execute(PocInfo common.PocInfo, flags common.Flags) {
 	req, err := http.NewRequest("GET", PocInfo.Target, nil)
 	if err != nil {
 		errlog := fmt.Sprintf("[-] webpocinit %v %v", PocInfo.Target, err)
@@ -48,11 +49,11 @@ func Execute(PocInfo common.PocInfo) {
 	}
 	req.Header.Set("Connection", "close")
 	pocs := filterPoc(PocInfo.PocName)
-	lib.CheckMultiPoc(req, pocs, common.PocNum)
+	lib.CheckMultiPoc(req, pocs, flags)
 }
 
-func initpoc() {
-	if common.PocPath == "" {
+func initpoc(pocPath string) {
+	if pocPath == "" {
 		entries, err := Pocs.ReadDir("pocs")
 		if err != nil {
 			fmt.Printf("[-] init poc error: %v", err)
@@ -67,7 +68,7 @@ func initpoc() {
 			}
 		}
 	} else {
-		err := filepath.Walk(common.PocPath,
+		err := filepath.Walk(pocPath,
 			func(path string, info os.FileInfo, err error) error {
 				if err != nil || info == nil {
 					return err

WebScan/lib/check.go

@@ -3,9 +3,6 @@ package lib
 import (
 	"crypto/md5"
 	"fmt"
-	"github.com/google/cel-go/cel"
-	"github.com/shadow1ng/fscan/WebScan/info"
-	"github.com/shadow1ng/fscan/common"
 	"math/rand"
 	"net/http"
 	"net/url"
@@ -13,6 +10,10 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/google/cel-go/cel"
+	"github.com/shadow1ng/fscan/WebScan/info"
+	"github.com/shadow1ng/fscan/common"
 )
 
 var (
@@ -25,13 +26,13 @@ type Task struct {
 	Poc *Poc
 }
 
-func CheckMultiPoc(req *http.Request, pocs []*Poc, workers int) {
+func CheckMultiPoc(req *http.Request, pocs []*Poc, flags common.Flags) {
 	tasks := make(chan Task)
 	var wg sync.WaitGroup
-	for i := 0; i < workers; i++ {
+	for i := 0; i < flags.PocNum; i++ {
 		go func() {
 			for task := range tasks {
-				isVul, _, name := executePoc(task.Req, task.Poc)
+				isVul, _, name := executePoc(task.Req, task.Poc, flags)
 				if isVul {
 					result := fmt.Sprintf("[+] %s %s %s", task.Req.URL, task.Poc.Name, name)
 					common.LogSuccess(result)
@@ -52,7 +53,7 @@ func CheckMultiPoc(req *http.Request, pocs []*Poc, workers int) {
 	close(tasks)
 }
 
-func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
+func executePoc(oReq *http.Request, p *Poc, flags common.Flags) (bool, error, string) {
 	c := NewEnvOption()
 	c.UpdateCompileOptions(p.Set)
 	if len(p.Sets) > 0 {
@@ -82,7 +83,7 @@ func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
 	for _, item := range p.Set {
 		k, expression := item.Key, item.Value
 		if expression == "newReverse()" {
-			if !common.DnsLog {
+			if !flags.DnsLog {
 				return false, nil, ""
 			}
 			variableMap[k] = newReverse()
@@ -96,7 +97,7 @@ func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
 	success := false
 	//爆破模式,比如tomcat弱口令
 	if len(p.Sets) > 0 {
-		success, err = clusterpoc(oReq, p, variableMap, req, env)
+		success, err = clusterpoc(oReq, p, flags.PocFull, variableMap, req, env)
 		return success, nil, ""
 	}
 
@@ -257,7 +258,7 @@ func newReverse() *Reverse {
 	}
 }
 
-func clusterpoc(oReq *http.Request, p *Poc, variableMap map[string]interface{}, req *Request, env *cel.Env) (success bool, err error) {
+func clusterpoc(oReq *http.Request, p *Poc, pocFull bool, variableMap map[string]interface{}, req *Request, env *cel.Env) (success bool, err error) {
 	var strMap StrMap
 	var tmpnum int
 	for i, rule := range p.Rules {
@@ -276,8 +277,8 @@ func clusterpoc(oReq *http.Request, p *Poc, variableMap map[string]interface{},
 		ruleHash := make(map[string]struct{})
 	look:
 		for j, item := range setsMap {
-			//shiro默认只跑10key
-			if p.Name == "poc-yaml-shiro-key" && !common.PocFull && j >= 10 {
+			//shiro only runs by default 10key
+			if p.Name == "poc-yaml-shiro-key" && !pocFull && j >= 10 {
 				if item[1] == "cbc" {
 					continue
 				} else {

WebScan/lib/client.go

@@ -6,9 +6,6 @@ import (
 	"embed"
 	"errors"
 	"fmt"
-	"github.com/shadow1ng/fscan/common"
-	"golang.org/x/net/proxy"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"log"
 	"net"
@@ -16,6 +13,10 @@ import (
 	"net/url"
 	"strings"
 	"time"
+
+	"github.com/shadow1ng/fscan/common"
+	"golang.org/x/net/proxy"
+	"gopkg.in/yaml.v2"
 )
 
 var (
@@ -25,15 +26,15 @@ var (
 	keepAlive        = 5 * time.Second
 )
 
-func Inithttp(PocInfo common.PocInfo) {
+func Inithttp(flags common.Flags) {
 	//PocInfo.Proxy = "http://127.0.0.1:8080"
-	err := InitHttpClient(common.PocNum, common.Proxy, time.Duration(common.WebTimeout)*time.Second)
+	err := InitHttpClient(flags.PocNum, flags.Proxy, common.Socks5{Address: flags.Socks5Proxy}, time.Duration(flags.WebTimeout)*time.Second)
 	if err != nil {
 		log.Fatal(err)
 	}
 }
 
-func InitHttpClient(ThreadsNum int, DownProxy string, Timeout time.Duration) error {
+func InitHttpClient(ThreadsNum int, DownProxy string, socks5Proxy common.Socks5, Timeout time.Duration) error {
 	type DialContext = func(ctx context.Context, network, addr string) (net.Conn, error)
 	dialer := &net.Dialer{
 		Timeout:   dialTimout,
@@ -51,8 +52,8 @@ func InitHttpClient(ThreadsNum int, DownProxy string, Timeout time.Duration) err
 		DisableKeepAlives:   false,
 	}
 
-	if common.Socks5Proxy != "" {
-		dialSocksProxy, err := common.Socks5Dailer(dialer)
+	if socks5Proxy.Address != "" {
+		dialSocksProxy, err := common.Socks5Dailer(dialer, socks5Proxy)
 		if err != nil {
 			return err
 		}