Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions _test_data/garbage
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
this is some trash
Binary file added _test_data/short-query
Binary file not shown.
25 changes: 16 additions & 9 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,15 @@ Server.prototype.on_tcp_connection = function(connection) {

if(length !== null && bytes_received == 2 + length) {
// All of the data (plus the 2-byte length prefix) is received.
var data = Buffer.concat(bufs)
, req = new Request(data, connection)
, res = new Response(data, connection)

self.emit('request', req, res)
try {
var data = Buffer.concat(bufs)
, req = new Request(data, connection)
, res = new Response(data, connection)

self.emit('request', req, res)
} catch(err) {
self.emit('error', 'Error processing request', err, connection)
}
}
})
}
Expand All @@ -164,13 +168,16 @@ Server.prototype.on_udp = function(data, rinfo) {
, 'end' : function() {}
}

var req = new Request(data, connection)
, res = new Response(data, connection)
try {
var req = new Request(data, connection)
, res = new Response(data, connection)

self.emit('request', req, res)
self.emit('request', req, res)
} catch (err) {
self.emit('error', 'Error processing request', err, connection)
}
}


util.inherits(Request, Message)
function Request (data, connection) {
var self = this
Expand Down
69 changes: 69 additions & 0 deletions test/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,72 @@ test('Network queries', function(t) {
})
}
})

test('Invalid queries', function(t) {
var reqs = { 'short-query' : { message:'Error processing request', error: 'RangeError: Trying to access beyond buffer length' }
, 'garbage' : { message:'Error processing request', error: 'RangeError: Trying to access beyond buffer length' }
}

var i = 0
var server = API.createServer(on_req)
server.on('error', on_error)
server.listen(PORT, '127.0.0.1')
server.on('listening', send_requests)

function on_error(message, err, info) {
var req;
t.type(message, 'string', 'Got error message')
t.type(err, 'Error', 'Got Error object')
t.type(info, 'Object', 'Got connection info object')
t.type(info.type, 'string', 'Found connection type')
t.type(info.remoteAddress, 'string', 'Found connection remote address')
t.type(info.remotePort, 'number', 'Found connection remote port')

Object.keys(reqs).forEach(function(name) {
if (/tcp/.test(info.type) && info.remotePort == reqs[name].tcpAddr.port) {
req = reqs[name];
}

if (/udp/.test(info.type) && info.remotePort === reqs[name].udpAddr.port) {
req = reqs[name];
}
})

t.ok(req != undefined, 'Found matching request')
t.equal(message, req.message)
t.equal(err.toString(), req.error)

i += 1
if(i == Object.keys(reqs).length * 2) {
server.close()
t.end()
}
}

function on_req(req, res) {
t.notOk(true, 'Request handler should not be called');
}

function send_requests() {
Object.keys(reqs).forEach(function(name) {
var data = fs.readFileSync(__dirname + '/../_test_data/' + name)

var udp = dgram.createSocket('udp4')
udp.bind(function() {
reqs[name].udpAddr = udp.address();

udp.send(data, 0, data.length, PORT, '127.0.0.1', function() {
udp.close()
})

});

var tcp = net.connect({'port':PORT}, function(er) {
reqs[name].tcpAddr = tcp.address();
tcp.write(new Buffer([data.length >> 8, data.length & 0xff]))
tcp.write(data)
tcp.end()
})
})
}
})