version 0.3.0, rev187, Trusted authorization sites support, --publish option on signing, cryptSign command line option, OpenSSL enabled on OSX, Crypto verify allows list of valid addresses, Option for version 2 json DB tables, DbCursor SELECT parameters bugfix, Add peer to site on ListModified, Download blind includes when new site added, Publish command better messages, Multi-threaded announce, New http Torrent trackers, Wait for dbschema.json on query, Handle json import errors, More compact writeJson storage command, Testcase for signing and verifying, Workaround to make non target=_top links work, More clean UiWebsocket command route, Send cert_user_id on siteinfo, Notify other local clients on local file modify, Option to wait for file download before sql query, File rules websocket API command, Cert add and select, set websocket API command, Put focus on innerframe, innerloaded wrapper api command to add hashtag, Allow more file error on big sites, Keep worker running after stuked on done task, New more stable openSSL layer that works on OSX, Noparallel parameter bugfix, RateLimit allowed again interval bugfix, Updater skips non-writeable files, Try to close openssl dll before update

src/User/User.py

@@ -4,17 +4,19 @@ from Plugin import PluginManager
 
 @PluginManager.acceptPlugins
 class User(object):
-	def __init__(self, master_address=None, master_seed=None):
+	def __init__(self, master_address=None, master_seed=None, data={}):
 		if master_seed:
 			self.master_seed = master_seed
 			self.master_address = CryptBitcoin.privatekeyToAddress(self.master_seed)
 		elif master_address:
 			self.master_address = master_address
-			self.master_seed = None
+			self.master_seed = data.get("master_seed")
 		else:
 			self.master_seed = CryptBitcoin.newSeed()
 			self.master_address = CryptBitcoin.privatekeyToAddress(self.master_seed)
-		self.sites = {}
+		self.sites = data.get("sites", {})
+		self.certs = data.get("certs", {})
+
 		self.log = logging.getLogger("User:%s" % self.master_address)
 
 
@@ -22,10 +24,10 @@ class User(object):
 	def save(self):
 		users = json.load(open("data/users.json"))
 		if not self.master_address in users: users[self.master_address] = {} # Create if not exits
-
 		user_data = users[self.master_address]
 		if self.master_seed: user_data["master_seed"] = self.master_seed
 		user_data["sites"] = self.sites
+		user_data["certs"] = self.certs
 		open("data/users.json", "w").write(json.dumps(users, indent=2, sort_keys=True))
 		self.log.debug("Saved")
 
@@ -50,14 +52,66 @@ class User(object):
 	# Get BIP32 address from site address
 	# Return: BIP32 auth address
 	def getAuthAddress(self, address, create=True):
-		return self.getSiteData(address, create)["auth_address"]
+		cert = self.getCert(address)
+		if cert:
+			return cert["auth_address"]
+		else:
+			return self.getSiteData(address, create)["auth_address"]
 
 
 	def getAuthPrivatekey(self, address, create=True):
-		return self.getSiteData(address, create)["auth_privatekey"]
+		cert = self.getCert(address)
+		if cert:
+			return cert["auth_privatekey"]
+		else:
+			return self.getSiteData(address, create)["auth_privatekey"]
 
 
-	# Set user attributes from dict
-	def setData(self, data):
-		for key, val in data.items():
-			setattr(self, key, val)
+	# Add cert for the user
+	def addCert(self, auth_address, domain, auth_type, auth_user_name, cert_sign):
+		domain = domain.lower()
+		auth_privatekey = [site["auth_privatekey"] for site in self.sites.values() if site["auth_address"]  == auth_address][0] # Find privatekey by auth address
+		cert_node = {
+			"auth_address": auth_address,
+			"auth_privatekey": auth_privatekey,
+			"auth_type": auth_type,
+			"auth_user_name": auth_user_name,
+			"cert_sign": cert_sign
+		}
+		# Check if we have already cert for that domain and its not the same
+		if self.certs.get(domain) and self.certs[domain] != cert_node: 
+			raise Exception("You already have certificate for this domain: %s/%s@%s" % (self.certs[domain]["auth_type"], self.certs[domain]["auth_user_name"], domain))
+		elif self.certs.get(domain) == cert_node: # Same, not updated
+			return None
+		else: # Not exits yet, add
+			self.certs[domain] = cert_node
+			self.save()
+			return True
+
+
+	def setCert(self, address, domain):
+		site_data = self.getSiteData(address)
+		if domain:
+			site_data["cert"] = domain
+		else:
+			del site_data["cert"]
+		self.save()
+		return site_data
+
+
+	# Get cert for the site address
+	# Return: { "auth_address": ..., "auth_privatekey":..., "auth_type": "web", "auth_user_name": "nofish", "cert_sign": ... } or None
+	def getCert(self, address):
+		site_data = self.getSiteData(address, create=False)
+		if not site_data or not "cert" in site_data: return None # Site dont have cert
+		return self.certs.get(site_data["cert"])
+
+
+	# Get cert user name for the site address
+	# Return: user@certprovider.bit or None
+	def getCertUserId(self, address):
+		site_data = self.getSiteData(address, create=False)
+		if not site_data or not "cert" in site_data: return None # Site dont have cert
+		cert = self.certs.get(site_data["cert"])
+		if cert:
+			return cert["auth_user_name"]+"@"+site_data["cert"]

src/User/UserManager.py

@@ -18,8 +18,7 @@ class UserManager(object):
 		# Load new users
 		for master_address, data in json.load(open("data/users.json")).items():
 			if master_address not in self.users:
-				user = User(master_address)
-				user.setData(data)
+				user = User(master_address, data=data)
 				self.users[master_address] = user
 				added += 1
 			user_found.append(master_address)