Skip to content

Commit 4d4c354

Browse files
Ben Keithkeitwb
Ben Keith
authored andcommittedDec 7, 2018
Upgrade protobuf client to latest due to security issues
1 parent 54410f6 commit 4d4c354

File tree

4 files changed

+2430
-269
lines changed

4 files changed

+2430
-269
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ coverage
33
build
44
.idea
55
*.iml
6+
package-lock.json

‎lib/client/ingest/protobuf_signal_fx_client.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ ProtoBufSignalFx.prototype._batchData = function (datapointsList) {
6767
dpum.datapoints = dpum.datapoints.concat(datapointsList);
6868

6969
try {
70-
var dataToSend = dpum.encode();
71-
return dataToSend.toBuffer();
70+
var dataToSend = protocolBuffers.DataPointUploadMessage.encode(dpum);
71+
return dataToSend.finish();
7272
} catch (error) {
7373
winston.error('Invalid Protobuf object', error);
7474
}
@@ -127,8 +127,8 @@ ProtoBufSignalFx.prototype._encodeEvent = function (protobufEvent) {
127127
var eventMessage = new protocolBuffers.EventUploadMessage();
128128
eventMessage.events = [];
129129
eventMessage.events.push(protobufEvent);
130-
var eventToSend = eventMessage.encode();
131-
return eventToSend.toBuffer();
130+
var eventToSend = protocolBuffers.EventUploadMessage.encode(eventMessage);
131+
return eventToSend.finish();
132132
};
133133

134134
exports.ProtoBufSignalFx = ProtoBufSignalFx;

‎lib/proto/signal_fx_protocol_buffers_pb2.js

+2,421-262
Large diffs are not rendered by default.

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"bignumber.js": "^2.3.0",
3737
"pako": "^1.0.4",
3838
"promise": "^7.0.4",
39-
"protobufjs": "^4.0.0",
39+
"protobufjs": "^6.0.0",
4040
"request": "^2.61.0",
4141
"sse.js": "^0.4.1",
4242
"text-encoding": "^0.6.4",
@@ -45,10 +45,11 @@
4545
},
4646
"scripts": {
4747
"prepublish": "gulp prepublish",
48-
"test": "gulp"
48+
"test": "gulp",
49+
"genprotobuf": "pbjs -t static-module -w commonjs proto/signal_fx_protocol_buffers.proto > lib/proto/signal_fx_protocol_buffers_pb2.js"
4950
},
5051
"engines": {
51-
"npm" : ">=4.0.0"
52+
"npm": ">=4.0.0"
5253
},
5354
"license": "Apache Software License v2"
5455
}

0 commit comments

Comments
 (0)
Please sign in to comment.