grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grpc-js: fix error messages truncating at commas

This commit is contained in:
James Sharp 2019-11-20 17:36:05 +00:00
parent 2df072de3f
commit dd414b6ddc
No known key found for this signature in database
GPG Key ID: AC03C8C4A12DEA31
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/src/metadata-status-filter.ts
View File

@ -38,7 +38,7 @@ export class MetadataStatusFilter extends BaseFilter implements Filter {
metadata.remove('grpc-status');
}
if (typeof metadataMap['grpc-message'] === 'string') {
details = decodeURI(metadataMap['grpc-message'] as string);
details = decodeURIComponent(metadataMap['grpc-message'] as string);
metadata.remove('grpc-message');
}
return { code, details, metadata };

4
packages/grpc-js/src/server-call.ts
View File

@ -484,7 +484,9 @@ export class Http2ServerCallStream<
const trailersToSend = Object.assign(
{
[GRPC_STATUS_HEADER]: statusObj.code,
[GRPC_MESSAGE_HEADER]: encodeURI(statusObj.details as string),
[GRPC_MESSAGE_HEADER]: encodeURIComponent(
statusObj.details as string
),
},
statusObj.metadata.toHttp2Headers()
);

12
packages/grpc-js/test/test-server-errors.ts
View File

@ -699,6 +699,18 @@ describe('Other conditions', () => {
}
);
});
it('for an error message with a comma', done => {
client.unary(
{ error: true, message: 'an error message, with a comma' },
(err: ServiceError, data: any) => {
assert(err);
assert.strictEqual(err.code, grpc.status.UNKNOWN);
assert.strictEqual(err.details, 'an error message, with a comma');
done();
}
);
});
});
});