mirror of https://github.com/qwqdanchun/fscan.git
update
This commit is contained in:
parent
4b885f4e43
commit
6dbc03f0f3
|
@ -2,7 +2,7 @@ package Plugins
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"example.com/fxscan/WebScan/lib"
|
"example.com/fxscan/Web_Scan/lib"
|
||||||
"example.com/fxscan/common"
|
"example.com/fxscan/common"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
|
@ -13,29 +13,29 @@ import (
|
||||||
"time"
|
"time"
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
|
|
||||||
"example.com/fxscan/WebScan"
|
"example.com/fxscan/Web_Scan"
|
||||||
"example.com/fxscan/WebScan/lib"
|
"example.com/fxscan/Web_Scan/lib"
|
||||||
"example.com/fxscan/common"
|
"example.com/fxscan/common"
|
||||||
"golang.org/x/text/encoding/simplifiedchinese"
|
"golang.org/x/text/encoding/simplifiedchinese"
|
||||||
)
|
)
|
||||||
|
|
||||||
func WebTitle(info *common.HostInfo) error {
|
func WebTitle(info *common.HostInfo) error {
|
||||||
if common.Scantype == "webpoc" {
|
if common.Scantype == "webpoc" {
|
||||||
WebScan.WebScan(info)
|
Web_Scan.Web_Scan(info)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
err, CheckData := GOWebTitle(info)
|
err, CheckData := GOWebTitle(info)
|
||||||
info.Infostr = WebScan.InfoCheck(info.Url, &CheckData)
|
info.Infostr = Web_Scan.InfoCheck(info.Url, &CheckData)
|
||||||
|
|
||||||
if common.IsWebCan == false && err == nil {
|
if common.IsWebCan == false && err == nil {
|
||||||
WebScan.WebScan(info)
|
Web_Scan.Web_Scan(info)
|
||||||
} else {
|
} else {
|
||||||
errlog := fmt.Sprintf("[-] webtitle %v %v", info.Url, err)
|
errlog := fmt.Sprintf("[-] webtitle %v %v", info.Url, err)
|
||||||
common.LogError(errlog)
|
common.LogError(errlog)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckDatas) {
|
func GOWebTitle(info *common.HostInfo) (err error, CheckData []Web_Scan.CheckDatas) {
|
||||||
if info.Url == "" {
|
if info.Url == "" {
|
||||||
switch info.Ports {
|
switch info.Ports {
|
||||||
case "80":
|
case "80":
|
||||||
|
@ -89,7 +89,7 @@ func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckData
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func geturl(info *common.HostInfo, flag int, CheckData []WebScan.CheckDatas) (error, string, []WebScan.CheckDatas) {
|
func geturl(info *common.HostInfo, flag int, CheckData []Web_Scan.CheckDatas) (error, string, []Web_Scan.CheckDatas) {
|
||||||
//flag 1 first try
|
//flag 1 first try
|
||||||
//flag 2 /favicon.ico
|
//flag 2 /favicon.ico
|
||||||
//flag 3 302
|
//flag 3 302
|
||||||
|
@ -141,7 +141,7 @@ func geturl(info *common.HostInfo, flag int, CheckData []WebScan.CheckDatas) (er
|
||||||
if !utf8.Valid(body) {
|
if !utf8.Valid(body) {
|
||||||
body, _ = simplifiedchinese.GBK.NewDecoder().Bytes(body)
|
body, _ = simplifiedchinese.GBK.NewDecoder().Bytes(body)
|
||||||
}
|
}
|
||||||
CheckData = append(CheckData, WebScan.CheckDatas{Body: body, Headers: fmt.Sprintf("%s", resp.Header)})
|
CheckData = append(CheckData, Web_Scan.CheckDatas{Body: body, Headers: fmt.Sprintf("%s", resp.Header)})
|
||||||
var reurl string
|
var reurl string
|
||||||
if flag != 2 {
|
if flag != 2 {
|
||||||
title = gettitle(body)
|
title = gettitle(body)
|
||||||
|
|
|
@ -238,7 +238,7 @@ https://github.com/jjf012/gopoc
|
||||||
[+] 2020/12/6 优化icmp模块,新增-domain 参数(用于smb爆破模块,适用于域用户) 。
|
[+] 2020/12/6 优化icmp模块,新增-domain 参数(用于smb爆破模块,适用于域用户) 。
|
||||||
[+] 2020/12/03 优化ip段处理模块、icmp、端口扫描模块。新增支持192.168.1.1-192.168.255.255。
|
[+] 2020/12/03 优化ip段处理模块、icmp、端口扫描模块。新增支持192.168.1.1-192.168.255.255。
|
||||||
[+] 2020/11/17 增加-ping 参数,作用是存活探测模块用ping代替icmp发包。
|
[+] 2020/11/17 增加-ping 参数,作用是存活探测模块用ping代替icmp发包。
|
||||||
[+] 2020/11/17 增加WebScan模块,新增shiro简单识别。https访问时,跳过证书认证。将服务模块和web模块的超时分开,增加-wt 参数(WebTimeout)。
|
[+] 2020/11/17 增加Web_Scan模块,新增shiro简单识别。https访问时,跳过证书认证。将服务模块和web模块的超时分开,增加-wt 参数(WebTimeout)。
|
||||||
[+] 2020/11/16 对icmp模块进行优化,增加-it 参数(IcmpThreads),默认11000,适合扫B段 。
|
[+] 2020/11/16 对icmp模块进行优化,增加-it 参数(IcmpThreads),默认11000,适合扫B段 。
|
||||||
[+] 2020/11/15 支持ip以文件导入,-hf ip.txt,并对去重做了处理。
|
[+] 2020/11/15 支持ip以文件导入,-hf ip.txt,并对去重做了处理。
|
||||||
|
|
||||||
|
|
|
@ -253,7 +253,7 @@ Modify the error prompt. If there is no new progress in - debug within 10 second
|
||||||
[+] 2020/12/6 Optimize the icmp module and add the -domain parameter (for the smb blasting module, applicable to domain users)
|
[+] 2020/12/6 Optimize the icmp module and add the -domain parameter (for the smb blasting module, applicable to domain users)
|
||||||
[+] 2020/12/03 Optimize the ip segment processing module, icmp, port scanning module. 192.168.1.1-192.168.255.255 is supported.
|
[+] 2020/12/03 Optimize the ip segment processing module, icmp, port scanning module. 192.168.1.1-192.168.255.255 is supported.
|
||||||
[+] 2020/11/17 The -ping parameter is added to replace icmp packets with ping in the survival detection module.
|
[+] 2020/11/17 The -ping parameter is added to replace icmp packets with ping in the survival detection module.
|
||||||
[+] 2020/11/17 WebScan module and shiro simple recognition are added. Skip certificate authentication during https access. Separate the timeout of the service module and the web module, and add the -wt parameter (WebTimeout).
|
[+] 2020/11/17 Web_Scan module and shiro simple recognition are added. Skip certificate authentication during https access. Separate the timeout of the service module and the web module, and add the -wt parameter (WebTimeout).
|
||||||
[+] 2020/11/16 Optimize the icmp module and add the -it parameter (IcmpThreads). The default value is 11000, which is suitable for scanning section B.
|
[+] 2020/11/16 Optimize the icmp module and add the -it parameter (IcmpThreads). The default value is 11000, which is suitable for scanning section B.
|
||||||
[+] 2020/11/15 Support importt ip from file, -hf ip.txt, and process de duplication ips.
|
[+] 2020/11/15 Support importt ip from file, -hf ip.txt, and process de duplication ips.
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package WebScan
|
package Web_Scan
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
"fmt"
|
"fmt"
|
||||||
"example.com/fxscan/WebScan/info"
|
"example.com/fxscan/Web_Scan/info"
|
||||||
"example.com/fxscan/common"
|
"example.com/fxscan/common"
|
||||||
"regexp"
|
"regexp"
|
||||||
)
|
)
|
|
@ -1,9 +1,9 @@
|
||||||
package WebScan
|
package Web_Scan
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
"example.com/fxscan/WebScan/lib"
|
"example.com/fxscan/Web_Scan/lib"
|
||||||
"example.com/fxscan/common"
|
"example.com/fxscan/common"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
@ -17,7 +17,7 @@ var Pocs embed.FS
|
||||||
var once sync.Once
|
var once sync.Once
|
||||||
var AllPocs []*lib.Poc
|
var AllPocs []*lib.Poc
|
||||||
|
|
||||||
func WebScan(info *common.HostInfo) {
|
func Web_Scan(info *common.HostInfo) {
|
||||||
once.Do(initpoc)
|
once.Do(initpoc)
|
||||||
var pocinfo = common.Pocinfo
|
var pocinfo = common.Pocinfo
|
||||||
buf := strings.Split(info.Url, "/")
|
buf := strings.Split(info.Url, "/")
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/google/cel-go/cel"
|
"github.com/google/cel-go/cel"
|
||||||
"example.com/fxscan/WebScan/info"
|
"example.com/fxscan/Web_Scan/info"
|
||||||
"example.com/fxscan/common"
|
"example.com/fxscan/common"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"net/http"
|
"net/http"
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue