fixed file,api checking fmt

Output now writes newline at exit

Author: Yariya

bufio_scanner.go

@@ -12,6 +12,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"strings"
 )
 
 func Scanner() {
@@ -34,15 +35,13 @@ func Scanner() {
 		}
 	} else if *input != "" {
 		fmt.Printf("Detected FILE Mode.\n")
-		f, err := os.Open(*input)
+		b, err := os.ReadFile(*input)
 		if err != nil {
 			log.Fatalln("open file err")
 		}
-		defer f.Close()
-		scanner := bufio.NewScanner(f)
-		for scanner.Scan() {
-			ip := scanner.Text()
-			queueChan <- ip
+		lines := strings.Split(string(b), "\n")
+		for _, line := range lines {
+			queueChan <- line
 		}
 	} else {
 		fmt.Printf("Detected ZMAP Mode.\n")

exporter.go

@@ -24,6 +24,11 @@ func (e *Exporter) create() {
 	}
 }
 
+func (e *Exporter) Close() {
+	e.f.WriteString("\n")
+	e.f.Close()
+}
+
 func (e *Exporter) Add(s string) {
 	_, err := e.f.WriteString(s + "\n")
 	if err != nil {

http.go

@@ -71,8 +71,17 @@ func (p *Proxy) CheckProxyHTTP(proxy string) {
 		atomic.AddUint64(&checked, 1)
 	}()
 
-	proxyPort := *port
+	var err error
+	var proxyPort = *port
 	s := strings.Split(proxy, ":")
+	if len(s) > 1 {
+		proxyPort, err = strconv.Atoi(s[1])
+		if err != nil {
+			log.Println(err)
+			return
+		}
+	}
+
 	if len(s) > 1 {
 		var err error
 		proxyPort, err = strconv.Atoi(s[1])
@@ -125,7 +134,7 @@ func (p *Proxy) CheckProxyHTTP(proxy string) {
 			go PrintProxy(s[0], proxyPort)
 		}
 		atomic.AddUint64(&success, 1)
-		exporter.Add(fmt.Sprintf("%s:%d", proxy, *port))
+		exporter.Add(fmt.Sprintf("%s:%d", s[0], proxyPort))
 	}
 }
 
@@ -136,10 +145,10 @@ func (p *Proxy) CheckProxySocks4(proxy string) {
 		atomic.AddUint64(&checked, 1)
 	}()
 
-	proxyPort := *port
+	var err error
+	var proxyPort = *port
 	s := strings.Split(proxy, ":")
 	if len(s) > 1 {
-		var err error
 		proxyPort, err = strconv.Atoi(s[1])
 		if err != nil {
 			log.Println(err)
@@ -180,7 +189,7 @@ func (p *Proxy) CheckProxySocks4(proxy string) {
 			go PrintProxy(s[0], proxyPort)
 		}
 		atomic.AddUint64(&success, 1)
-		exporter.Add(fmt.Sprintf("%s:%d", proxy, *port))
+		exporter.Add(fmt.Sprintf("%s:%d", s[0], proxyPort))
 	}
 }
 
@@ -191,10 +200,10 @@ func (p *Proxy) CheckProxySocks5(proxy string) {
 		atomic.AddUint64(&checked, 1)
 	}()
 
-	proxyPort := *port
+	var err error
+	var proxyPort = *port
 	s := strings.Split(proxy, ":")
 	if len(s) > 1 {
-		var err error
 		proxyPort, err = strconv.Atoi(s[1])
 		if err != nil {
 			log.Println(err)
@@ -235,6 +244,6 @@ func (p *Proxy) CheckProxySocks5(proxy string) {
 			go PrintProxy(s[0], proxyPort)
 		}
 		atomic.AddUint64(&success, 1)
-		exporter.Add(fmt.Sprintf("%s:%d", proxy, *port))
+		exporter.Add(fmt.Sprintf("%s:%d", s[0], proxyPort))
 	}
 }

main.go

@@ -1,19 +1,19 @@
 /*
-        (c) Yariya
+   (c) Yariya
 */
 
 package main
 
 import (
-        "encoding/json"
-        "flag"
-        "fmt"
-        "log"
-        "math/rand"
-        "os"
-        "os/signal"
-        "strings"
-        "time"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+	"math/rand"
+	"os"
+	"os/signal"
+	"strings"
+	"time"
 )
 
 var port = flag.Int("p", 80, "proxy port")
@@ -26,66 +26,67 @@ var fetch = flag.String("url", "", "url proxy fetch")
 const wt = 3
 
 type Api struct {
-        Status string `json:"Status"`
-        Reason string `json:"Reason"`
+	Status string `json:"Status"`
+	Reason string `json:"Reason"`
 }
 
 type Config struct {
-        CheckSite   string `json:"check-site"`
-        ProxyType   string `json:"proxy-type"`
-        HttpThreads int    `json:"http_threads"`
-        Headers     struct {
-                UserAgent string `json:"user-agent"`
-                Accept    string `json:"accept"`
-        } `json:"headers"`
-        PrintIps struct {
-                Enabled       bool `json:"enabled"`
-                DisplayIpInfo bool `json:"display-ip-info"`
-        } `json:"print_ips"`
-        Timeout struct {
-                HttpTimeout   int `json:"http_timeout"`
-                Socks4Timeout int `json:"socks4_timeout"`
-                Socks5Timeout int `json:"socks5_timeout"`
-        } `json:"timeout"`
+	CheckSite   string `json:"check-site"`
+	ProxyType   string `json:"proxy-type"`
+	HttpThreads int    `json:"http_threads"`
+	Headers     struct {
+		UserAgent string `json:"user-agent"`
+		Accept    string `json:"accept"`
+	} `json:"headers"`
+	PrintIps struct {
+		Enabled       bool `json:"enabled"`
+		DisplayIpInfo bool `json:"display-ip-info"`
+	} `json:"print_ips"`
+	Timeout struct {
+		HttpTimeout   int `json:"http_timeout"`
+		Socks4Timeout int `json:"socks4_timeout"`
+		Socks5Timeout int `json:"socks5_timeout"`
+	} `json:"timeout"`
 }
 
 var config Config
 
 func main() {
-        if strings.Contains(strings.Join(os.Args[0:], ""), "-h") {
-                fmt.Printf("\t\tZmap ProxyScanner @tcpfin\nHelp:\n\t-p <port> - Port you want to scan.\n\t-o <proxies.txt> - Writes proxy hits to file.\n\n\t-input <proxies.txt> - Loads the proxy list and checks it.\n\t-url https://api.com/proxies - Loads the proxies from an api and checks it.\n\n\tconfig.json - Customize the whole proxy checker\n")
-                return
-        }
-        flag.Parse()
-        rand.Seed(time.Now().UnixNano())
+	if strings.Contains(strings.Join(os.Args[0:], ""), "-h") {
+		fmt.Printf("\t\tZmap ProxyScanner @tcpfin\nHelp:\n\t-p <port> - Port you want to scan.\n\t-o <proxies.txt> - Writes proxy hits to file.\n\n\t-input <proxies.txt> - Loads the proxy list and checks it.\n\t-url https://api.com/proxies - Loads the proxies from an api and checks it.\n\n\tconfig.json - Customize the whole proxy checker\n")
+		return
+	}
+	flag.Parse()
+	rand.Seed(time.Now().UnixNano())
 
-        cfgBytes, err := os.ReadFile(*configFile)
-        if err != nil {
-                log.Println("error while opening config file")
-                return
-        }
-        err = json.Unmarshal(cfgBytes, &config)
-        if err != nil {
-                fmt.Println("error while parsing config json")
-                return
-        }
+	cfgBytes, err := os.ReadFile(*configFile)
+	if err != nil {
+		log.Println("error while opening config file")
+		return
+	}
+	err = json.Unmarshal(cfgBytes, &config)
+	if err != nil {
+		fmt.Println("error while parsing config json")
+		return
+	}
 
-        _ = os.Remove(*output)
+	_ = os.Remove(*output)
 
-        exporter = &Exporter{
-                out: *output,
-        }
+	exporter = &Exporter{
+		out: *output,
+	}
 
-        go exporter.create()
-        go Queue()
-        go Scanner()
-        for x := 0; x < wt; x++ {
-                go Proxies.WorkerThread()
-        }
-        go Stater()
-        time.Sleep(time.Second)
+	go exporter.create()
+	go Queue()
+	go Scanner()
+	for x := 0; x < wt; x++ {
+		go Proxies.WorkerThread()
+	}
+	go Stater()
+	time.Sleep(time.Second)
 
-        sc := make(chan os.Signal, 1)
-        signal.Notify(sc, os.Kill, os.Interrupt)
-        <-sc
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, os.Kill, os.Interrupt)
+	<-sc
+	exporter.Close()
 }