Extract password hashing from AuthenticationPacket

felixge · felixge · commit 154d69c97022 · 2011-12-30T16:34:14.000+01:00
Inversion of control folks, inversion of control.
diff --git a/lib/protocol/Handshake.js b/lib/protocol/Handshake.js
@@ -3,6 +3,7 @@ var EventEmitter               = require('events').EventEmitter;
 var Parser                     = require('../Parser');
 var AuthenticationPacket       = require('./packets/client/AuthenticationPacket');
 var LegacyAuthenticationPacket = require('./packets/client/LegacyAuthenticationPacket');
+var Auth                       = require('../Auth');
 
 module.exports = Handshake;
 Util.inherits(Handshake, EventEmitter);
@@ -23,8 +24,7 @@ Handshake.prototype.handlePacket = function(packet) {
   if (packet.type == Parser.GREETING_PACKET) {
     this.emit('packet', new AuthenticationPacket({
       number         : packet.number + 1,
-      scrambleBuffer : packet.scrambleBuffer,
-      password       : this._password,
+      token          : Auth.token(this._password, packet.scrambleBuffer),
       user           : this._user,
       database       : this._database,
       flags          : this._flags,
diff --git a/lib/protocol/packets/client/AuthenticationPacket.js b/lib/protocol/packets/client/AuthenticationPacket.js
@@ -1,29 +1,26 @@
 var _              = require('underscore');
-var Auth           = require('../../../Auth');
 var OutgoingPacket = require('../../../OutgoingPacket');
 
 // Client_Authentication_Packet (MySql >= 4.1)
 // http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Client_Authentication_Packet
 module.exports = AuthenticationPacket;
 function AuthenticationPacket(properties) {
-  this.number         = null;
-  this.scrambleBuffer = null;
-  this.password       = null;
-  this.user           = null;
-  this.database       = null;
-  this.flags          = null;
-  this.maxPacketSize  = null;
-  this.charsetNumber  = null;
+  this.number        = null;
+  this.token         = null;
+  this.user          = null;
+  this.database      = null;
+  this.flags         = null;
+  this.maxPacketSize = null;
+  this.charsetNumber = null;
 
   _.extend(this, properties);
 }
 
 AuthenticationPacket.prototype.toBuffer = function() {
-  var token = Auth.token(this.password, this.scrambleBuffer);
   var packetSize = (
     4 + 4 + 1 + 23 +
     this.user.length + 1 +
-    token.length + 1 +
+    this.token.length + 1 +
     this.database.length + 1
   );
   var packet = new OutgoingPacket(packetSize, this.number);
@@ -33,7 +30,7 @@ AuthenticationPacket.prototype.toBuffer = function() {
   packet.writeNumber(1, this.charsetNumber);
   packet.writeFiller(23);
   packet.writeNullTerminated(this.user);
-  packet.writeLengthCoded(token);
+  packet.writeLengthCoded(this.token);
   packet.writeNullTerminated(this.database);
 
   return packet.buffer;
