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

No exception on incomplete content.json signing

Browse source
This commit is contained in:
ZeroNet 2016-08-10 12:57:24 +02:00
parent ec759442ed
commit 7291ac8c6b
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Content/ContentManager.py
View file

@ -319,15 +319,10 @@ class ContentManager(object):
try: try:
if not content: if not content:
content = self.site.storage.loadJson(inner_path) # Read the file if no content specified content = self.site.storage.loadJson(inner_path) # Read the file if no content specified
user_urn = "%s/%s" % (content["cert_auth_type"], content["cert_user_id"]) # web/nofish@zeroid.bit
except Exception: # Content.json not exist except Exception: # Content.json not exist
return {"signers": [user_address], "user_address": user_address} # Return information that we know for sure return {"signers": [user_address], "user_address": user_address} # Return information that we know for sure
"""if not "cert_user_name" in content: # New file, unknown user
content["cert_auth_type"] = "unknown"
content["cert_user_name"] = "unknown@unknown"
"""
user_urn = "%s/%s" % (content["cert_auth_type"], content["cert_user_id"]) # web/nofish@zeroid.bit
rules = copy.copy(user_contents["permissions"].get(content["cert_user_id"], {})) # Default rules by username rules = copy.copy(user_contents["permissions"].get(content["cert_user_id"], {})) # Default rules by username
if rules is False: if rules is False:
banned = True banned = True
@ -436,7 +431,7 @@ class ContentManager(object):
def sign(self, inner_path="content.json", privatekey=None, filewrite=True, update_changed_files=False, extend=None): def sign(self, inner_path="content.json", privatekey=None, filewrite=True, update_changed_files=False, extend=None):
if inner_path in self.contents: if inner_path in self.contents:
content = self.contents[inner_path] content = self.contents[inner_path]
if self.contents[inner_path].get("cert_sign", False) is None: if self.contents[inner_path].get("cert_sign", False) is None and self.site.storage.isFile(inner_path):
# Recover cert_sign from file # Recover cert_sign from file
content["cert_sign"] = self.site.storage.loadJson(inner_path).get("cert_sign") content["cert_sign"] = self.site.storage.loadJson(inner_path).get("cert_sign")
else: else:
@ -465,7 +460,7 @@ class ContentManager(object):
files_merged = files_node.copy() files_merged = files_node.copy()
files_merged.update(files_optional_node) files_merged.update(files_optional_node)
for file_relative_path, file_details in files_merged.iteritems(): for file_relative_path, file_details in files_merged.iteritems():
old_hash = content["files"].get(file_relative_path, {}).get("sha512") old_hash = content.get("files", {}).get(file_relative_path, {}).get("sha512")
new_hash = files_merged[file_relative_path]["sha512"] new_hash = files_merged[file_relative_path]["sha512"]
if old_hash != new_hash: if old_hash != new_hash:
changed_files.append(inner_directory + file_relative_path) changed_files.append(inner_directory + file_relative_path)
@ -590,7 +585,7 @@ class ContentManager(object):
# Calculate old content size # Calculate old content size
old_content = self.contents.get(inner_path) old_content = self.contents.get(inner_path)
if old_content: if old_content:
old_content_size = len(json.dumps(old_content)) + sum([file["size"] for file in old_content["files"].values()]) old_content_size = len(json.dumps(old_content)) + sum([file["size"] for file in old_content.get("files", {}).values()])
else: else:
old_content_size = 0 old_content_size = 0