mirror of
https://github.com/PeernetOfficial/Cmd.git
synced 2026-07-17 02:47:52 +01:00
Add high-level filters for incoming and outgoing messages
This commit is contained in:
Kleissner
242
Command Debug.go
242
Command Debug.go
@@ -7,6 +7,7 @@ Author: Peter Kleissner
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"sync"
|
||||
@@ -14,6 +15,7 @@ import (
|
||||
|
||||
"github.com/PeernetOfficial/core"
|
||||
"github.com/PeernetOfficial/core/dht"
|
||||
"github.com/btcsuite/btcd/btcec"
|
||||
)
|
||||
|
||||
// debugCmdConnect connects to the node ID
|
||||
@@ -28,8 +30,8 @@ func debugCmdConnect(nodeID []byte) {
|
||||
} else {
|
||||
fmt.Printf("* In local routing table: No. Lookup via DHT. Timeout = 10 seconds.\n")
|
||||
|
||||
addKeyMonitor(nodeID)
|
||||
defer removeKeyMonitor(nodeID)
|
||||
hashMonitorControl(nodeID, 0)
|
||||
defer hashMonitorControl(nodeID, 1)
|
||||
|
||||
// Discovery via DHT.
|
||||
_, peer, _ = core.FindNode(nodeID, time.Second*10)
|
||||
@@ -61,27 +63,39 @@ var monitorKeys map[string]struct{}
|
||||
var monitorKeysMutex sync.RWMutex
|
||||
var enableMonitorAll = false // Enables output for all searches. Otherwise it only monitors searches stored in monitorKeys.
|
||||
|
||||
func addKeyMonitor(key []byte) {
|
||||
// hashMonitorControl adds (0), removes (1), or inverts (2) a hash on the list
|
||||
func hashMonitorControl(key []byte, action int) (added bool) {
|
||||
monitorKeysMutex.Lock()
|
||||
monitorKeys[string(key)] = struct{}{}
|
||||
monitorKeysMutex.Unlock()
|
||||
defer monitorKeysMutex.Unlock()
|
||||
|
||||
switch action {
|
||||
case 0:
|
||||
monitorKeys[string(key)] = struct{}{}
|
||||
added = true
|
||||
case 1:
|
||||
delete(monitorKeys, string(key))
|
||||
case 2:
|
||||
if _, ok := monitorKeys[string(key)]; !ok {
|
||||
monitorKeys[string(key)] = struct{}{}
|
||||
added = true
|
||||
} else {
|
||||
delete(monitorKeys, string(key))
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func removeKeyMonitor(key []byte) {
|
||||
func hashIsMonitored(key []byte) (monitored bool) {
|
||||
monitorKeysMutex.Lock()
|
||||
delete(monitorKeys, string(key))
|
||||
_, monitored = monitorKeys[string(key)]
|
||||
monitorKeysMutex.Unlock()
|
||||
return
|
||||
}
|
||||
|
||||
func filterSearchStatus(client *dht.SearchClient, function, format string, v ...interface{}) {
|
||||
// check if the search client is actively being monitored
|
||||
if !enableMonitorAll {
|
||||
monitorKeysMutex.Lock()
|
||||
_, ok := monitorKeys[string(client.Key)]
|
||||
monitorKeysMutex.Unlock()
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if !enableMonitorAll && !hashIsMonitored(client.Key) {
|
||||
return
|
||||
}
|
||||
|
||||
keyA := client.Key
|
||||
@@ -108,7 +122,7 @@ func filterSearchStatus(client *dht.SearchClient, function, format string, v ...
|
||||
var enableWatchIncomingAll = false
|
||||
|
||||
func filterIncomingRequest(peer *core.PeerInfo, Action int, Key []byte, Info interface{}) {
|
||||
if !enableWatchIncomingAll {
|
||||
if !enableWatchIncomingAll && !hashIsMonitored(peer.NodeID) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -124,5 +138,199 @@ func filterIncomingRequest(peer *core.PeerInfo, Action int, Key []byte, Info int
|
||||
requestType = "INFO_STORE"
|
||||
}
|
||||
|
||||
fmt.Printf("Incoming info request %s from %s for key %s\n", requestType, hex.EncodeToString(peer.NodeID), hex.EncodeToString(Key))
|
||||
if Action == core.ActionFindSelf && bytes.Equal(peer.NodeID, Key) {
|
||||
fmt.Printf("Info request from %s %s\n", hex.EncodeToString(peer.NodeID), requestType)
|
||||
} else {
|
||||
fmt.Printf("Info request from %s %s for key %s\n", hex.EncodeToString(peer.NodeID), requestType, hex.EncodeToString(Key))
|
||||
}
|
||||
}
|
||||
|
||||
// ---- filter for incoming and outgoing packets ----
|
||||
|
||||
func filterMessageIn(peer *core.PeerInfo, raw *core.MessageRaw, message interface{}) {
|
||||
if !hashIsMonitored(peer.NodeID) {
|
||||
// TODO: For Announcement/Response also check data, Traverse the final target
|
||||
return
|
||||
}
|
||||
|
||||
commandA := "Unknown"
|
||||
|
||||
switch raw.Command {
|
||||
case core.CommandAnnouncement:
|
||||
commandA = "Announcement"
|
||||
case core.CommandResponse:
|
||||
commandA = "Response"
|
||||
case core.CommandPing:
|
||||
commandA = "Ping"
|
||||
case core.CommandPong:
|
||||
commandA = "Pong"
|
||||
case core.CommandLocalDiscovery:
|
||||
commandA = "Local Discovery"
|
||||
case core.CommandTraverse:
|
||||
commandA = "Traverse"
|
||||
case core.CommandChat:
|
||||
commandA = "Chat"
|
||||
}
|
||||
|
||||
output := fmt.Sprintf("-------- Node %s Incoming %s --------\n", hex.EncodeToString(peer.NodeID), commandA)
|
||||
output += fmt.Sprintf("Sender Peer ID: %s\n", hex.EncodeToString(peer.PublicKey.SerializeCompressed()))
|
||||
|
||||
if !raw.SenderPublicKey.IsEqual(peer.PublicKey) {
|
||||
output += fmt.Sprintf("WARNING: Mismatch of public keys, sender %s and packet indicates %s\n", hex.EncodeToString(peer.PublicKey.SerializeCompressed()), hex.EncodeToString(raw.SenderPublicKey.SerializeCompressed()))
|
||||
}
|
||||
|
||||
if message == nil {
|
||||
output += "(no message decoded)\n"
|
||||
} else if announce, ok := message.(*core.MessageAnnouncement); ok {
|
||||
output += fmt.Sprintf("Fields:\n Protocol supported %d\n", announce.Protocol)
|
||||
output += fmt.Sprintf(" Feature bits %d\n", announce.Features)
|
||||
output += fmt.Sprintf(" Action bits %d\n", announce.Actions)
|
||||
output += fmt.Sprintf(" Blockchain Height %d\n", announce.BlockchainHeight)
|
||||
output += fmt.Sprintf(" Blockchain Version %d\n", announce.BlockchainVersion)
|
||||
output += fmt.Sprintf(" Port Internal %d\n", announce.PortInternal)
|
||||
output += fmt.Sprintf(" Port External %d\n", announce.PortExternal)
|
||||
output += fmt.Sprintf(" User Agent %s\n", announce.UserAgent)
|
||||
|
||||
if len(announce.FindPeerKeys) > 0 {
|
||||
output += fmt.Sprintf("FIND_PEER %d records:\n", len(announce.FindPeerKeys))
|
||||
}
|
||||
for _, find := range announce.FindPeerKeys {
|
||||
output += fmt.Sprintf(" - Find peer %s\n", hex.EncodeToString(find.Hash))
|
||||
}
|
||||
if len(announce.FindDataKeys) > 0 {
|
||||
output += fmt.Sprintf("FIND_VALUE %d records:\n", len(announce.FindDataKeys))
|
||||
}
|
||||
for _, find := range announce.FindDataKeys {
|
||||
output += fmt.Sprintf(" - Find data %s\n", hex.EncodeToString(find.Hash))
|
||||
}
|
||||
if len(announce.InfoStoreFiles) > 0 {
|
||||
output += fmt.Sprintf("INFO_STORE %d records:\n", len(announce.InfoStoreFiles))
|
||||
}
|
||||
for _, info := range announce.InfoStoreFiles {
|
||||
output += fmt.Sprintf(" - Info store %s, type %d, size %d\n", hex.EncodeToString(info.ID.Hash), info.Type, info.Size)
|
||||
}
|
||||
} else if response, ok := message.(*core.MessageResponse); ok {
|
||||
output += fmt.Sprintf("Fields:\n Protocol supported %d\n", response.Protocol)
|
||||
output += fmt.Sprintf(" Feature bits %d\n", response.Features)
|
||||
output += fmt.Sprintf(" Action bits %d\n", response.Actions)
|
||||
output += fmt.Sprintf(" Blockchain Height %d\n", response.BlockchainHeight)
|
||||
output += fmt.Sprintf(" Blockchain Version %d\n", response.BlockchainVersion)
|
||||
output += fmt.Sprintf(" Port Internal %d\n", response.PortInternal)
|
||||
output += fmt.Sprintf(" Port External %d\n", response.PortExternal)
|
||||
output += fmt.Sprintf(" User Agent %s\n", response.UserAgent)
|
||||
|
||||
for _, hash := range response.Hash2Peers {
|
||||
isLast := ""
|
||||
if hash.IsLast {
|
||||
isLast = " [last result in sequence]"
|
||||
}
|
||||
output += fmt.Sprintf(" - Peers known for the hash %s%s\n", hex.EncodeToString(hash.ID.Hash), isLast)
|
||||
for n := range hash.Closest {
|
||||
output += fmt.Sprintf(" Close peer:\n%s\n", outputPeerRecord(&hash.Closest[n]))
|
||||
}
|
||||
for n := range hash.Storing {
|
||||
output += fmt.Sprintf(" Peer stores:\n%s\n", outputPeerRecord(&hash.Storing[n]))
|
||||
}
|
||||
}
|
||||
for _, find := range response.FilesEmbed {
|
||||
output += fmt.Sprintf(" - File embedded %s (%d bytes)\n", hex.EncodeToString(find.ID.Hash), len(find.Data))
|
||||
}
|
||||
for _, hash := range response.HashesNotFound {
|
||||
output += fmt.Sprintf(" - Hash not found %s\n", hex.EncodeToString(hash))
|
||||
}
|
||||
} else if traverse, ok := message.(*core.MessageTraverse); ok {
|
||||
output += fmt.Sprintf("Fields:\n Target Peer %s\n", hex.EncodeToString(traverse.TargetPeer.SerializeCompressed()))
|
||||
output += fmt.Sprintf(" Authorized Relay Peer %s\n", hex.EncodeToString(traverse.AuthorizedRelayPeer.SerializeCompressed()))
|
||||
output += fmt.Sprintf(" Signer Public Key %s\n", hex.EncodeToString(traverse.SignerPublicKey.SerializeCompressed()))
|
||||
output += fmt.Sprintf(" Expires %s\n", traverse.Expires.String())
|
||||
output += fmt.Sprintf(" IPv4 %s\n", traverse.IPv4.String())
|
||||
output += fmt.Sprintf(" Port IPv4 %d\n", traverse.PortIPv4)
|
||||
output += fmt.Sprintf(" Port IPv4 Reported External %d\n", traverse.PortIPv4ReportedExternal)
|
||||
output += fmt.Sprintf(" IPv6 %s\n", traverse.IPv6.String())
|
||||
output += fmt.Sprintf(" Port IPv6 %d\n", traverse.PortIPv6)
|
||||
output += fmt.Sprintf(" Port IPv6 Reported External %d\n", traverse.PortIPv6ReportedExternal)
|
||||
}
|
||||
|
||||
output += "--------\n"
|
||||
|
||||
fmt.Printf("%s", output)
|
||||
}
|
||||
|
||||
func outputPeerRecord(record *core.PeerRecord) (output string) {
|
||||
output += fmt.Sprintf(" * Peer ID %s\n", hex.EncodeToString(record.PublicKey.SerializeCompressed()))
|
||||
output += fmt.Sprintf(" Node ID %s\n", hex.EncodeToString(record.NodeID))
|
||||
if record.IPv4 != nil && !record.IPv4.IsUnspecified() {
|
||||
output += fmt.Sprintf(" IPv4 %s\n", record.IPv4.String())
|
||||
output += fmt.Sprintf(" Port IPv4 %d\n", record.IPv4Port)
|
||||
output += fmt.Sprintf(" Port IPv4 Reported Internal %d\n", record.IPv4PortReportedInternal)
|
||||
output += fmt.Sprintf(" Port IPv4 Reported External %d\n", record.IPv4PortReportedExternal)
|
||||
}
|
||||
if record.IPv6 != nil && !record.IPv6.IsUnspecified() {
|
||||
output += fmt.Sprintf(" IPv6 %s\n", record.IPv6.String())
|
||||
output += fmt.Sprintf(" Port IPv6 %d\n", record.IPv6Port)
|
||||
output += fmt.Sprintf(" Port IPv6 Reported Internal %d\n", record.IPv6PortReportedInternal)
|
||||
output += fmt.Sprintf(" Port IPv6 Reported External %d\n", record.IPv6PortReportedExternal)
|
||||
}
|
||||
output += fmt.Sprintf(" Last Contact %s", record.LastContactT.Format(dateFormat))
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func outputOutgoingMessage(peer *core.PeerInfo, packet *core.PacketRaw) {
|
||||
if !hashIsMonitored(peer.NodeID) {
|
||||
// TODO: For Announcement/Response also check data, Traverse the final target
|
||||
return
|
||||
}
|
||||
|
||||
commandA := "Unknown"
|
||||
|
||||
switch packet.Command {
|
||||
case core.CommandAnnouncement:
|
||||
commandA = "Announcement"
|
||||
case core.CommandResponse:
|
||||
commandA = "Response"
|
||||
case core.CommandPing:
|
||||
commandA = "Ping"
|
||||
case core.CommandPong:
|
||||
commandA = "Pong"
|
||||
case core.CommandLocalDiscovery:
|
||||
commandA = "Local Discovery"
|
||||
case core.CommandTraverse:
|
||||
commandA = "Traverse"
|
||||
case core.CommandChat:
|
||||
commandA = "Chat"
|
||||
}
|
||||
|
||||
output := fmt.Sprintf("-------- Node %s Outgoing %s --------\n", hex.EncodeToString(peer.NodeID), commandA)
|
||||
output += fmt.Sprintf("Receiver Peer ID: %s\n", hex.EncodeToString(peer.PublicKey.SerializeCompressed()))
|
||||
|
||||
// TODO: Decoding of payload data (done by caller of this function)
|
||||
|
||||
output += "--------\n"
|
||||
|
||||
fmt.Printf("%s", output)
|
||||
}
|
||||
|
||||
func filterMessageOutAnnouncement(receiverPublicKey *btcec.PublicKey, peer *core.PeerInfo, packet *core.PacketRaw, findSelf bool, findPeer []core.KeyHash, findValue []core.KeyHash, files []core.InfoStore) {
|
||||
if peer == nil {
|
||||
peer = &core.PeerInfo{PublicKey: receiverPublicKey, NodeID: core.PublicKey2NodeID(receiverPublicKey)}
|
||||
}
|
||||
|
||||
outputOutgoingMessage(peer, packet)
|
||||
}
|
||||
|
||||
func filterMessageOutResponse(peer *core.PeerInfo, packet *core.PacketRaw, hash2Peers []core.Hash2Peer, filesEmbed []core.EmbeddedFileData, hashesNotFound [][]byte) {
|
||||
outputOutgoingMessage(peer, packet)
|
||||
}
|
||||
|
||||
func filterMessageOutTraverse(peer *core.PeerInfo, packet *core.PacketRaw, embeddedPacket *core.PacketRaw, receiverEnd *btcec.PublicKey) {
|
||||
outputOutgoingMessage(peer, packet)
|
||||
}
|
||||
|
||||
func filterMessageOutPing(peer *core.PeerInfo, packet *core.PacketRaw, connection *core.Connection) {
|
||||
outputOutgoingMessage(peer, packet)
|
||||
}
|
||||
|
||||
func filterMessageOutPong(peer *core.PeerInfo, packet *core.PacketRaw) {
|
||||
outputOutgoingMessage(peer, packet)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user