github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-01 16:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return a *api.RequestResponsePair from the dissection

Browse Source
This commit is contained in:
M. Mert Yildiran 2021-08-17 15:06:27 +03:00
parent 9a2edbac56
commit 6b584c4c3f
No known key found for this signature in database
GPG Key ID: D42ADB236521BF7A
6 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tap/api/api.go
View File

@ -3,6 +3,7 @@ package api
import (
"bufio"
"plugin"
"time"
)
type Extension struct {
@ -29,8 +30,19 @@ type TcpID struct {
DstPort string
}
type GenericMessage struct {
IsRequest bool
CaptureTime time.Time
Orig interface{}
}
type RequestResponsePair struct {
Request GenericMessage `json:"request"`
Response GenericMessage `json:"response"`
}
type Dissector interface {
Register(*Extension)
Ping()
Dissect(b *bufio.Reader, isClient bool, tcpID *TcpID) interface{}
Dissect(b *bufio.Reader, isClient bool, tcpID *TcpID) *RequestResponsePair
}

2
tap/extensions/amqp/main.go
View File

@ -23,7 +23,7 @@ func (g dissecting) Ping() {
log.Printf("pong AMQP\n")
}
func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) interface{} {
func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) *api.RequestResponsePair {
// TODO: Implement
return nil
}

5
tap/extensions/http/main.go
View File

@ -33,7 +33,7 @@ func (g dissecting) Ping() {
log.Printf("pong HTTP\n")
}
func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) interface{} {
func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) *api.RequestResponsePair {
for {
if isClient {
requestCounter++
@ -79,10 +79,11 @@ func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) in
)
reqResPair := reqResMatcher.registerResponse(ident, res, time.Now())
if reqResPair != nil {
log.Printf("YES REQRES MATCHED!\n")
return reqResPair
}
}
}
return nil
}
var Dissector dissecting

53
tap/extensions/http/matcher.go
View File

@ -6,21 +6,12 @@ import (
"strings"
"sync"
"time"
"github.com/up9inc/mizu/tap/api"
)
var reqResMatcher = createResponseRequestMatcher() // global
type requestResponsePair struct {
Request httpMessage `json:"request"`
Response httpMessage `json:"response"`
}
type httpMessage struct {
isRequest bool
captureTime time.Time
orig interface{}
}
// Key is {client_addr}:{client_port}->{dest_addr}:{dest_port}
type requestResponseMatcher struct {
openMessagesMap sync.Map
@ -31,21 +22,21 @@ func createResponseRequestMatcher() requestResponseMatcher {
return *newMatcher
}
func (matcher *requestResponseMatcher) registerRequest(ident string, request *http.Request, captureTime time.Time) *requestResponsePair {
func (matcher *requestResponseMatcher) registerRequest(ident string, request *http.Request, captureTime time.Time) *api.RequestResponsePair {
split := splitIdent(ident)
key := genKey(split)
// fmt.Printf(">>> request key: %v\n", key)
requestHTTPMessage := httpMessage{
isRequest: true,
captureTime: captureTime,
orig: request,
requestHTTPMessage := api.GenericMessage{
IsRequest: true,
CaptureTime: captureTime,
Orig: request,
}
if response, found := matcher.openMessagesMap.LoadAndDelete(key); found {
// Type assertion always succeeds because all of the map's values are of httpMessage type
responseHTTPMessage := response.(*httpMessage)
if responseHTTPMessage.isRequest {
// Type assertion always succeeds because all of the map's values are of api.GenericMessage type
responseHTTPMessage := response.(*api.GenericMessage)
if responseHTTPMessage.IsRequest {
SilentError("Request-Duplicate", "Got duplicate request with same identifier")
return nil
}
@ -58,21 +49,21 @@ func (matcher *requestResponseMatcher) registerRequest(ident string, request *ht
return nil
}
func (matcher *requestResponseMatcher) registerResponse(ident string, response *http.Response, captureTime time.Time) *requestResponsePair {
func (matcher *requestResponseMatcher) registerResponse(ident string, response *http.Response, captureTime time.Time) *api.RequestResponsePair {
split := splitIdent(ident)
key := genKey(split)
// fmt.Printf(">>> response key: %v\n", key)
responseHTTPMessage := httpMessage{
isRequest: false,
captureTime: captureTime,
orig: response,
responseHTTPMessage := api.GenericMessage{
IsRequest: false,
CaptureTime: captureTime,
Orig: response,
}
if request, found := matcher.openMessagesMap.LoadAndDelete(key); found {
// Type assertion always succeeds because all of the map's values are of httpMessage type
requestHTTPMessage := request.(*httpMessage)
if !requestHTTPMessage.isRequest {
// Type assertion always succeeds because all of the map's values are of api.GenericMessage type
requestHTTPMessage := request.(*api.GenericMessage)
if !requestHTTPMessage.IsRequest {
SilentError("Response-Duplicate", "Got duplicate response with same identifier")
return nil
}
@ -85,8 +76,8 @@ func (matcher *requestResponseMatcher) registerResponse(ident string, response *
return nil
}
func (matcher *requestResponseMatcher) preparePair(requestHTTPMessage *httpMessage, responseHTTPMessage *httpMessage) *requestResponsePair {
return &requestResponsePair{
func (matcher *requestResponseMatcher) preparePair(requestHTTPMessage *api.GenericMessage, responseHTTPMessage *api.GenericMessage) *api.RequestResponsePair {
return &api.RequestResponsePair{
Request: *requestHTTPMessage,
Response: *responseHTTPMessage,
}
@ -106,8 +97,8 @@ func (matcher *requestResponseMatcher) deleteOlderThan(t time.Time) int {
numDeleted := 0
matcher.openMessagesMap.Range(func(key interface{}, value interface{}) bool {
message, _ := value.(*httpMessage)
if message.captureTime.Before(t) {
message, _ := value.(*api.GenericMessage)
if message.CaptureTime.Before(t) {
matcher.openMessagesMap.Delete(key)
numDeleted++
}

2
tap/extensions/kafka/main.go
View File

@ -23,7 +23,7 @@ func (g dissecting) Ping() {
log.Printf("pong Kafka\n")
}
func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) interface{} {
func (g dissecting) Dissect(b *bufio.Reader, isClient bool, tcpID *api.TcpID) *api.RequestResponsePair {
// TODO: Implement
return nil
}

6
tap/tcp_stream_factory.go
View File

@ -3,6 +3,7 @@ package tap
import (
"bufio"
"fmt"
"log"
"sync"
"github.com/romana/rlog"
@ -45,13 +46,14 @@ func (h *tcpStream) serverRun(tcpID *api.TcpID) {
for _, extension := range extensions {
if containsPort(extension.OutboundPorts, h.transport.Src().String()) {
extension.Dissector.Ping()
extension.Dissector.Dissect(b, false, tcpID)
reqResPair := extension.Dissector.Dissect(b, false, tcpID)
log.Printf("reqResPair: %+v\n", reqResPair)
}
}
}
func (h *tcpStreamFactory) New(net, transport gopacket.Flow) tcpassembly.Stream {
fmt.Printf("* NEW: %s %s\n", net, transport)
log.Printf("* NEW: %s %s\n", net, transport)
stream := &tcpStream{
net: net,
transport: transport,