Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
adding session attributes informations (_server_host, _os, _client_host)
  • Loading branch information
rusher committed May 14, 2018
1 parent 9f1b370 commit 35a2a12
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
14 changes: 12 additions & 2 deletions src/cmd/handshake/client-handshake-response.js
Expand Up @@ -3,6 +3,8 @@
const Capabilities = require("../../const/capabilities");
const Iconv = require("iconv-lite");
const NativePasswordAuth = require("./auth/native_password_auth");
const driverVersion = require('../../../package.json').version;
const os = require("os");

/**
* Send Handshake response packet
Expand Down Expand Up @@ -82,9 +84,17 @@ module.exports.send = function send(cmd, out, opts, pluginName, info) {
writeParam(out, "_client_name", encoding);
writeParam(out, "MariaDB connector/Node", encoding);

let packageJson = require("../../../package.json");
writeParam(out, "_client_version", encoding);
writeParam(out, packageJson.version, encoding);
writeParam(out, driverVersion, encoding);

writeParam(out, "_server_host", encoding);
writeParam(out, cmd.getSocket().address().address, encoding);

writeParam(out, "_os", encoding);
writeParam(out, process.platform, encoding);

writeParam(out, "_client_host", encoding);
writeParam(out, os.hostname(), encoding);

writeParam(out, "_node_version", encoding);
writeParam(out, process.versions.node, encoding);
Expand Down
3 changes: 2 additions & 1 deletion src/cmd/handshake/handshake.js
Expand Up @@ -13,12 +13,13 @@ const Capabilities = require("../../const/capabilities");
* see https://mariadb.com/kb/en/library/1-connecting-connecting/
*/
class Handshake extends Command {
constructor(_events, _succeedAuthentication, _createSecureContext, _addCommand, callback) {
constructor(_events, _succeedAuthentication, _createSecureContext, _addCommand, callback, getSocket) {
super(_events);
this._succeedAuthentication = _succeedAuthentication;
this._createSecureContext = _createSecureContext;
this._addCommand = _addCommand;
this.onResult = callback;
this.getSocket = getSocket;
}

start(out, opts, info) {
Expand Down
7 changes: 6 additions & 1 deletion src/connection.js
Expand Up @@ -410,11 +410,16 @@ function Connection(options) {
_connected = !err;
_events.emit("connect", err);
if (err) _fatalError(err, true);
}
},
_getSocket
);
_addCommand(handshake, false);
};

const _getSocket = () => {
return _socket;
};

/**
* Initialize socket and associate events.
* @private
Expand Down

0 comments on commit 35a2a12

Please sign in to comment.