oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move new site auth address generation to separate function

Browse source
This commit is contained in:
shortcutme 2018-04-12 19:24:21 +02:00
parent 513de18af5
commit 05db08c8d2
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/User/User.py
View file

@ -2,6 +2,8 @@ import logging
import json import json
import time import time
import gevent
import util import util
from Crypt import CryptBitcoin from Crypt import CryptBitcoin
from Plugin import PluginManager from Plugin import PluginManager
@ -44,12 +46,8 @@ class User(object):
def getAddressAuthIndex(self, address): def getAddressAuthIndex(self, address):
return int(address.encode("hex"), 16) return int(address.encode("hex"), 16)
# Get user site data @util.Noparallel()
# Return: {"auth_address": "xxx", "auth_privatekey": "xxx"} def generateAuthAddress(self, address):
def getSiteData(self, address, create=True):
if address not in self.sites: # Generate new BIP32 child key based on site address
if not create:
return {"auth_address": None, "auth_privatekey": None} # Dont create user yet
s = time.time() s = time.time()
address_id = self.getAddressAuthIndex(address) # Convert site address to int address_id = self.getAddressAuthIndex(address) # Convert site address to int
auth_privatekey = CryptBitcoin.hdPrivatekey(self.master_seed, address_id) auth_privatekey = CryptBitcoin.hdPrivatekey(self.master_seed, address_id)
@ -57,10 +55,19 @@ class User(object):
"auth_address": CryptBitcoin.privatekeyToAddress(auth_privatekey), "auth_address": CryptBitcoin.privatekeyToAddress(auth_privatekey),
"auth_privatekey": auth_privatekey "auth_privatekey": auth_privatekey
} }
self.save() self.saveDelayed()
self.log.debug("Added new site: %s in %.3fs" % (address, time.time() - s)) self.log.debug("Added new site: %s in %.3fs" % (address, time.time() - s))
return self.sites[address] return self.sites[address]
# Get user site data
# Return: {"auth_address": "xxx", "auth_privatekey": "xxx"}
def getSiteData(self, address, create=True):
if address not in self.sites: # Generate new BIP32 child key based on site address
if not create:
return {"auth_address": None, "auth_privatekey": None} # Dont create user yet
self.generateAuthAddress(address)
return self.sites[address]
def deleteSiteData(self, address): def deleteSiteData(self, address):
if address in self.sites: if address in self.sites:
del(self.sites[address]) del(self.sites[address])