diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ae929fc123fa..56d9024169fc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -207,6 +207,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Configure good defaults for `add_kubernetes_metadata`. {pull}5707[5707]
- Add support for condition on bool type {issue}5659[5659] {pull}5954[5954]
+- HTTP parses successfully on empty status phrase. {issue}6176[6176]
*Winlogbeat*
diff --git a/packetbeat/protos/http/http_parser.go b/packetbeat/protos/http/http_parser.go
index d6343c3b4868..a35100e1b299 100644
--- a/packetbeat/protos/http/http_parser.go
+++ b/packetbeat/protos/http/http_parser.go
@@ -221,9 +221,6 @@ func parseResponseStatus(s []byte) (uint16, []byte, error) {
return 0, nil, fmt.Errorf("Unable to parse status code from [%s]", s)
}
phrase := s[p+1:]
- if len(phrase) == 0 {
- return 0, nil, fmt.Errorf("Unable to parse status phrase from [%s]", s)
- }
return uint16(statusCode), phrase, nil
}
diff --git a/packetbeat/protos/http/http_test.go b/packetbeat/protos/http/http_test.go
index 54f3f576675e..e90ba6f2c864 100644
--- a/packetbeat/protos/http/http_test.go
+++ b/packetbeat/protos/http/http_test.go
@@ -393,6 +393,54 @@ func TestHttpParser_Response_HTTP_10_without_content_length(t *testing.T) {
assert.Equal(t, 4, message.contentLength)
}
+func TestHttpParser_Response_without_phrase(t *testing.T) {
+ data := "HTTP/1.1 200 \r\n" +
+ "Date: Tue, 14 Aug 2012 22:31:45 GMT\r\n" +
+ "Expires: -1\r\n" +
+ "Cache-Control: private, max-age=0\r\n" +
+ "Content-Type: text/html; charset=UTF-8\r\n" +
+ "Content-Encoding: gzip\r\n" +
+ "Server: gws\r\n" +
+ "Content-Length: 0\r\n" +
+ "X-XSS-Protection: 1; mode=block\r\n" +
+ "X-Frame-Options: SAMEORIGIN\r\n" +
+ "\r\n"
+ r, ok, complete := testParse(nil, data)
+
+ assert.True(t, ok)
+ assert.True(t, complete)
+ assert.False(t, r.isRequest)
+ assert.Equal(t, 200, int(r.statusCode))
+ assert.Equal(t, "", string(r.statusPhrase))
+ assert.Equal(t, 0, r.contentLength)
+
+ broken := "HTTP/1.1 301 \r\n" +
+ "Date: Sun, 29 Sep 2013 16:53:59 GMT\r\n" +
+ "Server: Apache\r\n" +
+ "Location: http://www.hotnews.ro/\r\n" +
+ "Vary: Accept-Encoding\r\n" +
+ "Content-Length: 290\r\n" +
+ "Connection: close\r\n" +
+ "Content-Type: text/html; charset=iso-8859-1\r\n" +
+ "\r\n" +
+ "\r\n" +
+ "\r\n" +
+ "301 Moved Permanently\r\n" +
+ "\r\n" +
+ "Moved Permanently
\r\n" +
+ "The document has moved here.
\r\n" +
+ "
\r\n" +
+ "Apache Server at hotnews.ro Port 80\r\n" +
+ ""
+ r, ok, complete = testParse(nil, broken)
+
+ assert.True(t, ok)
+ assert.True(t, complete)
+ assert.Equal(t, 290, r.contentLength)
+ assert.Equal(t, "", string(r.statusPhrase))
+ assert.Equal(t, 301, int(r.statusCode))
+}
+
func TestHttpParser_splitResponse_midBody(t *testing.T) {
data1 := "HTTP/1.1 200 OK\r\n" +
"Date: Tue, 14 Aug 2012 22:31:45 GMT\r\n" +
@@ -573,8 +621,11 @@ func TestHttpParser_PhraseContainsSpaces(t *testing.T) {
"\r\n" +
"xx"
r, ok, complete = testParse(nil, broken)
- assert.False(t, ok)
- assert.False(t, complete)
+ assert.True(t, ok)
+ assert.True(t, complete)
+ assert.Equal(t, 2, r.contentLength)
+ assert.Equal(t, "", string(r.statusPhrase))
+ assert.Equal(t, 500, int(r.statusCode))
}
func TestEatBodyChunked(t *testing.T) {