Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remote Desktop Protocol #97

Open
wants to merge 11 commits into
base: onionscan-0.2
Choose a base branch
from
Open

Remote Desktop Protocol #97

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9917e41
Remote Desktop Protocol
sainslie Oct 21, 2016
583dcea
Hypertext Transfer Protocol
sainslie Oct 21, 2016
6da11ba
Secure Shell
sainslie Oct 21, 2016
612fd51
Transport Layer Security
sainslie Oct 21, 2016
b16cb63
Remote Desktop Protocol
sainslie Oct 21, 2016
3dd5e89
Merge remote-tracking branch 'upstream/onionscan-0.2'
sainslie Oct 21, 2016
3e54284
Remote Desktop Protocol
sainslie Oct 21, 2016
b70d680
Remote Desktop Protocol
sainslie Oct 21, 2016
dafdc82
Hypertext Transfer Protocol
sainslie Oct 22, 2016
1427b02
Secure Shell
sainslie Oct 22, 2016
f95df2a
Transport Layer Security
sainslie Oct 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions onionscan/onionscan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ func (os *OnionScan) GetAllActions() []string {
"tls",
"ssh",
"irc",
"rdp",
"ricochet",
"ftp",
"smtp",
Expand Down Expand Up @@ -47,6 +48,9 @@ func (os *OnionScan) PerformNextAction(report *report.OnionScanReport, nextActio
case "irc":
ips := new(protocol.IRCProtocolScanner)
ips.ScanProtocol(report.HiddenService, os.Config, report)
case "rdp":
rdps := new(protocol.RDPProtocolScanner)
rdps.ScanProtocol(report.HiddenService, os.Config, report)
case "ricochet":
rps := new(protocol.RicochetProtocolScanner)
rps.ScanProtocol(report.HiddenService, os.Config, report)
Expand Down Expand Up @@ -87,6 +91,7 @@ func (os *OnionScan) Scan(hiddenService string, out chan *report.OnionScanReport

report := report.NewOnionScanReport(hiddenService)

<<<<<<< HEAD
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge artifact.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your help @s-rah! I didn't understand that prior to deciding to commit it but I understand it's due to a conflict. I'll amend it. I presume this is the problem causing it to fail to build? If it isn't then I'll redo it all again prior to commit it although perhaps I should also set up automated builds to be certain it's successful. I also changed to default branch that I commit source code to so I'm using the preferred branch. I hadn't committed source code to another branch before and I found it quite confusing!

for _, nextAction := range os.Config.Scans {
err := os.PerformNextAction(report, nextAction)
if err != nil {
Expand All @@ -103,6 +108,15 @@ func (os *OnionScan) Scan(hiddenService string, out chan *report.OnionScanReport
} else {
report.NextAction = "none"
}
=======
for report.NextAction != "none" {
os.PerformNextAction(report)
if time.Now().Sub(report.DateScanned).Seconds() > os.Config.Timeout.Seconds() {
report.TimedOut = true
report.NextAction = "none"
}
}
>>>>>>> upstream/master

out <- report
}
14 changes: 14 additions & 0 deletions protocol/http_scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,18 @@ func (hps *HTTPProtocolScanner) ScanProtocol(hiddenService string, osc *config.O
wps := new(spider.OnionSpider)
wps.Crawl(report.HiddenService, osc, report)
}
osc.LogInfo(fmt.Sprintf("Checking %s http(8080)\n", hiddenService))
conn, err := utils.GetNetworkConnection(hiddenService, 8080, osc.TorProxyAddress, osc.Timeout)
if conn != nil {
conn.Close()
}
if err != nil {
osc.LogInfo("Failed to connect to service on port 8080\n")
report.WebDetected = false
} else {
osc.LogInfo("Found potential service on http(8080)\n")
report.WebDetected = true
wps := new(spider.OnionSpider)
wps.Crawl(report.HiddenService, osc, report)
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not repeat a bunch of code when all that changes is the port - let's make port number a configurable parameter instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. I'm embarrassed that I opted to duplicate the source code rather than just implement it as a parameter instead because it's such a basic skill and agnostic to programming languages! I'll redo it. I guess I perhaps should start to add useful comments in the source code too.

}
28 changes: 28 additions & 0 deletions protocol/rdp_scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package protocol

import (
"fmt"
"github.com/s-rah/onionscan/config"
"github.com/s-rah/onionscan/report"
"github.com/s-rah/onionscan/utils"
)

type RDPProtocolScanner struct {
}

func (rdps *RDPProtocolScanner) ScanProtocol(hiddenService string, osc *config.OnionScanConfig, report *report.OnionScanReport) {
// RDP
osc.LogInfo(fmt.Sprintf("Checking %s RDP(3389)\n", hiddenService))
conn, err := utils.GetNetworkConnection(hiddenService, 3389, osc.TorProxyAddress, osc.Timeout)
if err != nil {
osc.LogInfo("Failed to connect to service on port 3389\n")
report.RDPDetected = false
} else {
osc.LogInfo("Detected possible RDP instance\n")
// TODO: Actual Analysis
report.RDPDetected = true
}
if conn != nil {
conn.Close()
}
}
49 changes: 49 additions & 0 deletions protocol/ssh_scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,53 @@ func (sps *SSHProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
conn.Close()
}
}
osc.LogInfo(fmt.Sprintf("Checking %s ssh(2222)\n", hiddenService))
conn, err := utils.GetNetworkConnection(hiddenService, 2222, osc.TorProxyAddress, osc.Timeout)
if err != nil {
osc.LogInfo("Failed to connect to service on port 2222\n")
report.SSHDetected = false
if conn != nil {
conn.Close()
}
} else {
// TODO SSH Checking
report.SSHDetected = true

config := &ssh.ClientConfig{
HostKeyCallback: func(hostname string, addr net.Addr, key ssh.PublicKey) error {
h := md5.New()
h.Write(key.Marshal())

fBytes := h.Sum(nil)
fingerprint := string("")
for i := 0; i < len(fBytes); i++ {
if i+1 != len(fBytes) {
fingerprint = fmt.Sprintf("%s%0.2x:", fingerprint, fBytes[i])
} else {
fingerprint = fmt.Sprintf("%s%0.2x", fingerprint, fBytes[i])
}
}
report.SSHKey = fingerprint
osc.LogInfo(fmt.Sprintf("Found SSH Key %s\n", fingerprint))
// We don't want to continue
return errors.New("error")
},
}
ssh.NewClientConn(conn, hiddenService+":2222", config)
if conn != nil {
conn.Close()
}
conn, err = utils.GetNetworkConnection(hiddenService, 2222, osc.TorProxyAddress, osc.Timeout)
if err == nil {
reader := bufio.NewReader(conn)
banner, err := reader.ReadString('\n')
if err == nil {
report.SSHBanner = banner
osc.LogInfo(fmt.Sprintf("Found SSH Banner: %s", banner))
}
}
if conn != nil {
conn.Close()
}
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, let's not repeat a bunch of code, let's make port number configurable instead.

}
17 changes: 17 additions & 0 deletions protocol/tls_scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,21 @@ func (sps *TLSProtocolScanner) ScanProtocol(hiddenService string, osc *config.On
if conn != nil {
conn.Close()
}
osc.LogInfo(fmt.Sprintf("Checking %s TLS(8443)\n", hiddenService))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And again.

conn, err := utils.GetNetworkConnection(hiddenService, 8443, osc.TorProxyAddress, osc.Timeout)
if err != nil {
osc.LogInfo("Failed to connect to service on port 8443\n")
report.TLSDetected = false
} else {
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 {
report.Certificates = append(report.Certificates, *certificate)
}
tlsConn.Close()
}
18 changes: 16 additions & 2 deletions report/onionscanreport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type OnionScanReport struct {
WebDetected bool `json:"webDetected"`
TLSDetected bool `json:"tlsDetected"`
SSHDetected bool `json:"sshDetected"`
RDPDetected bool `json:"rdpDetected"`
RicochetDetected bool `json:"ricochetDetected"`
IRCDetected bool `json:"ircDetected"`
FTPDetected bool `json:"ftpDetected"`
Expand All @@ -50,7 +51,8 @@ type OnionScanReport struct {
Certificates []x509.Certificate `json:"certificates"`

// Bitcoin
BitcoinServices map[string]*BitcoinService `json:"bitcoinServices"`
BitcoinAddresses []string `json:"bitcoinAddresses"`
BitcoinServices map[string]*BitcoinService `json:"bitcoinServices"`

// SSH
SSHKey string `json:"sshKey"`
Expand All @@ -64,8 +66,20 @@ type OnionScanReport struct {
SMTPFingerprint string `json:"smtpFingerprint"`
SMTPBanner string `json:"smtpBanner"`

ProtocolInfoList []ProtocolInfo `json::"protocolInfoList"`

NextAction string `json:"lastAction"`
TimedOut bool
TimedOut bool `json:"timedOut"`
}

type ProtocolInfo struct {
Type string `json:"type"`
Port uint `json:"port:`
Info interface{} `json:"info"`
}

func (osr *OnionScanReport) AddProtocolInfo(protocolType string, protocolPort uint, protocolInfo interface{}) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hasn't been finalized yet, and commits shouldn't introduce it or rely on it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll delete it.

osr.ProtocolInfoList = append(osr.ProtocolInfoList, ProtocolInfo{protocolType, protocolPort, protocolInfo})
}

func LoadReportFromFile(filename string) (OnionScanReport, error) {
Expand Down