Skip to content

Fix hash parsing. Better error reporting #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j3k0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix hash parsing. Better error reporting #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 18 additions & 13 deletions wp-auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ WP_Auth.prototype.checkAuth = function( req ) {
data = cookie.split( '=' )[1].trim().split( '%7C' );
} );
else
return new Invalid_Auth();
return new Invalid_Auth("no cookie");

if ( !data )
return new Invalid_Auth();
return new Invalid_Auth("no data in cookie");

if ( parseInt( data[1] ) < new Date / 1000 )
return new Invalid_Auth();
return new Invalid_Auth("expired cookie");

return new Valid_Auth( data, this );
};
Expand Down Expand Up @@ -139,19 +139,19 @@ exports.create = function( wpurl, logged_in_key, logged_in_salt,
wp_table_prefix );
};

function Invalid_Auth() {}
function Invalid_Auth(err) { this.err = err; }
Invalid_Auth.prototype.on = function( key, callback ) {
if ( key != 'auth' )
return this;
var self = this;
process.nextTick( function() {
callback.call( self, false, 0 );
callback.call( self, false, 0, self.err );
} );
return this;
};

function Valid_Auth( data, auth ) {
var self = this, user_login = data[0], expiration = data[1], hash = data[2];
var self = this, user_login = data[0], expiration = data[1], token = data[2], hash = data[3];

if ( user_login in auth.known_hashes_timeout && auth.known_hashes_timeout[user_login] < +new Date ) {
delete auth.known_hashes[user_login];
Expand All @@ -160,20 +160,25 @@ function Valid_Auth( data, auth ) {

function parse( pass_frag, id ) {
var hmac1 = crypto.createHmac( 'md5', auth.salt );
hmac1.update( user_login + pass_frag + '|' + expiration );
var hmac2 = crypto.createHmac( 'md5', hmac1.digest( 'hex' ) );
hmac2.update( user_login + '|' + expiration );
if ( hash == hmac2.digest( 'hex' ) ) {
var key = user_login + '|' + pass_frag + '|' + expiration + '|' + token;
hmac1.update(key);
var hkey = hmac1.digest('hex');
var hmac2 = crypto.createHmac('sha256', hkey);
hmac2.update(user_login + '|' + expiration + '|' + token);
var cookieHash = hmac2.digest('hex');
if ( hash == cookieHash ) {
self.emit( 'auth', true, id );
} else {
self.emit( 'auth', false, 0 );
self.emit( 'auth', false, 0, "invalid hash" );
}
}

if ( user_login in auth.known_hashes )
process.nextTick(function() {
if ( user_login in auth.known_hashes ) {
return process.nextTick(function() {
parse( auth.known_hashes[user_login].frag, auth.known_hashes[user_login].id );
} );
}


var found = false;
auth.db.query( 'select ID, user_pass from ' + auth.table_prefix + 'users where user_login = \'' + user_login.replace( /(\'|\\)/g, '\\$1' ) + '\'' ).on( 'row', function( data ) {
Expand Down