Don't Crash When Tor Proxy is Not Up

main.go

@@ -92,7 +92,7 @@ func main() {
 
 		file := *reportFile
 		if file != "" {
-		        file := scanReport.HiddenService + "." + *reportFile
+			file = scanReport.HiddenService + "." + *reportFile
 		}
 
 		if *jsonReport {

protocol/bitcoin_scanner.go

@@ -22,5 +22,7 @@ func (rps *BitcoinProtocolScanner) ScanProtocol(hiddenService string, osc *confi
 		// TODO: Actual Analysis
 		report.BitcoinDetected = true
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/ftp_scanner.go

@@ -31,5 +31,7 @@ func (sps *FTPProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 			osc.LogInfo(fmt.Sprintf("Found FTP Banner: %s (%s)", banner, report.FTPFingerprint))
 		}
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/http_scanner.go

@@ -1,6 +1,7 @@
 package protocol
 
 import (
+	"crypto/tls"
 	"fmt"
 	"github.com/s-rah/onionscan/config"
 	"github.com/s-rah/onionscan/report"
@@ -10,7 +11,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strings"
-        "crypto/tls"
 )
 
 type HTTPProtocolScanner struct {
@@ -33,7 +33,9 @@ func (hps *HTTPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
 	if err != nil {
 		osc.LogInfo("Failed to connect to service on port 80\n")
 		report.WebDetected = false
+		if conn != nil {
 			conn.Close()
+		}
 	} else {
 		osc.LogInfo("Found potential service on http(80)\n")
 		report.WebDetected = true
@@ -45,7 +47,6 @@ func (hps *HTTPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
 		}
 		hps.Client = &http.Client{
 			Transport: transportConfig,
-			
 		}
 		// FIXME This should probably be moved to it's own file now.
 		response, err := hps.Client.Get("http://" + hiddenService)

protocol/irc_scanner.go

@@ -22,7 +22,9 @@ func (rps *IRCProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 		// TODO: Actual Analysis
 		report.IRCDetected = true
 	}
+	if conn != nil {
 		conn.Close()
+	}
 
 	// IRC
 	osc.LogInfo(fmt.Sprintf("Checking %s IRC(6697)\n", hiddenService))
@@ -34,5 +36,7 @@ func (rps *IRCProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 		// TODO: Actual Analysis
 		report.IRCDetected = true
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/mongodb_scanner.go

@@ -22,6 +22,8 @@ func (rps *MongoDBProtocolScanner) ScanProtocol(hiddenService string, osc *confi
 		// TODO: Actual Analysis
 		report.MongoDBDetected = true
 	}
+	if conn != nil {
 		conn.Close()
+	}
 
 }

protocol/ricochet_scanner.go

@@ -22,5 +22,7 @@ func (rps *RicochetProtocolScanner) ScanProtocol(hiddenService string, osc *conf
 		// TODO: Actual Analysis
 		report.RicochetDetected = true
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/smtp_scanner.go

@@ -32,5 +32,7 @@ func (sps *SMTPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
 			osc.LogInfo(fmt.Sprintf("Found SMTP Banner: %s (%s)", banner, report.SMTPFingerprint))
 		}
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/ssh_scanner.go

@@ -22,7 +22,9 @@ func (sps *SSHProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 	if err != nil {
 		osc.LogInfo("Failed to connect to service on port 22\n")
 		report.SSHDetected = false
+		if conn != nil {
 			conn.Close()
+		}
 	} else {
 		// TODO SSH Checking
 		report.SSHDetected = true
@@ -48,7 +50,9 @@ func (sps *SSHProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 			},
 		}
 		ssh.NewClientConn(conn, hiddenService+":22", config)
+		if conn != nil {
 			conn.Close()
+		}
 		conn, err = utils.GetNetworkConnection(hiddenService, 22, osc.TorProxyAddress, osc.Timeout)
 		if err == nil {
 			reader := bufio.NewReader(conn)
@@ -58,6 +62,8 @@ func (sps *SSHProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 				osc.LogInfo(fmt.Sprintf("Found SSH Banner: %s (%s)", banner))
 			}
 		}
+		if conn != nil {
 			conn.Close()
 		}
 	}
+}

protocol/tls_scanner.go

@@ -31,5 +31,7 @@ func (sps *TLSProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
 		}
 		tlsConn.Close()
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/vnc_scanner.go

@@ -22,5 +22,7 @@ func (vncps *VNCProtocolScanner) ScanProtocol(hiddenService string, osc *config.
 		// TODO: Actual Analysis
 		report.VNCDetected = true
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

protocol/xmpp_scanner.go

@@ -22,7 +22,9 @@ func (rps *XMPPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
 		// TODO: Actual Analysis
 		report.XMPPDetected = true
 	}
+	if conn != nil {
 		conn.Close()
+	}
 	// XMPP
 	osc.LogInfo(fmt.Sprintf("Checking %s XMPP(5223)\n", hiddenService))
 	conn, err = utils.GetNetworkConnection(hiddenService, 5223, osc.TorProxyAddress, osc.Timeout)
@@ -33,5 +35,7 @@ func (rps *XMPPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
 		// TODO: Actual Analysis
 		report.XMPPDetected = true
 	}
+	if conn != nil {
 		conn.Close()
 	}
+}

report/onionscanreport.go

@@ -1,11 +1,11 @@
 package report
 
 import (
+	"crypto/x509"
 	"encoding/json"
 	"github.com/s-rah/onionscan/utils"
 	"io/ioutil"
 	"time"
-	"crypto/x509"
 )
 
 type ExifTag struct {