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

Jump to bottom

functionality for registering on behalf of a client #161

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

functionality for registering on behalf of a client #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 21 additions & 7 deletions cli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func main() {
var registerOnly = flag.Bool("register-only", false, "register to use a phantom, but do not connect to a covert. Only works with \"bdapi\" registrar")
var dtlsUnordered = flag.Bool("unordered-dtls", false, "Set DTLS reliability to unordered. Only works with DTLS transport.")

var registerFor = flag.String("register-for", "", "Register for a client, adding IP address we would like to register for to the X-Forwarded-For header. Only works with \"bdapi\" registrar")
flag.Usage = func() {
fmt.Fprintf(os.Stderr, "Dark Decoy CLI\n$./cli -connect-addr=<decoy_address> [OPTIONS] \n\nOptions:\n")
flag.PrintDefaults()
Expand Down Expand Up @@ -176,23 +177,35 @@ func main() {
os.Exit(1)
}

if *registerFor != "" {
if net.ParseIP(*registerFor) == nil {
fmt.Fprintf(os.Stderr, "Provided client IP address \"%s\" is invalid\n", *registerFor)
os.Exit(1)
}
}
if *registerOnly {
err = register(*td, *APIRegistration, *registrar, *connectTarget, *proxyHeader, v6Support, *width, t, *disableOverrides, *phantomNet, *registerOnly)
if *registerFor != "" && *registrar != "bdapi" {
//setting registrar to bdapi if register-for flag is set.
fmt.Printf("Registering for a client: overwrite registrar to bdapi registrar\n")
*registrar = "bdapi"
}
err = register(*td, *APIRegistration, *registrar, *connectTarget, *proxyHeader, v6Support, *width, t, *disableOverrides, *phantomNet, *registerOnly, *registerFor)
if err != nil {
tapdance.Logger().Println(err)
os.Exit(1)
}
} else {
err = connectDirect(*td, *APIRegistration, *registrar, *connectTarget, *port, *proxyHeader, v6Support, *width, t, *disableOverrides, *phantomNet, *registerOnly)
*registerFor = "" //set registerFor to empty ip just in case.
err = connectDirect(*td, *APIRegistration, *registrar, *connectTarget, *port, *proxyHeader, v6Support, *width, t, *disableOverrides, *phantomNet, *registerOnly, *registerFor)
if err != nil {
tapdance.Logger().Println(err)
os.Exit(1)
}
}
}

func register(td bool, apiEndpoint string, registrar string, dummyConnectTarget string, proxyHeader bool, v6Support bool, width int, t tapdance.Transport, disableOverrides bool, phantomNet string, registerOnly bool) error {
tdDialer, err := prepareDialer(td, apiEndpoint, registrar, proxyHeader, v6Support, width, t, disableOverrides, phantomNet, registerOnly)
func register(td bool, apiEndpoint string, registrar string, dummyConnectTarget string, proxyHeader bool, v6Support bool, width int, t tapdance.Transport, disableOverrides bool, phantomNet string, registerOnly bool, registerFor string) error {
tdDialer, err := prepareDialer(td, apiEndpoint, registrar, proxyHeader, v6Support, width, t, disableOverrides, phantomNet, registerOnly, registerFor)
if err != nil {
return fmt.Errorf("error preparing tapdance Dialer: %w", err)
}
Expand All @@ -203,7 +216,7 @@ func register(td bool, apiEndpoint string, registrar string, dummyConnectTarget
return nil
}

func connectDirect(td bool, apiEndpoint string, registrar string, connectTarget string, localPort int, proxyHeader bool, v6Support bool, width int, t tapdance.Transport, disableOverrides bool, phantomNet string, registerOnly bool) error {
func connectDirect(td bool, apiEndpoint string, registrar string, connectTarget string, localPort int, proxyHeader bool, v6Support bool, width int, t tapdance.Transport, disableOverrides bool, phantomNet string, registerOnly bool, registerFor string) error {
if _, _, err := net.SplitHostPort(connectTarget); err != nil {
return fmt.Errorf("failed to parse host and port from connectTarget %s: %v",
connectTarget, err)
Expand All @@ -215,7 +228,7 @@ func connectDirect(td bool, apiEndpoint string, registrar string, connectTarget
return fmt.Errorf("error listening on port %v: %v", localPort, err)
}

tdDialer, err := prepareDialer(td, apiEndpoint, registrar, proxyHeader, v6Support, width, t, disableOverrides, phantomNet, registerOnly)
tdDialer, err := prepareDialer(td, apiEndpoint, registrar, proxyHeader, v6Support, width, t, disableOverrides, phantomNet, registerOnly, registerFor)
if err != nil {
return fmt.Errorf("error preparing tapdance Dialer: %w", err)
}
Expand Down Expand Up @@ -297,7 +310,7 @@ func setSingleDecoyHost(decoy string) error {
return nil
}

func prepareDialer(td bool, apiEndpoint string, registrar string, proxyHeader bool, v6Support bool, width int, t tapdance.Transport, disableOverrides bool, phantomNet string, registerOnly bool) (tapdance.Dialer, error) {
func prepareDialer(td bool, apiEndpoint string, registrar string, proxyHeader bool, v6Support bool, width int, t tapdance.Transport, disableOverrides bool, phantomNet string, registerOnly bool, registerFor string) (tapdance.Dialer, error) {

tdDialer := tapdance.Dialer{
DarkDecoy: !td,
Expand All @@ -311,6 +324,7 @@ func prepareDialer(td bool, apiEndpoint string, registrar string, proxyHeader bo
PhantomNet: phantomNet,
DisableRegistrarOverrides: disableOverrides,
RegisterOnly: registerOnly,
RegisterFor: registerFor,
}

var err error
Expand Down
6 changes: 6 additions & 0 deletions tapdance/conjure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ type ConjureSession struct {

// performance tracking
stats *pb.SessionStats

//registerFor flag
RegisterOnBehalfOf bool

// registerFor value
RegisterFor *net.IP
}

// MakeConjureSessionSilent creates a conjure session without logging anything
Expand Down
13 changes: 13 additions & 0 deletions tapdance/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ type Dialer struct {

// Whether we want to register and connect to a phantom, or register only
RegisterOnly bool

//register for a client, value being their original IP
RegisterFor string
}

// Dial connects to the address on the named network.
Expand Down Expand Up @@ -174,6 +177,16 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
cjSession.DisableRegistrarOverrides = d.DisableRegistrarOverrides
cjSession.RegDelay = d.RegDelay

if d.RegisterFor != "" {
cjSession.RegisterOnBehalfOf = true
parsedIP := net.ParseIP(d.RegisterFor)
if parsedIP == nil {
fmt.Println("Invalid IP address")
return nil, errors.New("Invalid IP address to register on behalf of")
}
cjSession.RegisterFor = &parsedIP
}

if d.V6Support {
cjSession.V6Support = &V6{include: both, support: true}
} else {
Expand Down