mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Working as it should. Except you need to type in your password after you created the pad. But that I won't fix today.

Browse source
This commit is contained in:
jaseg 2011-12-06 23:12:58 +01:00
parent e9f6a10039
commit c905fd76c1
8 changed files with 182 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
node/db/Pad.js
View file

@ -495,7 +495,7 @@ Class('Pad', {
},
getPasswordSalt: function()
{
return this.passwordHash.split("$")[1];
return this.passwordHash == null? null:this.passwordHash.split("$")[1];
},
isCorrectPassword: function(password)
{
@ -512,7 +512,7 @@ Class('Pad', {
function hash(password, salt)
{
var shasum = crypto.createHash('sha512');
var shasum = crypto.createHash('sha256');
shasum.update(password + salt);
return shasum.digest("hex") + "$" + salt;
}
@ -524,7 +524,7 @@ function generateSalt()
var randomstring = '';
for (var i = 0; i < len; i++)
{
randomstring += chars[Math.floor(Math.random() * chars.length)];
randomstring += charset[Math.floor(Math.random() * charset.length)];
}
return randomstring;
}