fix #14872: fix incorrectly handle with two-words redis command #14873

mazhechao · 2019-12-01T13:30:36Z

elasticmachine · 2019-12-01T13:30:38Z

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

elasticmachine · 2019-12-01T13:30:38Z

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

adriansr

Thanks @mazhechao for reporting AND fixing this 😄

Can you add a entry to CHANGELOG.next.asciidoc too?

adriansr · 2019-12-02T15:27:46Z

packetbeat/protos/redis/redis_parse.go

@@ -423,7 +424,7 @@ func (p *parser) parseArray(depth int, buf *streambuf.Buffer) (common.NetString,
 	}

 	// handle top-level request command
-	if depth == 0 && isRedisCommand(content[0]) {
+	if depth == 0 && (isRedisCommand(content[0]) || isRedisCommand(bytes.Join(content[0:2], []byte(" ")))) {


I think this needs a check in the (unlikely?) case that count < 2

Would you explain more details about what to check? I just don't understand what do you mean.

I mean accessing content[0:2] can fail if len(content) is 1, so you can write

if depth == 0 && (isRedisCommand(content[0]) || (count > 1 && isRedisCommand(bytes.Join(content[0:2], []byte(" "))))) {

You are right. I get it.

mazhechao · 2019-12-04T12:11:22Z

@adriansr Would you please review again?

faec · 2019-12-05T19:44:13Z

packetbeat/protos/redis/redis_parse.go

@@ -423,7 +424,7 @@ func (p *parser) parseArray(depth int, buf *streambuf.Buffer) (common.NetString,
 	}

 	// handle top-level request command
-	if depth == 0 && isRedisCommand(content[0]) {
+	if depth == 0 && (isRedisCommand(content[0]) || (count > 1 && isRedisCommand(bytes.Join(content[0:2], []byte(" "))))) {
 		p.message.isRequest = true
 		p.message.method = content[0]
 		if len(content) > 1 {


It seems like p.message.method and p.message.path need to be computed differently as well to handle the two-word case

I will have a look and test again.

faec · 2019-12-05T19:47:21Z

packetbeat/protos/redis/redis_test.go

@@ -70,6 +70,24 @@ func TestRedisParser_ArrayRequest(t *testing.T) {
 	assert.Equal(t, len(arrayRequest), msg.size)
 }

+var arrayRequest2 = []byte("*3\r\n" +
+        "$6\r\n" +


the extra whitespace here is probably what's breaking the linter... can you run mage fmt update and re-commit to make sure everything is formatted right?

I get errors, would you please help me?

\# command-line-arguments ./magefile.go:153:13: undefined: "github.com/elastic/beats/dev-tools/mage".DefaultIncludeListOptions ./magefile.go:156:39: not enough arguments in call to "github.com/elastic/beats/dev-tools/mage".GenerateIncludeListGo Error: error compiling magefiles

packetbeat/protos/redis/redis_parse.go

…mmand

mazhechao · 2019-12-29T07:43:55Z

@adriansr @faec Would you please review my commits again?
And I don't know how to solve the lint problem, when I run mage fmt update, I get some errors

\# command-line-arguments
./magefile.go:153:13: undefined: "github.com/elastic/beats/dev-tools/mage".DefaultIncludeListOptions
./magefile.go:156:39: not enough arguments in call to "github.com/elastic/beats/dev-tools/mage".GenerateIncludeListGo
Error: error compiling magefiles

elasticmachine · 2020-02-28T18:22:44Z

Pinging @elastic/siem (Team:SIEM)

adriansr · 2020-03-20T10:46:49Z

jenkins, test this

faec

Thank you!

elastic#14873) Updated redis protocol decoder to support two-word commands. Fixes elastic#14872 (cherry picked from commit 30a5687)

…) (#17153) Updated redis protocol decoder to support two-word commands. Fixes #14872 (cherry picked from commit 30a5687) Co-authored-by: shawshank <mazhechao@gmail.com>

mazhechao · 2020-07-09T11:06:57Z

Is this released in v7.7.0, I can't find in the release notes. @adriansr

adriansr · 2020-07-09T16:09:29Z

@mazhechao I don't know why it's not in the release notes, but it made it to 7.7.0

mazhechao · 2020-07-10T10:47:00Z

I think it's better to mention this fix in the release notes. @adriansr

mazhechao requested a review from a team as a code owner December 1, 2019 13:30

mazhechao mentioned this pull request Dec 1, 2019

Packetbeat cannot capture redis command CONFIG GET #14872

Closed

adriansr reviewed Dec 2, 2019

View reviewed changes

adriansr self-assigned this Dec 2, 2019

fix incorrectly handle with two-words redis command

659fe8e

mazhechao force-pushed the master branch from 6c5e56c to 659fe8e Compare December 4, 2019 12:05

faec reviewed Dec 5, 2019

View reviewed changes

houndci-bot reviewed Dec 10, 2019

View reviewed changes

packetbeat/protos/redis/redis_parse.go Outdated Show resolved Hide resolved

fix incorrectly compute method and path when handling the two-word co…

c54e746

…mmand

mazhechao force-pushed the master branch from dd050f1 to c54e746 Compare December 10, 2019 13:17

kaiyan-sheng added bug Packetbeat review Team:SIEM labels Feb 28, 2020

adriansr added 2 commits March 20, 2020 11:22

Mage fmt

fd6b939

Merge remote-tracking branch 'upstream/master' into pr14873

0b4fe39

adriansr requested a review from faec March 20, 2020 14:39

Fix changelog

1be1f9c

faec approved these changes Mar 20, 2020

View reviewed changes

adriansr merged commit 30a5687 into elastic:master Mar 20, 2020

adriansr mentioned this pull request Mar 20, 2020

Cherry-pick #14873 to 7.x: fix #14872: fix incorrectly handle with two-words redis command #17153

Merged

adriansr added the v7.7.0 label Mar 20, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #14872: fix incorrectly handle with two-words redis command #14873

fix #14872: fix incorrectly handle with two-words redis command #14873

mazhechao commented Dec 1, 2019 •

edited by zube bot

Loading

elasticmachine commented Dec 1, 2019

elasticmachine commented Dec 1, 2019

adriansr left a comment

adriansr Dec 2, 2019

mazhechao Dec 4, 2019

adriansr Dec 4, 2019

mazhechao Dec 4, 2019

mazhechao commented Dec 4, 2019

faec Dec 5, 2019

mazhechao Dec 6, 2019

faec Dec 5, 2019

mazhechao Dec 24, 2019 •

edited

Loading

mazhechao commented Dec 29, 2019

elasticmachine commented Feb 28, 2020

adriansr commented Mar 20, 2020

faec left a comment

mazhechao commented Jul 9, 2020

adriansr commented Jul 9, 2020

mazhechao commented Jul 10, 2020

fix #14872: fix incorrectly handle with two-words redis command #14873

fix #14872: fix incorrectly handle with two-words redis command #14873

Conversation

mazhechao commented Dec 1, 2019 • edited by zube bot Loading

elasticmachine commented Dec 1, 2019

elasticmachine commented Dec 1, 2019

adriansr left a comment

Choose a reason for hiding this comment

adriansr Dec 2, 2019

Choose a reason for hiding this comment

mazhechao Dec 4, 2019

Choose a reason for hiding this comment

adriansr Dec 4, 2019

Choose a reason for hiding this comment

mazhechao Dec 4, 2019

Choose a reason for hiding this comment

mazhechao commented Dec 4, 2019

faec Dec 5, 2019

Choose a reason for hiding this comment

mazhechao Dec 6, 2019

Choose a reason for hiding this comment

faec Dec 5, 2019

Choose a reason for hiding this comment

mazhechao Dec 24, 2019 • edited Loading

Choose a reason for hiding this comment

mazhechao commented Dec 29, 2019

elasticmachine commented Feb 28, 2020

adriansr commented Mar 20, 2020

faec left a comment

Choose a reason for hiding this comment

mazhechao commented Jul 9, 2020

adriansr commented Jul 9, 2020

mazhechao commented Jul 10, 2020

mazhechao commented Dec 1, 2019 •

edited by zube bot

Loading

mazhechao Dec 24, 2019 •

edited

Loading