github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-06-26 16:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.23.0 hotfix] - Redis extension issue

Browse Source 
Merge pull request #712 from up9inc/hotfix/redis-error
This commit is contained in:
gadotroee 2022-01-28 12:27:04 +02:00 committed by GitHub
commit b919c93f28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tap/extensions/redis/read.go
View File

@ -197,6 +197,12 @@ func (r *RedisInputStream) readLineBytes() ([]byte, error) {
line := make([]byte, N) line := make([]byte, N)
j := 0 j := 0
for i := r.count; i <= N; i++ { for i := r.count; i <= N; i++ {
if i >= len(buf) {
return nil, errors.New("Redis buffer index mismatch.")
}
if i >= len(line) {
return nil, errors.New("Redis line index mismatch.")
}
line[j] = buf[i] line[j] = buf[i]
j++ j++
} }
@ -295,27 +301,44 @@ func (p *RedisProtocol) Read() (packet *RedisPacket, err error) {
switch x.(type) { switch x.(type) {
case []interface{}: case []interface{}:
array := x.([]interface{}) array := x.([]interface{})
switch array[0].(type) { if len(array) > 0 {
case []uint8: switch array[0].(type) {
packet.Command = RedisCommand(strings.ToUpper(string(array[0].([]uint8)))) case []uint8:
if len(array) > 1 { packet.Command = RedisCommand(strings.ToUpper(string(array[0].([]uint8))))
packet.Key = string(array[1].([]uint8)) if len(array) > 1 {
} switch array[1].(type) {
if len(array) > 2 { case []uint8:
packet.Value = string(array[2].([]uint8)) packet.Key = string(array[1].([]uint8))
} case int64:
if len(array) > 3 { packet.Key = fmt.Sprintf("%d", array[1].(int64))
packet.Value = fmt.Sprintf("[%s", packet.Value) }
for _, item := range array[3:] {
packet.Value = fmt.Sprintf("%s, %s", packet.Value, item.([]uint8))
} }
packet.Value = strings.TrimSuffix(packet.Value, ", ") if len(array) > 2 {
packet.Value = fmt.Sprintf("%s]", packet.Value) switch array[2].(type) {
case []uint8:
packet.Value = string(array[2].([]uint8))
case int64:
packet.Value = fmt.Sprintf("%d", array[2].(int64))
}
}
if len(array) > 3 {
packet.Value = fmt.Sprintf("[%s", packet.Value)
for _, item := range array[3:] {
switch item.(type) {
case []uint8:
packet.Value = fmt.Sprintf("%s, %s", packet.Value, item.([]uint8))
case int64:
packet.Value = fmt.Sprintf("%s, %d", packet.Value, item.(int64))
}
}
packet.Value = strings.TrimSuffix(packet.Value, ", ")
packet.Value = fmt.Sprintf("%s]", packet.Value)
}
default:
msg := fmt.Sprintf("Unrecognized element in Redis array: %v", reflect.TypeOf(array[0]))
err = errors.New(msg)
return
} }
default:
msg := fmt.Sprintf("Unrecognized element in Redis array: %v", reflect.TypeOf(array[0]))
err = errors.New(msg)
return
} }
case []uint8: case []uint8:
val := string(x.([]uint8)) val := string(x.([]uint8))