flags to struct

This commit is contained in:
noname
2023-06-09 08:13:56 -04:00
parent 04a7ba1357
commit 29b746ee80
32 changed files with 507 additions and 457 deletions
+16 -16
View File
@@ -18,23 +18,23 @@ import (
"golang.org/x/text/encoding/simplifiedchinese"
)
func WebTitle(info *common.HostInfo) error {
if common.Scantype == "webpoc" {
WebScan.WebScan(info)
func WebTitle(info common.HostInfo, flags common.Flags) error {
if flags.Scantype == "webpoc" {
WebScan.WebScan(info, flags)
return nil
}
err, CheckData := GOWebTitle(info)
err, CheckData := GOWebTitle(info, flags)
info.Infostr = WebScan.InfoCheck(info.Url, &CheckData)
if common.IsWebCan && err == nil {
WebScan.WebScan(info)
if flags.IsWebCan && err == nil {
WebScan.WebScan(info, flags)
} else {
errlog := fmt.Sprintf("[-] webtitle %v %v", info.Url, err)
common.LogError(errlog)
}
return err
}
func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckDatas) {
func GOWebTitle(info common.HostInfo, flags common.Flags) (err error, CheckData []WebScan.CheckDatas) {
if info.Url == "" {
switch info.Ports {
case "80":
@@ -43,18 +43,18 @@ func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckData
info.Url = fmt.Sprintf("https://%s", info.Host)
default:
host := fmt.Sprintf("%s:%s", info.Host, info.Ports)
protocol := GetProtocol(host, common.Timeout)
protocol := GetProtocol(host, common.Socks5{Address: flags.Socks5Proxy}, flags.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, common.Timeout)
protocol := GetProtocol(host, common.Socks5{Address: flags.Socks5Proxy}, flags.Timeout)
info.Url = fmt.Sprintf("%s://%s", protocol, info.Url)
}
}
err, result, CheckData := geturl(info, 1, CheckData)
err, result, CheckData := geturl(info, flags, 1, CheckData)
if err != nil && !strings.Contains(err.Error(), "EOF") {
return
}
@@ -62,7 +62,7 @@ func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckData
// there is a jump
if strings.Contains(result, "://") {
info.Url = result
err, result, CheckData = geturl(info, 3, CheckData)
err, result, CheckData = geturl(info, flags, 3, CheckData)
if err != nil {
return
}
@@ -70,11 +70,11 @@ func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckData
if result == "https" && !strings.HasPrefix(info.Url, "https://") {
info.Url = strings.Replace(info.Url, "http://", "https://", 1)
err, result, CheckData = geturl(info, 1, CheckData)
err, result, CheckData = geturl(info, flags, 1, CheckData)
// there is a jump
if strings.Contains(result, "://") {
info.Url = result
err, _, CheckData = geturl(info, 3, CheckData)
err, _, CheckData = geturl(info, flags, 3, CheckData)
if err != nil {
return
}
@@ -87,7 +87,7 @@ func GOWebTitle(info *common.HostInfo) (err error, CheckData []WebScan.CheckData
return
}
func geturl(info *common.HostInfo, flag int, CheckData []WebScan.CheckDatas) (error, string, []WebScan.CheckDatas) {
func geturl(info common.HostInfo, flags common.Flags, flag int, CheckData []WebScan.CheckDatas) (error, string, []WebScan.CheckDatas) {
//flag 1 first try
//flag 2 /favicon.ico
//flag 3 302
@@ -210,7 +210,7 @@ func gettitle(body []byte) (title string) {
return
}
func GetProtocol(host string, Timeout int64) (protocol string) {
func GetProtocol(host string, proxy common.Socks5, Timeout int64) (protocol string) {
if strings.HasSuffix(host, ":80") || !strings.Contains(host, ":") {
return "http"
}
@@ -219,7 +219,7 @@ func GetProtocol(host string, Timeout int64) (protocol string) {
return "https"
}
socksconn, err := common.WrapperTcpWithTimeout("tcp", host, time.Duration(Timeout)*time.Second)
socksconn, err := common.WrapperTcpWithTimeout("tcp", host, proxy, time.Duration(Timeout)*time.Second)
if err != nil {
return
}