Skip to content

fix: fix for headers as json and ignore control plane dest #33

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

Merged
blue4209211 merged 1 commit into from
Apr 11, 2024
Merged

fix: fix for headers as json and ignore control plane dest #33

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
9 changes: 6 additions & 3 deletions containers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,12 @@ func (c *Container) onConnectionOpen(pid uint32, fd uint64, src, dst netaddr.IPP
return
}
actualDst, err := c.getActualDestination(p, src, dst)
dstWorkload := c.ip_resolver.ResolveIP(dst.IP().String())
actualDestWorkload := c.ip_resolver.ResolveActualIP(actualDst.IP().String())
if ignoreControlPlane(dstWorkload.Name) {
klog.Warningf("Ignoring src workload %s, %s \n", dst.IP().String(), dstWorkload.Name)
return
}
if err != nil {
if !common.IsNotExist(err) {
klog.Warningf("cannot open NetNs for pid %d: %s", pid, err)
Expand All @@ -576,9 +582,6 @@ func (c *Container) onConnectionOpen(pid uint32, fd uint64, src, dst netaddr.IPP
if failed {
c.connectsFailed[dst]++
} else {
srcWorkload := c.ip_resolver.ResolveIP(src.IP().String())
dstWorkload := c.ip_resolver.ResolveIP(dst.IP().String())
actualDestWorkload := c.ip_resolver.ResolveActualIP(actualDst.IP().String())
c.connectsSuccessful[AddrPair{src: dst, dst: *actualDst, srcWorkload: srcWorkload,
dstWorkload: dstWorkload, actualDestWorkload: actualDestWorkload}]++
connection := &ActiveConnection{
Expand Down
15 changes: 11 additions & 4 deletions ebpftracer/l7/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package l7
import (
"bytes"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"io"
"log"
"net/http"
Expand Down Expand Up @@ -124,15 +124,22 @@ func ParseHostFromHttpRequest(input string) (string, error) {
}

func ConvertHeadersToString(headers http.Header) string {
var headerStrings []string
headerMap := make(map[string][]string)

for key, values := range headers {
var sanitizedValues []string
for _, value := range values {
headerStrings = append(headerStrings, fmt.Sprintf("%s: %s", key, SanitizeString(value)))
sanitizedValues = append(sanitizedValues, SanitizeString(value))
}
headerMap[key] = sanitizedValues
}

return strings.Join(headerStrings, ", ")
jsonString, err := json.Marshal(headerMap)
if err != nil {
return ""
}

return string(jsonString)
}

func SanitizeString(input string) string {
Expand Down