Skip to content

Fix APM Server panic on invalid event input. #2

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
merged 1 commit into from
Aug 24, 2018
Merged

Fix APM Server panic on invalid event input. #2

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
7 changes: 4 additions & 3 deletions beater/v2_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (v *v2Handler) handleRawModel(rawModel map[string]interface{}) (transform.T

tr, err := model.modelDecoder(entry, err)
if err != nil {
return tr, err
return nil, err
}
return tr, nil
}
Expand All @@ -104,7 +104,7 @@ func (v *v2Handler) readBatch(batchSize int, reader *decoder.NDJSONStreamReader,
var err error
var rawModel map[string]interface{}

eventables := []transform.Transformable{}
var eventables []transform.Transformable
for i := 0; i < batchSize && err == nil; i++ {
rawModel, err = reader.Read()
if err != nil && err != io.EOF {
Expand All @@ -124,6 +124,7 @@ func (v *v2Handler) readBatch(batchSize int, reader *decoder.NDJSONStreamReader,
if err != nil {
response.addWithOffendingDocument(SchemaValidationErr, err.Error(), reader.LastLine())
response.Invalid++
continue
}
eventables = append(eventables, tr)
}
Expand Down Expand Up @@ -194,7 +195,7 @@ func (v *v2Handler) handleRequestBody(r *http.Request, ndReader *decoder.NDJSONS

for {
transformables, done := v.readBatch(batchSize, ndReader, resp)
if transformables != nil && len(transformables) > 0 {
if transformables != nil {
err := report(r.Context(), pendingReq{
transformables: transformables,
tcontext: tctx,
Expand Down
22 changes: 12 additions & 10 deletions beater/v2_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,18 @@ func TestV2IntakeIntegration(t *testing.T) {
handler := (&v2BackendRoute).Handler(c, report)

for _, test := range []struct {
path string
name string
path string
name string
status int
}{
{path: "../testdata/intake-v2/errors.ndjson", name: "Errors"},
{path: "../testdata/intake-v2/transactions.ndjson", name: "Transactions"},
{path: "../testdata/intake-v2/spans.ndjson", name: "Spans"},
{path: "../testdata/intake-v2/metrics.ndjson", name: "Metrics"},
{path: "../testdata/intake-v2/minimal_process.ndjson", name: "MixedMinimalProcess"},
{path: "../testdata/intake-v2/minimal_service.ndjson", name: "MinimalService"},
{path: "../testdata/intake-v2/metadata_null_values.ndjson", name: "MetadataNullValues"},
{status: 202, path: "../testdata/intake-v2/errors.ndjson", name: "Errors"},
{status: 202, path: "../testdata/intake-v2/transactions.ndjson", name: "Transactions"},
{status: 202, path: "../testdata/intake-v2/spans.ndjson", name: "Spans"},
{status: 202, path: "../testdata/intake-v2/metrics.ndjson", name: "Metrics"},
{status: 202, path: "../testdata/intake-v2/minimal_process.ndjson", name: "MixedMinimalProcess"},
{status: 202, path: "../testdata/intake-v2/minimal_service.ndjson", name: "MinimalService"},
{status: 202, path: "../testdata/intake-v2/metadata_null_values.ndjson", name: "MetadataNullValues"},
{status: 400, path: "../testdata/intake-v2/invalid-event.ndjson", name: "InvalidEvent"},
} {

b, err := loader.LoadDataAsBytes(test.path)
Expand All @@ -80,7 +82,7 @@ func TestV2IntakeIntegration(t *testing.T) {
r = r.WithContext(context.WithValue(r.Context(), requestTimeContextKey, reqTimestamp))
handler.ServeHTTP(w, r)

assert.Equal(t, 202, w.Code)
assert.Equal(t, test.status, w.Code)

}
}
2 changes: 2 additions & 0 deletions testdata/intake-v2/invalid-event.ndjson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{"metadata": {"user": null, "process": {"ppid": null, "pid": 1234, "argv": null, "title": null}, "system": null, "service": {"name": "1234_service-12a3", "language": {"version": null, "name":"ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node"}, "environment": null, "framework": null,"version": null, "runtime": null}}}
{ "transaction": { "id": 12345, "trace_id": "0123456789abcdef0123456789abcdef", "parent_id": "abcdefabcdef01234567", "type": "request", "duration": 32.592981 } }