github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-22 14:24:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed variables and simplified code

Browse source
This commit is contained in:
Pourliver 2019-05-21 10:10:52 -04:00
commit 2985fb6baa
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/rdp_proxy/rdp_proxy_linux_amd64.go
View file

@ -80,9 +80,9 @@ mod.AddParam(session.NewStringParameter("rdp.proxy.targets", session.ParamSubnet
mod.AddParam(session.NewStringParameter("rdp.proxy.regexp", "(?i)(cookie:|mstshash=|clipboard data|client info|credential|username|password|error)", "", "Print PyRDP logs matching this regular expression.")) mod.AddParam(session.NewStringParameter("rdp.proxy.regexp", "(?i)(cookie:|mstshash=|clipboard data|client info|credential|username|password|error)", "", "Print PyRDP logs matching this regular expression."))
// Optional paramaters // Optional paramaters
mod.AddParam(session.NewStringParameter("rdp.proxy.nla.seccheck", "", "", "Path to rdp-sec-check.pl. Allows more complex exploits when NLA is enforced (optional).")) mod.AddParam(session.NewStringParameter("rdp.proxy.nla.seccheck", "", "", "Path to rdp-sec-check.pl. Allows more complex exploits when NLA is enforced (optional)."))
mod.AddParam(session.NewStringParameter("rdp.proxy.nla.mode", "IGNORE", "(IGNORE|RELAY|REDIRECT)", "Specify how to handle connections to a NLA-enabled host. Require rdp.proxy.nla.seccheck.")) mod.AddParam(session.NewStringParameter("rdp.proxy.nla.mode", "IGNORE", "(IGNORE|RELAY|REDIRECT)", "Specify how to handle connections to a NLA-enabled host. Either IGNORE, RELAY or REDIRECT. Require rdp.proxy.nla.seccheck."))
mod.AddParam(session.NewStringParameter("rdp.proxy.nla.redirectip", "", "", "Specify IP to redirect clients that connects to NLA targets. Require rdp.proxy.nla.mode REDIRECT")) mod.AddParam(session.NewStringParameter("rdp.proxy.nla.redirect.ip", "", "", "Specify IP to redirect clients that connects to NLA targets. Require rdp.proxy.nla.mode REDIRECT"))
mod.AddParam(session.NewIntParameter("rdp.proxy.nla.redirectport", "3389", "Specify port to redirect clients that connects to NLA targets. Require rdp.proxy.nla.mode REDIRECT")) mod.AddParam(session.NewIntParameter("rdp.proxy.nla.redirect.port", "3389", "Specify port to redirect clients that connects to NLA targets. Require rdp.proxy.nla.mode REDIRECT"))
return mod return mod
} }
@ -110,17 +110,19 @@ func (mod *RdpProxy) isTarget(ip string) bool {
} }
func (mod *RdpProxy) isNLAEnforced(target string) (nla bool, err error) { func (mod *RdpProxy) isNLAEnforced(target string) (nla bool, err error) {
if mod.secCheck != "" { if mod.secCheck == "" {
return false, err
output, err := core.Exec(mod.secCheck, []string{
target,
})
// Hybrid means enforce NLA + SSL
if strings.Contains(output, "HYBRID_REQUIRED_BY_SERVER") {
return true, err
}
} }
output, err := core.Exec(mod.secCheck, []string{
target,
})
// Hybrid means enforce NLA + SSL
if strings.Contains(output, "HYBRID_REQUIRED_BY_SERVER") {
return true, err
}
return false, err return false, err
} }
@ -267,9 +269,12 @@ func (mod *RdpProxy) Configure() (err error) {
return return
} else if err, mod.nlaMode = mod.StringParam("rdp.proxy.nla.mode"); err != nil { } else if err, mod.nlaMode = mod.StringParam("rdp.proxy.nla.mode"); err != nil {
return return
} else if err, mod.redirectIP = mod.IPParam("rdp.proxy.nla.redirectip"); err != nil { } else if mod.nlaMode == "RELAY" {
mod.Info("Mode RELAY is unimplemented yet, fallbacking to mode IGNORE.")
mod.nlaMode = "IGNORE"
} else if err, mod.redirectIP = mod.IPParam("rdp.proxy.nla.redirect.ip"); err != nil {
return return
} else if err, mod.redirectPort = mod.IntParam("rdp.proxy.nla.redirectport"); err != nil { } else if err, mod.redirectPort = mod.IntParam("rdp.proxy.nla.redirect.port"); err != nil {
return return
} else if mod.regexp != "" { } else if mod.regexp != "" {
if mod.compiled, err = regexp.Compile(mod.regexp); err != nil { if mod.compiled, err = regexp.Compile(mod.regexp); err != nil {
@ -330,8 +335,6 @@ func (mod *RdpProxy) handleRdpConnection(payload *nfqueue.Payload) int {
// Only if seccheck is set // Only if seccheck is set
if targetNLA { if targetNLA {
switch mod.nlaMode { switch mod.nlaMode {
case "RELAY":
mod.Info("%s Target has NLA enabled and mode RELAY, unimplemented", ips)
case "REDIRECT": case "REDIRECT":
// TODO : Find a way to disconnect user right after stealing credentials. // TODO : Find a way to disconnect user right after stealing credentials.
// Start a PyRDP instance to the preconfigured vulnerable host // Start a PyRDP instance to the preconfigured vulnerable host