masq/glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add error for hash disagree, change handshake names

Browse Source
This commit is contained in:
Jeremy Mahieu 2020-04-18 11:37:55 +02:00
parent f03e011d1a
commit 0d1f8ac167
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/connection.js
View File

@ -24,6 +24,7 @@ weechat.factory('connection',
var connect = function (host, port, path, passwd, ssl, useTotp, totp, noCompression, successCallback, failCallback) { var connect = function (host, port, path, passwd, ssl, useTotp, totp, noCompression, successCallback, failCallback) {
$rootScope.passwordError = false; $rootScope.passwordError = false;
$rootScope.oldWeechatError = false; $rootScope.oldWeechatError = false;
$rootScope.hashAlgorithemDisagree = false;
connectionData = [host, port, path, passwd, ssl, noCompression]; connectionData = [host, port, path, passwd, ssl, noCompression];
var proto = ssl ? 'wss' : 'ws'; var proto = ssl ? 'wss' : 'ws';
// If host is an IPv6 literal wrap it in brackets // If host is an IPv6 literal wrap it in brackets
@ -61,7 +62,7 @@ weechat.factory('connection',
// Or wait for a response from the handshake // Or wait for a response from the handshake
ngWebsockets.send( ngWebsockets.send(
weeChat.Protocol.formatHandshake({ weeChat.Protocol.formatHandshake({
password: "pbkdf2+sha512", compression: noCompression ? 'off' : 'zlib' password_hash_algo: "pbkdf2+sha512", compression: noCompression ? 'off' : 'zlib'
}) })
).then(function (message){ ).then(function (message){
clearTimeout(handShakeTimeout); clearTimeout(handShakeTimeout);
@ -311,10 +312,18 @@ weechat.factory('connection',
return; return;
} }
passwordMethod = message.objects[0].content.auth_password; passwordMethod = message.objects[0].content.password_hash_algo;
totpRequested = message.objects[0].content.totp === 'on' ? true : false; totpRequested = message.objects[0].content.totp === 'on' ? true : false;
nonce = utils.hexStringToByte(message.objects[0].content.nonce); nonce = utils.hexStringToByte(message.objects[0].content.nonce);
iterations = message.objects[0].content.hash_iterations; iterations = message.objects[0].content.password_hash_iterations;
if(passwordMethod != "pbkdf2+sha512")
{
$rootScope.hashAlgorithemDisagree = true;
$rootScope.$emit('relayDisconnect');
$rootScope.$digest() // Have to do this otherwise change detection doesn't see the error.
throw new Error('No password hash algorithem returned.');
}
} }
@ -441,7 +450,7 @@ weechat.factory('connection',
var handleWrongPassword = function() { var handleWrongPassword = function() {
// Connection got closed, lets check if we ever was connected successfully // Connection got closed, lets check if we ever was connected successfully
if (!$rootScope.waseverconnected && !$rootScope.errorMessage && !$rootScope.oldWeechatError) { if (!$rootScope.waseverconnected && !$rootScope.errorMessage && !$rootScope.oldWeechatError && !$rootScope.hashAlgorithemDisagree) {
$rootScope.passwordError = true; $rootScope.passwordError = true;
$rootScope.$apply(); $rootScope.$apply();
} }

4
js/weechat.js
View File

@ -638,7 +638,7 @@
//https://weechat.org/files/doc/stable/weechat_relay_protocol.en.html#command_handshake //https://weechat.org/files/doc/stable/weechat_relay_protocol.en.html#command_handshake
WeeChatProtocol.formatHandshake = function(params) { WeeChatProtocol.formatHandshake = function(params) {
var defaultParams = { var defaultParams = {
password: 'pbkdf2+sha512', password_hash_algo: 'pbkdf2+sha512',
compression: 'zlib' compression: 'zlib'
}; };
var keys = []; var keys = [];
@ -651,7 +651,7 @@
} }
if (params.password !== null) { if (params.password !== null) {
keys.push('password=' + params.password); keys.push('password_hash_algo=' + params.password_hash_algo);
} }
parts.push(keys.join(',')); parts.push(keys.join(','));