Browse Source

Don't Crash When Tor Proxy is Not Up

master
Sarah Jamie Lewis 4 years ago
parent
commit
7068ce8442
13 changed files with 64 additions and 35 deletions
  1. +3
    -3
      main.go
  2. +3
    -1
      protocol/bitcoin_scanner.go
  3. +3
    -1
      protocol/ftp_scanner.go
  4. +5
    -4
      protocol/http_scanner.go
  5. +6
    -2
      protocol/irc_scanner.go
  6. +3
    -1
      protocol/mongodb_scanner.go
  7. +3
    -1
      protocol/ricochet_scanner.go
  8. +3
    -1
      protocol/smtp_scanner.go
  9. +9
    -3
      protocol/ssh_scanner.go
  10. +14
    -12
      protocol/tls_scanner.go
  11. +3
    -1
      protocol/vnc_scanner.go
  12. +6
    -2
      protocol/xmpp_scanner.go
  13. +3
    -3
      report/onionscanreport.go

+ 3
- 3
main.go View File

@@ -90,9 +90,9 @@ func main() {
onionScan.Config.LogError(errors.New(scanReport.HiddenService + " timed out"))
}

file := *reportFile
if file != "" {
file := scanReport.HiddenService + "." + *reportFile
file := *reportFile
if file != "" {
file = scanReport.HiddenService + "." + *reportFile
}

if *jsonReport {


+ 3
- 1
protocol/bitcoin_scanner.go View File

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

+ 3
- 1
protocol/ftp_scanner.go View File

@@ -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))
}
}
conn.Close()
if conn != nil {
conn.Close()
}
}

+ 5
- 4
protocol/http_scanner.go View File

@@ -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,19 +33,20 @@ 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
conn.Close()
if conn != nil {
conn.Close()
}
} else {
osc.LogInfo("Found potential service on http(80)\n")
report.WebDetected = true
conn.Close()
dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, osc.TorProxyAddress)
transportConfig := &http.Transport{
Dial: dialSocksProxy,
Dial: dialSocksProxy,
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
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)


+ 6
- 2
protocol/irc_scanner.go View File

@@ -22,7 +22,9 @@ func (rps *IRCProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
// TODO: Actual Analysis
report.IRCDetected = true
}
conn.Close()
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
}
conn.Close()
if conn != nil {
conn.Close()
}
}

+ 3
- 1
protocol/mongodb_scanner.go View File

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

}

+ 3
- 1
protocol/ricochet_scanner.go View File

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

+ 3
- 1
protocol/smtp_scanner.go View File

@@ -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))
}
}
conn.Close()
if conn != nil {
conn.Close()
}
}

+ 9
- 3
protocol/ssh_scanner.go View File

@@ -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
conn.Close()
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)
conn.Close()
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))
}
}
conn.Close()
if conn != nil {
conn.Close()
}
}
}

+ 14
- 12
protocol/tls_scanner.go View File

@@ -18,18 +18,20 @@ func (sps *TLSProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
osc.LogInfo("Failed to connect to service on port 443\n")
report.TLSDetected = false
} else {
osc.LogInfo("Found TLS Endpoint\n")
osc.LogInfo("Found TLS Endpoint\n")
report.TLSDetected = true
config := &tls.Config{
InsecureSkipVerify:true,
}
tlsConn := tls.Client(conn, config)
tlsConn.Write([]byte("GET / HTTP/1.1\r\n\r\n"))
for _, certificate := range tlsConn.ConnectionState().PeerCertificates {
osc.LogInfo(fmt.Sprintf("Found Certificate %v \n", certificate))
report.Certificates = append(report.Certificates, *certificate)
}
tlsConn.Close()
config := &tls.Config{
InsecureSkipVerify: true,
}
tlsConn := tls.Client(conn, config)
tlsConn.Write([]byte("GET / HTTP/1.1\r\n\r\n"))
for _, certificate := range tlsConn.ConnectionState().PeerCertificates {
osc.LogInfo(fmt.Sprintf("Found Certificate %v \n", certificate))
report.Certificates = append(report.Certificates, *certificate)
}
tlsConn.Close()
}
if conn != nil {
conn.Close()
}
conn.Close()
}

+ 3
- 1
protocol/vnc_scanner.go View File

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

+ 6
- 2
protocol/xmpp_scanner.go View File

@@ -22,7 +22,9 @@ func (rps *XMPPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
// TODO: Actual Analysis
report.XMPPDetected = true
}
conn.Close()
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
}
conn.Close()
if conn != nil {
conn.Close()
}
}

+ 3
- 3
report/onionscanreport.go View File

@@ -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 {
@@ -62,8 +62,8 @@ type OnionScanReport struct {
PageTitle string `json:"pageTitle"`
ResponseHeaders map[string]string `json:"responseHeaders"`

// TLS
Certificates []x509.Certificate `json:"certificates"`
// TLS
Certificates []x509.Certificate `json:"certificates"`

//Bitcoin
BitcoinAddresses []string `json:"bitcoinAddresses"`


Loading…
Cancel
Save