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
42 changes: 27 additions & 15 deletions lib/ssh_agent_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,26 +258,38 @@ SSHAgentClient.prototype._request = function (getRequest,
var socket = net.createConnection(this.sockFile);
var gotdata = false;
var timedout = false;
var len = -1;
var totalData;

socket.on('data', function (data) {
gotdata = true;
socket.end();

var len = ctype.ruint32(data, 'big', 0);
if (len !== data.length - 4) {
return callback(new InvalidProtocolError('Expected length: ' +
len + ' but got: ' +
data.length));
if (len === -1) {
len = data.length >= 4 ? ctype.ruint32(data, 'big', 0) : -1;
totalData = data;
} else {
totalData = Buffer.concat([totalData, data]);
}

var type = ctype.ruint8(data, 'big', 4);
if (type !== messageType) {
return callback(new InvalidProtocolError('Expected message type: ' +
messageType +
' but got: ' + type));
if (len > -1) {
if (len < totalData.length - 4) {
return callback(new InvalidProtocolError('Expected length: ' +
len + ' but got: ' +
totalData.length));
}

if (len === totalData.length - 4) {
gotdata = true;
socket.end();

var type = ctype.ruint8(totalData, 'big', 4);
if (type !== messageType) {
return callback(new InvalidProtocolError('Expected message type: ' +
messageType +
' but got: ' + type));
}

return parseResponse(totalData.slice(5));
}
}

return parseResponse(data.slice(5));
});

socket.on('close', function (haderror) {
Expand Down
Loading