[*]修复一个会漏资产的bug，之前会漏掉某些SSL端口的非SSL资产

Author: lcvvvv

get-appbanner.go

@@ -37,9 +37,13 @@ func GetAppBannerFromTcpBanner(banner *TcpBanner) *AppBanner {
 	return getAppBanner(parse, banner)
 }
 
-func GetAppBannerFromUrl(url *urlparse.URL) *AppBanner {
-	if url.Scheme != "http" && url.Scheme != "https" {
-		banner := GetTcpBanner(url.Netloc, url.Port, New(), HttpTimeout*20)
+func GetAppBannerFromUrlString(urlString string) *AppBanner {
+	Url, err := urlparse.Load(urlString)
+	if err != nil {
+		logger.Println(err)
+	}
+	if Url.Scheme != "http" && Url.Scheme != "https" {
+		banner := GetTcpBanner(Url.Netloc, Url.Port, New(), HttpTimeout*20)
 		if banner == nil {
 			return nil
 		}
@@ -48,18 +52,16 @@ func GetAppBannerFromUrl(url *urlparse.URL) *AppBanner {
 		}
 		return GetAppBannerFromTcpBanner(banner)
 	}
-
-	if url.Port == 0 && url.Scheme == "" {
-		url.Port = 80
-		url.Scheme = "http"
+	if Url.Port == 0 && Url.Scheme == "http" {
+		Url.Port = 80
 	}
-	if url.Port == 0 && url.Scheme == "https" {
-		url.Port = 443
+	if Url.Port == 0 && Url.Scheme == "https" {
+		Url.Port = 443
 	}
-	if url.Port == 0 {
-		url.Port = 80
+	if Url.Port == 0 {
+		Url.Port = 80
 	}
-	return getAppBanner(url, nil)
+	return getAppBanner(Url, nil)
 }
 
 func getAppBanner(url *urlparse.URL, tcpBanner *TcpBanner) *AppBanner {

lib/urlparse/urlparse.go

@@ -37,13 +37,10 @@ func Load(s string) (*URL, error) {
 	}
 	return &URL{
 		Scheme: func() string {
-			if r.Port() == "80" {
-				return "http"
+			if r.Scheme != "" {
+				return r.Scheme
 			}
-			if r.Port() == "443" {
-				return "https"
-			}
-			return r.Scheme
+			return ""
 		}(),
 		Netloc: r.Hostname(),
 		Path: func() string {

type-probe.go

@@ -53,6 +53,12 @@ func (p *probe) loads(sArr []string) {
 func (p *probe) scan(t target) (response, error) {
 	tls := p.sslports.Exist(t.port)
 	text, err := simplenet.Send(p.request.protocol, tls, t.URI(), p.request.string, p.totalwaitms, 512)
+	if err != nil {
+		if strings.Contains(err.Error(), "STEP1") && tls == true {
+			tls = false
+			text, err = simplenet.Send(p.request.protocol, tls, t.URI(), p.request.string, p.totalwaitms, 512)
+		}
+	}
 	return response{
 		string: text,
 		tls:    tls,