Skip to content

Prevent decoding and then re-encoding to base64 #2256

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
stephenplusplus merged 5 commits into from
Apr 25, 2017
Merged

Prevent decoding and then re-encoding to base64 #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4560a0a
Prevent decoding and then re-encoding to base64
foxdavidj Apr 25, 2017
743a8dd
Fix style errors
foxdavidj Apr 25, 2017
77e6003
Cover new base64 handling in tests
foxdavidj Apr 25, 2017
11870e1
Update test to check base64 encoding
foxdavidj Apr 25, 2017
cad8fe7
Rename to `enc`
stephenplusplus Apr 25, 2017
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
15 changes: 10 additions & 5 deletions packages/pubsub/src/subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ modelo.inherits(Subscription, commonGrpc.ServiceObject, events.EventEmitter);
*
* @private
*/
Subscription.formatMessage_ = function(msg, encoding) {
Subscription.formatMessage_ = function(msg, enc) {
var innerMessage = msg.message;
var message = {
ackId: msg.ackId
Expand All @@ -357,11 +357,16 @@ Subscription.formatMessage_ = function(msg, encoding) {
message.id = innerMessage.messageId;

if (innerMessage.data) {
message.data = new Buffer(innerMessage.data, 'base64').toString(encoding);
if (enc === 'base64') {
// Prevent decoding and then re-encoding to base64.
message.data = innerMessage.data;
} else {
message.data = Buffer.from(innerMessage.data, 'base64').toString(enc);

try {
message.data = JSON.parse(message.data);
} catch(e) {}
try {
message.data = JSON.parse(message.data);
} catch(e) {}
}
}

if (innerMessage.attributes) {
Expand Down
11 changes: 11 additions & 0 deletions packages/pubsub/test/subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ describe('Subscription', function() {
data: messageBinary,
id: 7
};
var expectedMessageAsBase64 = {
ackId: 'abc',
data: messageBuffer,
id: 7
};

before(function() {
Subscription = proxyquire('../src/subscription.js', {
Expand Down Expand Up @@ -342,6 +347,12 @@ describe('Subscription', function() {
assert.deepEqual(msg, expectedMessage);
});

it('should decode buffer to base64', function() {
var msg = Subscription
.formatMessage_(messageObj.receivedMessages[0], 'base64');
assert.deepEqual(msg, expectedMessageAsBase64);
});

it('should decode buffer to specified encoding', function() {
var msg = Subscription
.formatMessage_(messageObj.receivedMessages[0], 'binary');
Expand Down