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

Apply phantom IP overrides from the reg response #277

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Apply phantom IP overrides from the reg response #277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8b400
applying phantom ipv4 address from the reg response
0x90-n Jul 11, 2024
8926272
fix to include v6
0x90-n Jul 11, 2024
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
26 changes: 25 additions & 1 deletion pkg/station/lib/registration_ingest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package lib

import (
"encoding/binary"
"bytes"
"context"
"errors"
Expand Down Expand Up @@ -418,6 +419,10 @@ func (rm *RegistrationManager) NewRegistrationC2SWrapper(c2sw *pb.C2SWrapper, in
// If a C2SWrapper has a registration response at this stage EITHER auth was disabled OR it was
// signed by a registration server and has overrides that should be applied
var dstPort = -1

// Used to apply phantom IP overrides from the registration response
var ipOverride net.IP

if rr := c2sw.GetRegistrationResponse(); rr != nil {
if rr.DstPort != nil {
dstPort = int(rr.GetDstPort())
Expand All @@ -428,15 +433,34 @@ func (rm *RegistrationManager) NewRegistrationC2SWrapper(c2sw *pb.C2SWrapper, in
if rr.GetTransportParams() != nil && !c2s.GetDisableRegistrarOverrides() {
c2s.TransportParams = rr.GetTransportParams()
}
if !includeV6 {
// apply the ipv4 address from the registration response, if rr.Ipv4Addr is not empty
if rr.Ipv4Addr != nil && *rr.Ipv4Addr != 0 {
ipv4Bytes := make([]byte, 4)
binary.BigEndian.PutUint32(ipv4Bytes, *rr.Ipv4Addr)
ipOverride = net.IP(ipv4Bytes)
}
} else {
// apply the ipv6 address from the registration response, if rr.Ipv6Addr is not empty
if rr.Ipv6Addr != nil {
ipOverride = net.IP(rr.Ipv6Addr)
}

}

// TODO: future, apply the ip addresses from the Registration response (rr.IPv4Addr, rr.IPv6Addr)
}

reg, err := rm.NewRegistration(c2s, &conjureKeys, includeV6, &regSrc)
if err != nil || reg == nil {
return nil, fmt.Errorf("failed to build registration: %w", err)
}

if ipOverride != nil {
// If the ipOverride (which is populated by Ipv4Addr or Ipv6Addr from the registration response)
// is not empty, use it to override the phantom IP that the station derived
reg.PhantomIp = ipOverride
}

clientAddr := net.IP(c2sw.GetRegistrationAddress())

if reg.PhantomIp.To4() != nil && clientAddr.To4() == nil {
Expand Down
Loading