Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Hex-encode master passwords, instead of b64, to avoid "strange" chars

Browse source
This commit is contained in:
jesopo 2019-05-30 17:25:24 +01:00
parent 480bbb604f
commit 0e6bcb5af0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/permissions/__init__.py
View file

@ -1,7 +1,7 @@
#--depends-on commands #--depends-on commands
#--depends-on config #--depends-on config
import base64, os import base64, binascii, os
import scrypt import scrypt
from src import ModuleManager, utils from src import ModuleManager, utils
@ -52,12 +52,12 @@ class Module(ModuleManager.BaseModule):
return hash, salt return hash, salt
def _random_string(self, n): def _random_string(self, n):
return base64.b64encode(os.urandom(n)).decode("utf8")
def _make_salt(self): def _make_salt(self):
return self._random_string(64) return base64.b64encode(os.urandom(64)).decode("utf8")
def _random_password(self): def _random_password(self):
return self._random_string(32) return binascii.hexlify(os.urandom(32)).decode("utf8")
def _make_hash(self, password, salt=None): def _make_hash(self, password, salt=None):
salt = salt or self._make_salt() salt = salt or self._make_salt()