diff --git a/api/main.go b/api/main.go index 0a6dc516a..fbb704069 100644 --- a/api/main.go +++ b/api/main.go @@ -51,7 +51,7 @@ func main() { tapTargets := getTapTargets() if tapTargets != nil { tap.SetFilterAuthorities(tapTargets) - rlog.Info("Filtering for the following authorities:", tap.GetFilterIPs()) + rlog.Infof("Filtering for the following authorities: %v", tap.GetFilterIPs()) } harOutputChannel, outboundLinkOutputChannel := tap.StartPassiveTapper(tapOpts) diff --git a/api/pkg/api/main.go b/api/pkg/api/main.go index 142f43700..42411953b 100644 --- a/api/pkg/api/main.go +++ b/api/pkg/api/main.go @@ -131,7 +131,7 @@ func saveHarToDb(entry *har.Entry, connectionInfo *tap.ConnectionInfo) { unresolvedSource := connectionInfo.ClientIP resolvedSource = k8sResolver.Resolve(unresolvedSource) if resolvedSource == "" { - rlog.Debug("Cannot find resolved name to source: %s\n", unresolvedSource) + rlog.Debugf("Cannot find resolved name to source: %s\n", unresolvedSource) if os.Getenv("SKIP_NOT_RESOLVED_SOURCE") == "1" { return } @@ -139,7 +139,7 @@ func saveHarToDb(entry *har.Entry, connectionInfo *tap.ConnectionInfo) { unresolvedDestination := fmt.Sprintf("%s:%s", connectionInfo.ServerIP, connectionInfo.ServerPort) resolvedDestination = k8sResolver.Resolve(unresolvedDestination) if resolvedDestination == "" { - rlog.Debug("Cannot find resolved name to dest: %s\n", unresolvedDestination) + rlog.Debugf("Cannot find resolved name to dest: %s\n", unresolvedDestination) if os.Getenv("SKIP_NOT_RESOLVED_DEST") == "1" { return } diff --git a/tap/passive_tapper.go b/tap/passive_tapper.go index dbb3beb05..e5b4db5c8 100644 --- a/tap/passive_tapper.go +++ b/tap/passive_tapper.go @@ -213,7 +213,7 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr if localhostIPs, err := getLocalhostIPs(); err != nil { // TODO: think this over rlog.Info("Failed to get self IP addresses") - rlog.Error("Getting-Self-Address", "Error getting self ip address: %s (%v,%+v)", err, err, err) + rlog.Errorf("Getting-Self-Address", "Error getting self ip address: %s (%v,%+v)", err, err, err) ownIps = make([]string, 0) } else { ownIps = localhostIPs @@ -230,14 +230,14 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr SetFilterPorts(appPorts) envVal := os.Getenv(maxHTTP2DataLenEnvVar) if envVal == "" { - rlog.Info("Received empty/no HTTP2_DATA_SIZE_LIMIT env var! falling back to", maxHTTP2DataLenDefault) + rlog.Infof("Received empty/no HTTP2_DATA_SIZE_LIMIT env var! falling back to %v", maxHTTP2DataLenDefault) maxHTTP2DataLen = maxHTTP2DataLenDefault } else { if convertedInt, err := strconv.Atoi(envVal); err != nil { - rlog.Info("Received invalid HTTP2_DATA_SIZE_LIMIT env var! falling back to", maxHTTP2DataLenDefault) + rlog.Infof("Received invalid HTTP2_DATA_SIZE_LIMIT env var! falling back to %v", maxHTTP2DataLenDefault) maxHTTP2DataLen = maxHTTP2DataLenDefault } else { - rlog.Info("Received HTTP2_DATA_SIZE_LIMIT env var:", maxHTTP2DataLenDefault) + rlog.Infof("Received HTTP2_DATA_SIZE_LIMIT env var: %v", maxHTTP2DataLenDefault) maxHTTP2DataLen = convertedInt } } @@ -379,11 +379,11 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr for packet := range source.Packets() { count++ - rlog.Debug("PACKET #%d", count) + rlog.Debugf("PACKET #%d", count) data := packet.Data() bytes += int64(len(data)) if *hexdumppkt { - rlog.Debug("Packet content (%d/0x%x) - %s", len(data), len(data), hex.Dump(data)) + rlog.Debugf("Packet content (%d/0x%x) - %s", len(data), len(data), hex.Dump(data)) } // defrag the IPv4 packet if required @@ -398,12 +398,12 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr if err != nil { log.Fatalln("Error while de-fragmenting", err) } else if newip4 == nil { - rlog.Debug("Fragment...") + rlog.Debugf("Fragment...") continue // packet fragment, we don't have whole packet yet. } if newip4.Length != l { stats.ipdefrag++ - rlog.Debug("Decoding re-assembled packet: %s", newip4.NextLayerType()) + rlog.Debugf("Decoding re-assembled packet: %s", newip4.NextLayerType()) pb, ok := packet.(gopacket.PacketBuilder) if !ok { log.Panic("Not a PacketBuilder") @@ -426,7 +426,7 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr CaptureInfo: packet.Metadata().CaptureInfo, } stats.totalsz += len(tcp.Payload) - rlog.Debug(packet.NetworkLayer().NetworkFlow().Src(), ":", tcp.SrcPort, " -> ", packet.NetworkLayer().NetworkFlow().Dst(), ":", tcp.DstPort) + rlog.Debugf(packet.NetworkLayer().NetworkFlow().Src(), ":", tcp.SrcPort, " -> ", packet.NetworkLayer().NetworkFlow().Dst(), ":", tcp.DstPort) assemblerMutex.Lock() assembler.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c) assemblerMutex.Unlock() @@ -454,7 +454,7 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr assemblerMutex.Lock() closed := assembler.FlushAll() assemblerMutex.Unlock() - rlog.Debug("Final flush: %d closed", closed) + rlog.Debugf("Final flush: %d closed", closed) if outputLevel >= 2 { streamPool.Dump() } @@ -470,7 +470,7 @@ func startPassiveTapper(harWriter *HarWriter, outboundLinkWriter *OutboundLinkWr streamFactory.WaitGoRoutines() assemblerMutex.Lock() - rlog.Debug("%s", assembler.Dump()) + rlog.Debugf("%s", assembler.Dump()) assemblerMutex.Unlock() if !*nodefrag { log.Printf("IPdefrag:\t\t%d", stats.ipdefrag) diff --git a/tap/tcp_stream_factory.go b/tap/tcp_stream_factory.go index b838be1bb..2acb2ed9a 100644 --- a/tap/tcp_stream_factory.go +++ b/tap/tcp_stream_factory.go @@ -23,11 +23,11 @@ type tcpStreamFactory struct { } func (factory *tcpStreamFactory) New(net, transport gopacket.Flow, tcp *layers.TCP, ac reassembly.AssemblerContext) reassembly.Stream { - rlog.Debug("* NEW: %s %s", net, transport) + rlog.Debugf("* NEW: %s %s", net, transport) fsmOptions := reassembly.TCPSimpleFSMOptions{ SupportMissingEstablishment: *allowmissinginit, } - rlog.Debug("Current App Ports: %v", gSettings.filterPorts) + rlog.Debugf("Current App Ports: %v", gSettings.filterPorts) srcIp := net.Src().String() dstIp := net.Dst().String() dstPort := int(tcp.DstPort) @@ -92,31 +92,31 @@ func (factory *tcpStreamFactory) WaitGoRoutines() { func (factory *tcpStreamFactory) getStreamProps(srcIP string, dstIP string, dstPort int) *streamProps { if hostMode { if inArrayString(gSettings.filterAuthorities, fmt.Sprintf("%s:%d", dstIP, dstPort)) == true { - rlog.Debug("getStreamProps %s", fmt.Sprintf("+ host1 %s:%d", dstIP, dstPort)) + rlog.Debugf("getStreamProps %s", fmt.Sprintf("+ host1 %s:%d", dstIP, dstPort)) return &streamProps{isTapTarget: true, isOutgoing: false} } else if inArrayString(gSettings.filterAuthorities, dstIP) == true { - rlog.Debug("getStreamProps %s", fmt.Sprintf("+ host2 %s", dstIP)) + rlog.Debugf("getStreamProps %s", fmt.Sprintf("+ host2 %s", dstIP)) return &streamProps{isTapTarget: true, isOutgoing: false} } else if *anydirection && inArrayString(gSettings.filterAuthorities, srcIP) == true { - rlog.Debug("getStreamProps %s", fmt.Sprintf("+ host3 %s", srcIP)) + rlog.Debugf("getStreamProps %s", fmt.Sprintf("+ host3 %s", srcIP)) return &streamProps{isTapTarget: true, isOutgoing: true} } return &streamProps{isTapTarget: false} } else { isTappedPort := dstPort == 80 || (gSettings.filterPorts != nil && (inArrayInt(gSettings.filterPorts, dstPort))) if !isTappedPort { - rlog.Debug("getStreamProps %s", fmt.Sprintf("- notHost1 %d", dstPort)) + rlog.Debugf("getStreamProps %s", fmt.Sprintf("- notHost1 %d", dstPort)) return &streamProps{isTapTarget: false, isOutgoing: false} } isOutgoing := !inArrayString(ownIps, dstIP) if !*anydirection && isOutgoing { - rlog.Debug("getStreamProps %s", fmt.Sprintf("- notHost2")) + rlog.Debugf("getStreamProps %s", fmt.Sprintf("- notHost2")) return &streamProps{isTapTarget: false, isOutgoing: isOutgoing} } - rlog.Debug("getStreamProps %s", fmt.Sprintf("+ notHost3 %s -> %s:%d", srcIP, dstIP, dstPort)) + rlog.Debugf("getStreamProps %s", fmt.Sprintf("+ notHost3 %s -> %s:%d", srcIP, dstIP, dstPort)) return &streamProps{isTapTarget: true} } }