rev106, Allow check memory content in stats page, Fix Zeroname plugin incompatibility with Multiuser plugin, Zeroname updater sort keys, Allow multiple ui_restrict parameter, Peer using site's logger to save some memory, Also send not that good peers on initial pex

plugins/Multiuser/MultiuserPlugin.py

@@ -0,0 +1,169 @@
+import re, time, sys
+from Plugin import PluginManager
+from Crypt import CryptBitcoin
+
+@PluginManager.registerTo("UiRequest")
+class UiRequestPlugin(object):
+	def __init__(self, *args, **kwargs):
+		self.user_manager = sys.modules["User.UserManager"].user_manager
+		super(UiRequestPlugin, self).__init__(*args, **kwargs)
+
+
+	# Create new user and inject user welcome message if necessary
+	# Return: Html body also containing the injection
+	def actionWrapper(self, path):
+		user_created = False
+		user = self.getCurrentUser() # Get user from cookie
+
+		if not user: # No user found by cookie
+			user = self.user_manager.create()
+			user_created = True
+
+		master_address = user.master_address
+		master_seed = user.master_seed
+
+		if user_created: 
+			extra_headers = [('Set-Cookie', "master_address=%s;path=/;max-age=2592000;" % user.master_address)] # Max age = 30 days
+		else:
+			extra_headers = []
+
+		loggedin = self.get.get("login") == "done"
+
+		back = super(UiRequestPlugin, self).actionWrapper(path, extra_headers) # Get the wrapper frame output
+
+		if not user_created and not loggedin: return back # No injection necessary
+
+		if not back or not hasattr(back, "endswith"): return back # Wrapper error or not string returned, injection not possible
+
+		if user_created:
+			# Inject the welcome message
+			inject_html = """
+				<!-- Multiser plugin -->
+				<style>
+	 			 .masterseed { font-size: 95%; background-color: #FFF0AD; padding: 5px 8px; margin: 9px 0px }
+				</style>
+				<script>
+				 hello_message = "<b>Hello, welcome to ZeroProxy!</b><div style='margin-top: 8px'>A new, unique account created for you:</div>"
+				 hello_message+= "<div class='masterseed'>{master_seed}</div> <div>This is your private key, <b>save it</b>, so you can login next time.</div><br>"
+				 hello_message+= "<a href='#' class='button' style='margin-left: 0px'>Ok, Saved it!</a> or <a href='#Login' onclick='wrapper.ws.cmd(\\"userLoginForm\\", []); return false'>Login</a><br><br>"
+				 hello_message+= "<small>This site is allows you to browse ZeroNet content, but if you want to secure your account <br>"
+				 hello_message+= "and help to make a better network, then please run your own <a href='https://github.com/HelloZeroNet/ZeroNet' target='_blank'>ZeroNet client</a>.</small>"
+				 setTimeout(function() {
+				 	wrapper.notifications.add("hello", "info", hello_message)
+				 	delete(hello_message)
+				 }, 1000)
+				</script>
+				</body>
+				</html>
+			""".replace("\t", "")
+			inject_html = inject_html.replace("{master_seed}", master_seed) # Set the master seed in the message
+
+			back = re.sub("</body>\s*</html>\s*$", inject_html, back) # Replace the </body></html> tags with the injection 
+
+		elif loggedin:
+			inject_html = """
+				<!-- Multiser plugin -->
+				<script>
+				 setTimeout(function() {
+				 	wrapper.notifications.add("login", "done", "Hello again!<br><small>You have been logged in successfully</small>", 5000) 
+				 }, 1000)
+				</script>
+				</body>
+				</html>
+			""".replace("\t", "")
+			back = re.sub("</body>\s*</html>\s*$", inject_html, back) # Replace the </body></html> tags with the injection
+
+		return back 
+
+
+	# Get the current user based on request's cookies
+	# Return: User object or None if no match
+	def getCurrentUser(self):
+		cookies = self.getCookies()
+		user_manager = self.user_manager
+		user = None
+		if "master_address" in cookies:
+			users = self.user_manager.list()
+			user = users.get(cookies["master_address"])
+		return user
+
+
+@PluginManager.registerTo("UserManager")
+class UserManagerPlugin(object):
+	# In multiuser mode do not load the users
+	def load(self):
+		if not self.users: self.users = {}
+		return self.users
+
+
+	# Find user by master address
+	# Return: User or None
+	def get(self, master_address=None):
+		users = self.list()
+		if master_address in users:
+			user = users[master_address]
+		else:
+			user = None
+		return user
+
+
+@PluginManager.registerTo("User")
+class UserPlugin(object):
+	# In multiuser mode users data only exits in memory, dont write to data/user.json
+	def save(self):
+		return False 
+ 
+
+@PluginManager.registerTo("UiWebsocket")
+class UiWebsocketPlugin(object):
+	# Let the page know we running in multiuser mode
+	def formatServerInfo(self):
+		server_info = super(UiWebsocketPlugin, self).formatServerInfo()
+		server_info["multiuser"] = True
+		if "ADMIN" in self.site.settings["permissions"]:
+			server_info["master_address"] = self.user.master_address
+		return server_info
+
+
+	# Show current user's master seed
+	def actionUserShowMasterSeed(self, to):
+		if not "ADMIN" in self.site.settings["permissions"]: return self.response(to, "Show master seed not allowed")
+		message = "<b style='padding-top: 5px; display: inline-block'>Your unique private key:</b>"
+		message+= "<div style='font-size: 84%%; background-color: #FFF0AD; padding: 5px 8px; margin: 9px 0px'>%s</div>" % self.user.master_seed
+		message+= "<small>(Save it, you can access your account using this information)</small>"
+		self.cmd("notification", ["info", message])
+
+
+	# Logout user
+	def actionUserLogout(self, to):
+		if not "ADMIN" in self.site.settings["permissions"]: return self.response(to, "Logout not allowed")
+		message = "<b>You have been logged out.</b> <a href='#Login' class='button' onclick='wrapper.ws.cmd(\"userLoginForm\", []); return false'>Login to another account</a>"
+		message+= "<script>document.cookie = 'master_address=; expires=Thu, 01 Jan 1970 00:00:00 UTC'</script>"
+		self.cmd("notification", ["done", message, 1000000]) # 1000000 = Show ~forever :)
+		# Delete from user_manager
+		user_manager = sys.modules["User.UserManager"].user_manager
+		if self.user.master_address in user_manager.users:
+			del user_manager.users[self.user.master_address]
+			self.response(to, "Successful logout")
+		else:
+			self.response(to, "User not found")
+
+
+	# Show login form
+	def actionUserLoginForm(self, to):
+		self.cmd("prompt", ["<b>Login</b><br>Your private key:", "password", "Login"], self.responseUserLogin)
+
+
+	# Login form submit
+	def responseUserLogin(self, master_seed):
+		user_manager = sys.modules["User.UserManager"].user_manager
+		user = user_manager.create(master_seed=master_seed)
+		if user.master_address:
+			message = "Successfull login, reloading page..."
+			message+= "<script>document.cookie = 'master_address=%s;path=/;max-age=2592000;'</script>" % user.master_address
+			message+= "<script>wrapper.reload('login=done')</script>"
+			self.cmd("notification", ["done", message])
+		else:
+			self.cmd("notification", ["error", "Error: Invalid master seed"])
+			self.actionUserLoginForm(0)
+

plugins/Multiuser/__init__.py

@@ -0,0 +1 @@
+import MultiuserPlugin

plugins/Stats/StatsPlugin.py

@@ -131,7 +131,7 @@ class UiRequestPlugin(object):
 		yield "<br><br><b>Objects in memory (total: %s, %.2fkb):</b><br>" % (len(obj_count), sum([stat[1] for stat in obj_count.values()]))
 
 		for obj, stat in sorted(obj_count.items(), key=lambda x: x[1][0], reverse=True): # Sorted by count
-			yield " - %.1fkb = %s x %s<br>" % (stat[1], stat[0], cgi.escape(obj))
+			yield " - %.1fkb = %s x <a href=\"/Listobj?type=%s\">%s</a><br>" % (stat[1], stat[0], obj, cgi.escape(obj))
 
 
 		from greenlet import greenlet
@@ -189,6 +189,49 @@ class UiRequestPlugin(object):
 		yield "Done in %.1f" % (time.time()-s)
 
 
+	def actionListobj(self):
+		import gc, sys
+
+		self.sendHeader()
+		type_filter = self.get.get("type")
+
+		yield """
+		<style>
+		 * { font-family: monospace; white-space: pre }
+		 table * { text-align: right; padding: 0px 10px }
+		</style>
+		"""
+
+		yield "Listing all %s objects in memory...<br>" % cgi.escape(type_filter)
+
+		ref_count = {}
+		objs = gc.get_objects()
+		for obj in objs:
+			obj_type = str(type(obj))
+			if obj_type != type_filter: continue
+			refs = [ref for ref in gc.get_referrers(obj) if hasattr(ref, "__class__") and ref.__class__.__name__ not in ["list", "dict", "function", "type", "frame", "WeakSet", "tuple"]]
+			if not refs: continue
+			yield "%.1fkb %s... " % (float(sys.getsizeof(obj))/1024, cgi.escape(str(obj)[0:100].ljust(100)) )
+			for ref in refs:
+				yield " ["
+				if "object at" in str(ref) or len(str(ref)) > 100:
+					yield str(ref.__class__.__name__)
+				else:
+					yield str(ref.__class__.__name__)+":"+cgi.escape(str(ref))
+				yield "] "
+				ref_type = ref.__class__.__name__
+				if ref_type not in ref_count:
+					ref_count[ref_type] = [0,0]
+				ref_count[ref_type][0] += 1 # Count
+				ref_count[ref_type][1] += float(sys.getsizeof(obj))/1024 # Size
+			yield "<br>"
+
+		yield "<br>Object referrer (total: %s, %.2fkb):<br>" % (len(ref_count), sum([stat[1] for stat in ref_count.values()])) 
+
+		for obj, stat in sorted(ref_count.items(), key=lambda x: x[1][0], reverse=True)[0:30]: # Sorted by count
+			yield " - %.1fkb = %s x %s<br>" % (stat[1], stat[0], cgi.escape(str(obj)) )
+
+
 	def actionBenchmark(self):
 		import sys
 		from contextlib import contextmanager

plugins/Zeroname/UiRequestPlugin.py

@@ -23,6 +23,7 @@ class UiRequestPlugin(object):
 	# Is mediarequest allowed from that referer
 	def isMediaRequestAllowed(self, site_address, referer):
 		referer_path = re.sub("http[s]{0,1}://.*?/", "/", referer).replace("/media", "") # Remove site address
+		referer_path = re.sub("\?.*", "", referer_path) # Remove html params
 		referer_site_address = re.match("/(?P<address>[A-Za-z0-9\.]+)(?P<inner_path>/.*|$)", referer_path).group("address")
 
 		if referer_site_address == site_address: # Referer site address as simple address

plugins/Zeroname/updater/zeroname_updater.py

@@ -37,7 +37,7 @@ def processNameOp(domain, value):
 		else:
 			names["%s.bit" % domain] = address
 
-	new_names_raw = json.dumps(names, indent=2)
+	new_names_raw = json.dumps(names, indent=2, sort_keys=True)
 	if new_names_raw != names_raw:
 		open(names_path, "wb").write(new_names_raw)
 		return True