Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1655 from murgatroid99/node_server_handle_invalid_arguments

Browse Source 
Handle invalid arguments sent to the Node server
pull/1671/head
Tim Emiola 10 years ago
parent 0cd547abbb 04589a7e0c
commit 949c255434
2 changed files with 180 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/node/src/server.js
  2. 224
      src/node/test/surface_test.js

29
src/node/src/server.js
Unescape View File

@ -291,7 +291,15 @@ function _read(size) {
return; return;
} }
var data = event.read; var data = event.read;
if (self.push(self.deserialize(data)) && data !== null) { var deserialized;
try {
deserialized = self.deserialize(data);
} catch (e) {
e.code = grpc.status.INVALID_ARGUMENT;
self.emit('error', e);
return;
}
if (self.push(deserialized) && data !== null) {
var read_batch = {}; var read_batch = {};
read_batch[grpc.opType.RECV_MESSAGE] = true; read_batch[grpc.opType.RECV_MESSAGE] = true;
self.call.startBatch(read_batch, readCallback); self.call.startBatch(read_batch, readCallback);
@ -354,7 +362,13 @@ function handleUnary(call, handler, metadata) {
handleError(call, err); handleError(call, err);
return; return;
} }
emitter.request = handler.deserialize(result.read); try {
emitter.request = handler.deserialize(result.read);
} catch (e) {
e.code = grpc.status.INVALID_ARGUMENT;
handleError(call, e);
return;
}
if (emitter.cancelled) { if (emitter.cancelled) {
return; return;
} }
@ -388,7 +402,13 @@ function handleServerStreaming(call, handler, metadata) {
stream.emit('error', err); stream.emit('error', err);
return; return;
} }
stream.request = handler.deserialize(result.read); try {
stream.request = handler.deserialize(result.read);
} catch (e) {
e.code = grpc.status.INVALID_ARGUMENT;
stream.emit('error', e);
return;
}
handler.func(stream); handler.func(stream);
}); });
} }
@ -401,6 +421,9 @@ function handleServerStreaming(call, handler, metadata) {
*/ */
function handleClientStreaming(call, handler, metadata) { function handleClientStreaming(call, handler, metadata) {
var stream = new ServerReadableStream(call, handler.deserialize); var stream = new ServerReadableStream(call, handler.deserialize);
stream.on('error', function(error) {
handleError(call, error);
});
waitForCancel(call, stream); waitForCancel(call, stream);
var metadata_batch = {}; var metadata_batch = {};
metadata_batch[grpc.opType.SEND_INITIAL_METADATA] = metadata; metadata_batch[grpc.opType.SEND_INITIAL_METADATA] = metadata;

224
src/node/test/surface_test.js
Unescape View File

@ -47,6 +47,8 @@ var mathService = math_proto.lookup('math.Math');
var capitalize = require('underscore.string/capitalize'); var capitalize = require('underscore.string/capitalize');
var _ = require('underscore');
describe('File loader', function() { describe('File loader', function() {
it('Should load a proto file by default', function() { it('Should load a proto file by default', function() {
assert.doesNotThrow(function() { assert.doesNotThrow(function() {
@ -178,9 +180,10 @@ describe('Generic client and server', function() {
}); });
}); });
}); });
describe('Trailing metadata', function() { describe('Other conditions', function() {
var client; var client;
var server; var server;
var port;
before(function() { before(function() {
var test_proto = ProtoBuf.loadProtoFile(__dirname + '/test_service.proto'); var test_proto = ProtoBuf.loadProtoFile(__dirname + '/test_service.proto');
var test_service = test_proto.lookup('TestService'); var test_service = test_proto.lookup('TestService');
@ -246,7 +249,7 @@ describe('Trailing metadata', function() {
} }
} }
}); });
var port = server.bind('localhost:0'); port = server.bind('localhost:0');
var Client = surface_client.makeProtobufClientConstructor(test_service); var Client = surface_client.makeProtobufClientConstructor(test_service);
client = new Client('localhost:' + port); client = new Client('localhost:' + port);
server.listen(); server.listen();
@ -254,86 +257,167 @@ describe('Trailing metadata', function() {
after(function() { after(function() {
server.shutdown(); server.shutdown();
}); });
it('should be present when a unary call succeeds', function(done) { describe('Server recieving bad input', function() {
var call = client.unary({error: false}, function(err, data) { var misbehavingClient;
assert.ifError(err); var badArg = new Buffer([0xFF]);
before(function() {
var test_service_attrs = {
unary: {
path: '/TestService/Unary',
requestStream: false,
responseStream: false,
requestSerialize: _.identity,
responseDeserialize: _.identity
},
clientStream: {
path: '/TestService/ClientStream',
requestStream: true,
responseStream: false,
requestSerialize: _.identity,
responseDeserialize: _.identity
},
serverStream: {
path: '/TestService/ServerStream',
requestStream: false,
responseStream: true,
requestSerialize: _.identity,
responseDeserialize: _.identity
},
bidiStream: {
path: '/TestService/BidiStream',
requestStream: true,
responseStream: true,
requestSerialize: _.identity,
responseDeserialize: _.identity
}
};
var Client = surface_client.makeClientConstructor(test_service_attrs,
'TestService');
misbehavingClient = new Client('localhost:' + port);
}); });
call.on('status', function(status) { it('should respond correctly to a unary call', function(done) {
assert.deepEqual(status.metadata.metadata, ['yes']); misbehavingClient.unary(badArg, function(err, data) {
done(); assert(err);
assert.strictEqual(err.code, grpc.status.INVALID_ARGUMENT);
done();
});
}); });
}); it('should respond correctly to a client stream', function(done) {
it('should be present when a unary call fails', function(done) { var call = misbehavingClient.clientStream(function(err, data) {
var call = client.unary({error: true}, function(err, data) { assert(err);
assert(err); assert.strictEqual(err.code, grpc.status.INVALID_ARGUMENT);
done();
});
call.write(badArg);
// TODO(mlumish): Remove call.end()
call.end();
}); });
call.on('status', function(status) { it('should respond correctly to a server stream', function(done) {
assert.deepEqual(status.metadata.metadata, ['yes']); var call = misbehavingClient.serverStream(badArg);
done(); call.on('data', function(data) {
assert.fail(data, null, 'Unexpected data', '===');
});
call.on('error', function(err) {
assert.strictEqual(err.code, grpc.status.INVALID_ARGUMENT);
done();
});
});
it('should respond correctly to a bidi stream', function(done) {
var call = misbehavingClient.bidiStream();
call.on('data', function(data) {
assert.fail(data, null, 'Unexpected data', '===');
});
call.on('error', function(err) {
assert.strictEqual(err.code, grpc.status.INVALID_ARGUMENT);
done();
});
call.write(badArg);
// TODO(mlumish): Remove call.end()
call.end();
}); });
}); });
it('should be present when a client stream call succeeds', function(done) { describe('Trailing metadata', function() {
var call = client.clientStream(function(err, data) { it('should be present when a unary call succeeds', function(done) {
assert.ifError(err); var call = client.unary({error: false}, function(err, data) {
assert.ifError(err);
});
call.on('status', function(status) {
assert.deepEqual(status.metadata.metadata, ['yes']);
done();
});
}); });
call.write({error: false}); it('should be present when a unary call fails', function(done) {
call.write({error: false}); var call = client.unary({error: true}, function(err, data) {
call.end(); assert(err);
call.on('status', function(status) { });
assert.deepEqual(status.metadata.metadata, ['yes']); call.on('status', function(status) {
done(); assert.deepEqual(status.metadata.metadata, ['yes']);
done();
});
}); });
}); it('should be present when a client stream call succeeds', function(done) {
it('should be present when a client stream call fails', function(done) { var call = client.clientStream(function(err, data) {
var call = client.clientStream(function(err, data) { assert.ifError(err);
assert(err); });
call.write({error: false});
call.write({error: false});
call.end();
call.on('status', function(status) {
assert.deepEqual(status.metadata.metadata, ['yes']);
done();
});
}); });
call.write({error: false}); it('should be present when a client stream call fails', function(done) {
call.write({error: true}); var call = client.clientStream(function(err, data) {
call.end(); assert(err);
call.on('status', function(status) { });
assert.deepEqual(status.metadata.metadata, ['yes']); call.write({error: false});
done(); call.write({error: true});
call.end();
call.on('status', function(status) {
assert.deepEqual(status.metadata.metadata, ['yes']);
done();
});
}); });
}); it('should be present when a server stream call succeeds', function(done) {
it('should be present when a server stream call succeeds', function(done) { var call = client.serverStream({error: false});
var call = client.serverStream({error: false}); call.on('data', function(){});
call.on('data', function(){}); call.on('status', function(status) {
call.on('status', function(status) { assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.code, grpc.status.OK); assert.deepEqual(status.metadata.metadata, ['yes']);
assert.deepEqual(status.metadata.metadata, ['yes']); done();
done(); });
}); });
}); it('should be present when a server stream call fails', function(done) {
it('should be present when a server stream call fails', function(done) { var call = client.serverStream({error: true});
var call = client.serverStream({error: true}); call.on('data', function(){});
call.on('data', function(){}); call.on('error', function(error) {
call.on('error', function(error) { assert.deepEqual(error.metadata.metadata, ['yes']);
assert.deepEqual(error.metadata.metadata, ['yes']); done();
done(); });
}); });
}); it('should be present when a bidi stream succeeds', function(done) {
it('should be present when a bidi stream succeeds', function(done) { var call = client.bidiStream();
var call = client.bidiStream(); call.write({error: false});
call.write({error: false}); call.write({error: false});
call.write({error: false}); call.end();
call.end(); call.on('data', function(){});
call.on('data', function(){}); call.on('status', function(status) {
call.on('status', function(status) { assert.strictEqual(status.code, grpc.status.OK);
assert.strictEqual(status.code, grpc.status.OK); assert.deepEqual(status.metadata.metadata, ['yes']);
assert.deepEqual(status.metadata.metadata, ['yes']); done();
done(); });
}); });
}); it('should be present when a bidi stream fails', function(done) {
it('should be present when a bidi stream fails', function(done) { var call = client.bidiStream();
var call = client.bidiStream(); call.write({error: false});
call.write({error: false}); call.write({error: true});
call.write({error: true}); call.end();
call.end(); call.on('data', function(){});
call.on('data', function(){}); call.on('error', function(error) {
call.on('error', function(error) { assert.deepEqual(error.metadata.metadata, ['yes']);
assert.deepEqual(error.metadata.metadata, ['yes']); done();
done(); });
}); });
}); });
}); });

Write Preview
Loading…
Cancel
Save