minor fixes to usage() and comments

This commit is contained in:
Steven Polley 2024-04-07 21:33:13 -06:00
parent b95f764fc9
commit 19388ca140
3 changed files with 43 additions and 21 deletions

View File

@ -45,7 +45,16 @@ func main() {
} }
func usage() { func usage() {
fmt.Println(os.Args[0], "usage") fmt.Print(`hyp <server>
fmt.Println("Supply an ordered list of ports to knock")
fmt.Println(os.Args[0], "server") Example Usage:
# Transmit an authentic knock sequence to a server
hyp 10.69.4.20
# You can use a DNS name too
hyp hyp.stevenpolley.net
`)
os.Exit(1)
} }

View File

@ -41,28 +41,35 @@ func main() {
usage() usage()
} }
packetServer(os.Args[2]) packetServer(os.Args[2])
default:
usage()
} }
} }
func usage() { func usage() {
fmt.Print(`hyp <command> fmt.Print(`hypd <command>
Commands: Commands:
generatesecret - creates a pre shared key file named hyp.secret which can be distributed to a trusted client generatesecret - creates a pre shared key file named hyp.secret which can be distributed to a trusted client
server <device> - TBD server <device> - runs the hypd server watching for an authentic knock sequence
Example Usage: Example Usage:
# Linux # Generate a secret, to be shared with a trusted client
hyp server "/dev/eth0" hypd generatesecret
# Linux - ip link
hypd server eth0
# Windows - get-netadapter | where {$_.Name -eq Ethernet} | Select-Object -Property DeviceName # Windows - get-netadapter | where {$_.Name -eq Ethernet} | Select-Object -Property DeviceName
hyp server "\\Device\\NPF_{A066F7DE-CC2D-4E4B-97C4-BF0EC4C03649}" hypd server "\\Device\\NPF_{A066F7DE-CC2D-4E4B-97C4-BF0EC4C03649}"
`) `)
os.Exit(1) os.Exit(1)
} }
// TBD: Implement // TBD: Implement - this is a temporary routine to demonstrate an application
func handleSuccess(srcip string) { func handleSuccess(srcip string) {
fmt.Println("Success for ", srcip) fmt.Println("Success for ", srcip)

View File

@ -19,30 +19,34 @@ type Client struct {
// KnockSequence is used keep track of an ordered knock sequence and whether it's been marked for use (to prevent replay attacks) // KnockSequence is used keep track of an ordered knock sequence and whether it's been marked for use (to prevent replay attacks)
type KnockSequence struct { type KnockSequence struct {
Used bool Used bool // If true, that means this knock sequence has already been used once. It may still be within the valid time window, but it can't be used again
PortSequence [4]uint16 PortSequence [4]uint16 // Each knock sequence is four ports long
} }
var ( var (
clients map[string]*Client // Contains a map of clients clients map[string]*Client // Contains a map of clients
knockSequences []KnockSequence knockSequences []KnockSequence // We have 3 valid knock sequences at any time to account for clock skew
sharedSecret string // base32 encoded shared secret used for totp sharedSecret string // base32 encoded shared secret used for totp
) )
// packetServer is the main function when operating in server mode // packetServer is the main function when operating in server mode
// it sets up the pcap on the capture deivce and starts a goroutine // it sets up the pcap on the capture device and starts a goroutine
// to rotate the knock sequence // to rotate the knock sequence
func packetServer(captureDevice string) { func packetServer(captureDevice string) {
clients = make(map[string]*Client, 0) // key is flow, value is the current progress through the sequence. i.e. value of 1 means that the first port in the sequence was successful clients = make(map[string]*Client, 0) // key is source IP address, value is the current progress through the sequence. i.e. value of 1 means that the first port in the sequence was successful
knockSequences = []KnockSequence{} // Slice of accepted port sequences, there have to be several to account for clock skew between client and server knockSequences = []KnockSequence{} // Slice of accepted port sequences, there have to be several to account for clock skew between client and server
// Open pcap handle on device
handle, err := pcap.OpenLive(captureDevice, 1600, true, pcap.BlockForever) handle, err := pcap.OpenLive(captureDevice, 1600, true, pcap.BlockForever)
if err != nil { if err != nil {
log.Fatalf("failed to open adapter") log.Fatalf("failed to open adapter")
} }
packetSource := gopacket.NewPacketSource(handle, handle.LinkType()) packetSource := gopacket.NewPacketSource(handle, handle.LinkType())
// Setup a goroutine to periodically rotate the authentic knock sequence
go rotateSequence(handle) go rotateSequence(handle)
// Read from the pcap handle until we exit
for packet := range packetSource.Packets() { for packet := range packetSource.Packets() {
handlePacket(packet) // Do something with a packet here. handlePacket(packet) // Do something with a packet here.
} }
@ -52,14 +56,15 @@ func packetServer(captureDevice string) {
func handlePacket(packet gopacket.Packet) { func handlePacket(packet gopacket.Packet) {
port := binary.BigEndian.Uint16(packet.TransportLayer().TransportFlow().Dst().Raw()) port := binary.BigEndian.Uint16(packet.TransportLayer().TransportFlow().Dst().Raw())
srcip := packet.NetworkLayer().NetworkFlow().Src().String() srcip := packet.NetworkLayer().NetworkFlow().Src().String()
client, ok := clients[srcip] client, ok := clients[srcip]
if !ok { // create the client, identify which authentic knock sequence is matched if !ok { // client doesn't exist yet
for i, knockSequence := range knockSequences { for i, knockSequence := range knockSequences { // identify which of the 3 authentic knock sequences is matched
if knockSequence.Used { // skip over sequences that are already used to prevent replay attack if knockSequence.Used { // skip over sequences that are already used to prevent replay attack
continue continue
} }
if port == knockSequence.PortSequence[0] { if port == knockSequence.PortSequence[0] {
// Create the client and mark the knock sequence as used
clients[srcip] = &Client{Progress: 1, Sequence: knockSequence.PortSequence} clients[srcip] = &Client{Progress: 1, Sequence: knockSequence.PortSequence}
knockSequences[i].Used = true knockSequences[i].Used = true
} }
@ -69,6 +74,7 @@ func handlePacket(packet gopacket.Packet) {
// if it's wrong, reset progress // if it's wrong, reset progress
// TBD: vulnerable to sweep attack - this won't be triggered if a wrong packet doesn't match BPF filter // TBD: vulnerable to sweep attack - this won't be triggered if a wrong packet doesn't match BPF filter
// TBD: make the sweep attack fix on by default, but configurable to be off to allow for limited BPF filter for extremely low overhead as compromise.
if port != client.Sequence[client.Progress] { if port != client.Sequence[client.Progress] {
delete(clients, srcip) delete(clients, srcip)
fmt.Printf("port '%d' is in sequence, but came at unexpected order - resetting progress", port) fmt.Printf("port '%d' is in sequence, but came at unexpected order - resetting progress", port)
@ -79,7 +85,7 @@ func handlePacket(packet gopacket.Packet) {
client.Progress++ client.Progress++
if client.Progress >= len(client.Sequence) { if client.Progress >= len(client.Sequence) {
delete(clients, srcip) delete(clients, srcip)
handleSuccess(srcip) handleSuccess(srcip) // The magic function, the knock is completed
return return
} }
} }