rev247, Fix content validation error caused by ContentManager refactor, Refactor unittests make use of testdata and format with PEP8

This commit is contained in:
HelloZeroNet 2015-06-20 15:54:49 +02:00
parent 1f53212d62
commit f63b711972
13 changed files with 508 additions and 488 deletions

View file

@ -4,7 +4,7 @@ import ConfigParser
class Config(object): class Config(object):
def __init__(self): def __init__(self):
self.version = "0.3.1" self.version = "0.3.1"
self.rev = 246 self.rev = 247
self.parser = self.createArguments() self.parser = self.createArguments()
argv = sys.argv[:] # Copy command line arguments argv = sys.argv[:] # Copy command line arguments
argv = self.parseConfig(argv) # Add arguments from config file argv = self.parseConfig(argv) # Add arguments from config file

View file

@ -165,7 +165,7 @@ class ContentManager(object):
user_urn = "%s/%s" % (content["cert_auth_type"], content["cert_user_id"]) # web/nofish@zeroid.bit 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 not rules: if rules == False:
return False # User banned return False # User banned
if "signers" in rules: if "signers" in rules:
rules["signers"] = rules["signers"][:] # Make copy of the signers rules["signers"] = rules["signers"][:] # Make copy of the signers

View file

@ -1,394 +1,416 @@
import sys, os, unittest, urllib, time import sys
sys.path.append(os.path.abspath("src")) # Imports relative to src dir import os
import unittest
import urllib
import time
sys.path.append(os.path.abspath("src")) # Imports relative to src dir
from Config import config from Config import config
config.data_dir = "src/Test/testdata" # Use test data for unittests config.data_dir = "src/Test/testdata" # Use test data for unittests
from Crypt import CryptBitcoin from Crypt import CryptBitcoin
from Ui import UiRequest
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
def setUp(self):
def testMediaRoute(self): if not os.path.isfile("%s/sites.json" % config.data_dir):
try: open("%s/sites.json" % config.data_dir, "w").write("{}")
urllib.urlopen("http://127.0.0.1:43110").read() if not os.path.isfile("%s/users.json" % config.data_dir):
except Exception, err: open("%s/users.json" % config.data_dir, "w").write("""
raise unittest.SkipTest(err) {
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/./sites.json").read()) "15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc": {
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/../config.py").read()) "certs": {},
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../sites.json").read()) "master_seed": "024bceac1105483d66585d8a60eaf20aa8c3254b0f266e0d626ddb6114e2949a",
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/..//sites.json").read()) "sites": {}
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../../zeronet.py").read()) }
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../sites.json").read()) }
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/..//sites.json").read()) """)
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../../zeronet.py").read())
def tearDown(self):
if os.path.isfile("src/Test/testdata/users.json"):
def testBitcoinSignOld(self): os.unlink("src/Test/testdata/users.json")
s = time.time() if os.path.isfile("src/Test/testdata/sites.json"):
privatekey = "23DKQpDz7bXM7w5KN5Wnmz7bwRNqNHcdQjb2WwrdB1QtTf5gM3pFdf" os.unlink("src/Test/testdata/sites.json")
privatekey_bad = "23DKQpDz7bXM7w5KN5Wnmz6bwRNqNHcdQjb2WwrdB1QtTf5gM3pFdf"
def testMediaRoute(self):
address = CryptBitcoin.privatekeyToAddress(privatekey) try:
self.assertEqual(address, "12vTsjscg4hYPewUL2onma5pgQmWPMs3ez") urllib.urlopen("http://127.0.0.1:43110").read()
except Exception, err:
address_bad = CryptBitcoin.privatekeyToAddress(privatekey_bad) raise unittest.SkipTest(err)
self.assertNotEqual(address_bad, "12vTsjscg4hYPewUL2onma5pgQmWPMs3ez") self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/./sites.json").read())
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/../config.py").read())
sign = CryptBitcoin.signOld("hello", privatekey) self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../sites.json").read())
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/..//sites.json").read())
self.assertTrue(CryptBitcoin.verify("hello", address, sign)) self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/media/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../../zeronet.py").read())
self.assertFalse(CryptBitcoin.verify("not hello", address, sign)) self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../sites.json").read())
self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/..//sites.json").read())
sign_bad = CryptBitcoin.signOld("hello", privatekey_bad) self.assertIn("Forbidden", urllib.urlopen("http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../../zeronet.py").read())
self.assertFalse(CryptBitcoin.verify("hello", address, sign_bad))
def testBitcoinSignOld(self):
print "Taken: %.3fs, " % (time.time()-s), s = time.time()
privatekey = "23DKQpDz7bXM7w5KN5Wnmz7bwRNqNHcdQjb2WwrdB1QtTf5gM3pFdf"
privatekey_bad = "23DKQpDz7bXM7w5KN5Wnmz6bwRNqNHcdQjb2WwrdB1QtTf5gM3pFdf"
def testBitcoinSign(self):
s = time.time() address = CryptBitcoin.privatekeyToAddress(privatekey)
privatekey = "5K9S6dVpufGnroRgFrT6wsKiz2mJRYsC73eWDmajaHserAp3F1C" self.assertEqual(address, "12vTsjscg4hYPewUL2onma5pgQmWPMs3ez")
privatekey_bad = "5Jbm9rrusXyApAoM8YoM4Rja337zMMoBUMRJ1uijiguU2aZRnwC"
address_bad = CryptBitcoin.privatekeyToAddress(privatekey_bad)
address = CryptBitcoin.privatekeyToAddress(privatekey) self.assertNotEqual(address_bad, "12vTsjscg4hYPewUL2onma5pgQmWPMs3ez")
self.assertEqual(address, "1MpDMxFeDUkiHohxx9tbGLeEGEuR4ZNsJz")
sign = CryptBitcoin.signOld("hello", privatekey)
address_bad = CryptBitcoin.privatekeyToAddress(privatekey_bad)
self.assertNotEqual(address_bad, "1MpDMxFeDUkiHohxx9tbGLeEGEuR4ZNsJz") self.assertTrue(CryptBitcoin.verify("hello", address, sign))
self.assertFalse(CryptBitcoin.verify("not hello", address, sign))
sign = CryptBitcoin.sign("hello", privatekey)
sign_bad = CryptBitcoin.signOld("hello", privatekey_bad)
self.assertTrue(CryptBitcoin.verify("hello", address, sign)) self.assertFalse(CryptBitcoin.verify("hello", address, sign_bad))
self.assertFalse(CryptBitcoin.verify("not hello", address, sign))
print "Taken: %.3fs, " % (time.time() - s),
sign_bad = CryptBitcoin.sign("hello", privatekey_bad)
self.assertFalse(CryptBitcoin.verify("hello", address, sign_bad)) def testBitcoinSign(self):
s = time.time()
print "Taken: %.3fs, " % (time.time()-s), privatekey = "5K9S6dVpufGnroRgFrT6wsKiz2mJRYsC73eWDmajaHserAp3F1C"
privatekey_bad = "5Jbm9rrusXyApAoM8YoM4Rja337zMMoBUMRJ1uijiguU2aZRnwC"
address = CryptBitcoin.privatekeyToAddress(privatekey)
def testBitcoinSignCompressed(self): self.assertEqual(address, "1MpDMxFeDUkiHohxx9tbGLeEGEuR4ZNsJz")
raise unittest.SkipTest("Not supported yet")
s = time.time() address_bad = CryptBitcoin.privatekeyToAddress(privatekey_bad)
privatekey = "Kwg4YXhL5gsNwarFWtzTKuUiwAhKbZAgWdpFo1UETZSKdgHaNN2J" self.assertNotEqual(address_bad, "1MpDMxFeDUkiHohxx9tbGLeEGEuR4ZNsJz")
privatekey_bad = "Kwg4YXhL5gsNwarFWtzTKuUiwAhKsZAgWdpFo1UETZSKdgHaNN2J"
sign = CryptBitcoin.sign("hello", privatekey)
address = CryptBitcoin.privatekeyToAddress(privatekey)
self.assertEqual(address, "1LSxsKfC9S9TVXGGNSM3vPHjyW82jgCX5f") self.assertTrue(CryptBitcoin.verify("hello", address, sign))
self.assertFalse(CryptBitcoin.verify("not hello", address, sign))
address_bad = CryptBitcoin.privatekeyToAddress(privatekey_bad)
self.assertNotEqual(address_bad, "1LSxsKfC9S9TVXGGNSM3vPHjyW82jgCX5f") sign_bad = CryptBitcoin.sign("hello", privatekey_bad)
self.assertFalse(CryptBitcoin.verify("hello", address, sign_bad))
sign = CryptBitcoin.sign("hello", privatekey)
print sign print "Taken: %.3fs, " % (time.time() - s),
self.assertTrue(CryptBitcoin.verify("hello", address, sign)) def testBitcoinSignCompressed(self):
self.assertFalse(CryptBitcoin.verify("not hello", address, sign)) raise unittest.SkipTest("Not supported yet")
s = time.time()
sign_bad = CryptBitcoin.sign("hello", privatekey_bad) privatekey = "Kwg4YXhL5gsNwarFWtzTKuUiwAhKbZAgWdpFo1UETZSKdgHaNN2J"
self.assertFalse(CryptBitcoin.verify("hello", address, sign_bad)) privatekey_bad = "Kwg4YXhL5gsNwarFWtzTKuUiwAhKsZAgWdpFo1UETZSKdgHaNN2J"
print "Taken: %.3fs, " % (time.time()-s), address = CryptBitcoin.privatekeyToAddress(privatekey)
self.assertEqual(address, "1LSxsKfC9S9TVXGGNSM3vPHjyW82jgCX5f")
def testTrackers(self): address_bad = CryptBitcoin.privatekeyToAddress(privatekey_bad)
raise unittest.SkipTest("Notyet") self.assertNotEqual(address_bad, "1LSxsKfC9S9TVXGGNSM3vPHjyW82jgCX5f")
from Site import SiteManager
from lib.subtl.subtl import UdpTrackerClient sign = CryptBitcoin.sign("hello", privatekey)
import hashlib
self.assertTrue(CryptBitcoin.verify("hello", address, sign))
ok = 0 self.assertFalse(CryptBitcoin.verify("not hello", address, sign))
for protocol, ip, port in SiteManager.TRACKERS:
address = "test" sign_bad = CryptBitcoin.sign("hello", privatekey_bad)
if protocol == "udp": self.assertFalse(CryptBitcoin.verify("hello", address, sign_bad))
tracker = UdpTrackerClient(ip, port)
peers = None print "Taken: %.3fs, " % (time.time() - s),
try:
tracker.connect() def testTrackers(self):
tracker.poll_once() raise unittest.SkipTest("Notyet")
tracker.announce(info_hash=hashlib.sha1(address).hexdigest(), num_want=5) from Site import SiteManager
back = tracker.poll_once() from lib.subtl.subtl import UdpTrackerClient
peers = back["response"]["peers"] import hashlib
except Exception, err:
peers = None ok = 0
print "Tracker error: %s://%s:%s %s" % (protocol, ip, port, err) for protocol, ip, port in SiteManager.TRACKERS:
if peers != None: address = "test"
ok += 1 if protocol == "udp":
tracker = UdpTrackerClient(ip, port)
self.assertEqual(ok, len(SiteManager.TRACKERS)) peers = None
try:
tracker.connect()
def testDb(self): tracker.poll_once()
print "Importing db..." tracker.announce(info_hash=hashlib.sha1(address).hexdigest(), num_want=5)
from Db import Db back = tracker.poll_once()
for db_path in [os.path.abspath("%s/test/zeronet.db" % config.data_dir), "%s/test/zeronet.db" % config.data_dir]: peers = back["response"]["peers"]
print "Creating db using %s..." % db_path, except Exception, err:
schema = { peers = None
"db_name": "TestDb", print "Tracker error: %s://%s:%s %s" % (protocol, ip, port, err)
"db_file": "%s/test/zeronet.db" % config.data_dir, if peers is not None:
"map": { ok += 1
"data.json": {
"to_table": { self.assertEqual(ok, len(SiteManager.TRACKERS))
"test": "test"
} def testDb(self):
} from Db import Db
}, for db_path in [os.path.abspath("%s/test/zeronet.db" % config.data_dir), "%s/test/zeronet.db" % config.data_dir]:
"tables": { print "Creating db using %s..." % db_path,
"test": { schema = {
"cols": [ "db_name": "TestDb",
["test_id", "INTEGER"], "db_file": "%s/test/zeronet.db" % config.data_dir,
["title", "TEXT"], "map": {
], "data.json": {
"indexes": ["CREATE UNIQUE INDEX test_id ON test(test_id)"], "to_table": {
"schema_changed": 1426195822 "test": "test"
} }
} }
} },
"tables": {
if os.path.isfile("%s/test/zeronet.db" % config.data_dir): os.unlink("%s/test/zeronet.db" % config.data_dir) "test": {
db = Db(schema, "%s/test/zeronet.db" % config.data_dir) "cols": [
db.checkTables() ["test_id", "INTEGER"],
db.close() ["title", "TEXT"],
],
# Cleanup "indexes": ["CREATE UNIQUE INDEX test_id ON test(test_id)"],
os.unlink("%s/test/zeronet.db" % config.data_dir) "schema_changed": 1426195822
os.rmdir("%s/test/" % config.data_dir) }
}
}
def testContentManagerIncludes(self):
from Site import Site if os.path.isfile("%s/test/zeronet.db" % config.data_dir):
from cStringIO import StringIO os.unlink("%s/test/zeronet.db" % config.data_dir)
import json db = Db(schema, "%s/test/zeronet.db" % config.data_dir)
db.checkTables()
site = Site("1TaLk3zM7ZRskJvrh3ZNCDVGXvkJusPKQ") db.close()
# Include info
rules = site.content_manager.getRules("data/users/1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB/content.json") # Cleanup
self.assertEqual(rules["signers"], ['1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB']) os.unlink("%s/test/zeronet.db" % config.data_dir)
self.assertEqual(rules["user_name"], 'testuser4') os.rmdir("%s/test/" % config.data_dir)
self.assertEqual(rules["max_size"], 10000)
self.assertEqual(rules["includes_allowed"], False) def testContentManagerIncludes(self):
self.assertEqual(rules["files_allowed"], 'data.json') from Site import Site
# Valid signers from cStringIO import StringIO
self.assertEqual( import json
site.content_manager.getValidSigners("data/users/1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB/content.json"),
['1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB', '1TaLk3zM7ZRskJvrh3ZNCDVGXvkJusPKQ'] site = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")
) # Include info
self.assertEqual(site.content_manager.getValidSigners("data/content.json"), ['1TaLk3zM7ZRskJvrh3ZNCDVGXvkJusPKQ']) rules = site.content_manager.getRules("data/test_include/content.json")
self.assertEqual(site.content_manager.getValidSigners("content.json"), ['1TaLk3zM7ZRskJvrh3ZNCDVGXvkJusPKQ']) self.assertEqual(rules["signers"], ['15ik6LeBWnACWfaika1xqGapRZ1zh3JpCo'])
self.assertEqual(rules["user_name"], 'test')
# Data validation self.assertEqual(rules["max_size"], 20000)
data_dict = { self.assertEqual(rules["includes_allowed"], False)
"files": { self.assertEqual(rules["files_allowed"], 'data.json')
"data.json": { # Valid signers
"sha512": "be589f313e7b2d8b9b41280e603e8ba72c3f74d3cfdb771a7c418a0a64598035", self.assertEqual(
"size": 216 site.content_manager.getValidSigners("data/test_include/content.json"),
} ['15ik6LeBWnACWfaika1xqGapRZ1zh3JpCo', '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT']
}, )
"modified": 1428591454.423, self.assertEqual(
"signs": { site.content_manager.getValidSigners("data/users/content.json"),
"1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB": "HM1sv686/aIdgqyFF2t0NmZY5pv1TALo6H0zOmOJ63VOnNg2LSCpbuubb+IcHTUIJq3StUDo6okczJDeowyjOUo=" ['1LSxsKfC9S9TVXGGNSM3vPHjyW82jgCX5f', '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT']
} )
} self.assertEqual(site.content_manager.getValidSigners("content.json"), ['1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT'])
# Normal data
data = StringIO(json.dumps(data_dict)) # Data validation
self.assertEqual(site.content_manager.verifyFile("data/users/1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB/content.json", data, ignore_same=False), True) data_dict = {
# Too large "files": {
data_dict["files"]["data.json"]["size"] = 200000 "data.json": {
data = StringIO(json.dumps(data_dict)) "sha512": "369d4e780cc80504285f13774ca327fe725eed2d813aad229e62356b07365906",
self.assertEqual(site.content_manager.verifyFile("data/users/1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB/content.json", data, ignore_same=False), False) "size": 505
data_dict["files"]["data.json"]["size"] = 216 # Reset }
# Not allowed file },
data_dict["files"]["data.html"] = data_dict["files"]["data.json"] "modified": 1431451896.656619,
data = StringIO(json.dumps(data_dict)) "signs": {
self.assertEqual(site.content_manager.verifyFile("data/users/1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB/content.json", data, ignore_same=False), False) "15ik6LeBWnACWfaika1xqGapRZ1zh3JpCo": "G2QC+ZIozPQQ/XiOEOMzfekOP8ipi+rKaTy/R/3MnDf98mLIhSSA8927FW6D/ZyP7HHuII2y9d0zbAk+rr8ksQM="
del data_dict["files"]["data.html"] # Reset }
# Should work again }
data = StringIO(json.dumps(data_dict)) # Normal data
self.assertEqual(site.content_manager.verifyFile("data/users/1BhcaqWViN1YBnNgXb5aq5NtEhKtKdKZMB/content.json", data, ignore_same=False), True) data = StringIO(json.dumps(data_dict))
self.assertEqual(site.content_manager.verifyFile("data/test_include/content.json", data, ignore_same=False), True)
# Too large
def testUserContentRules(self): data_dict["files"]["data.json"]["size"] = 200000 # Emulate 2MB sized data.json
from Site import Site data = StringIO(json.dumps(data_dict))
from cStringIO import StringIO self.assertEqual(site.content_manager.verifyFile("data/test_include/content.json", data, ignore_same=False), False)
import json data_dict["files"]["data.json"]["size"] = 505 # Reset
# Not allowed file
site = Site("1Hb9rY98TNnA6TYeozJv4w36bqEiBn6x8Y") data_dict["files"]["data.html"] = data_dict["files"]["data.json"]
user_content = site.storage.loadJson("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json") data = StringIO(json.dumps(data_dict))
self.assertEqual(site.content_manager.verifyFile("data/test_include/content.json", data, ignore_same=False), False)
# File info for not exist file del data_dict["files"]["data.html"] # Reset
self.assertEqual(site.content_manager.getFileInfo("data/users/notexist/data.json")["content_inner_path"], "data/users/notexist/content.json") # Should work again
self.assertEqual(site.content_manager.getValidSigners("data/users/notexist/data.json"), ["notexist", "1Hb9rY98TNnA6TYeozJv4w36bqEiBn6x8Y"]) data = StringIO(json.dumps(data_dict))
self.assertEqual(site.content_manager.verifyFile("data/test_include/content.json", data, ignore_same=False), True)
# File info for exsitsing file
file_info = site.content_manager.getFileInfo("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/data.json") def testUserContentRules(self):
valid_signers = site.content_manager.getValidSigners(file_info["content_inner_path"], user_content) from Site import Site
self.assertEqual(valid_signers, ['14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet', '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C', '1Hb9rY98TNnA6TYeozJv4w36bqEiBn6x8Y'])
site = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")
# Known user user_content = site.storage.loadJson("data/users/1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q/content.json")
user_content["cert_auth_type"] = "web"
user_content["cert_user_id"] = "nofish@zeroid.bit" # File info for not exist file
rules = site.content_manager.getRules("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content) self.assertEqual(site.content_manager.getFileInfo("data/users/notexist/data.json")["content_inner_path"], "data/users/notexist/content.json")
self.assertEqual(rules["max_size"], 100000) self.assertEqual(site.content_manager.getValidSigners("data/users/notexist/data.json"), ["notexist", "1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT"])
# Unknown user # File info for exsitsing file
user_content["cert_auth_type"] = "web" file_info = site.content_manager.getFileInfo("data/users/1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q/data.json")
user_content["cert_user_id"] = "noone@zeroid.bit" valid_signers = site.content_manager.getValidSigners(file_info["content_inner_path"], user_content)
rules = site.content_manager.getRules("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content) self.assertEqual(valid_signers, ['14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet', '1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q', '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT'])
self.assertEqual(rules["max_size"], 10000)
# Known user
# User with more size limit by auth type user_content["cert_auth_type"] = "web"
user_content["cert_auth_type"] = "bitmsg" user_content["cert_user_id"] = "nofish@zeroid.bit"
user_content["cert_user_id"] = "noone@zeroid.bit" rules = site.content_manager.getRules("data/users/1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q/content.json", user_content)
rules = site.content_manager.getRules("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content) self.assertEqual(rules["max_size"], 100000)
self.assertEqual(rules["max_size"], 20000)
# Unknown user
# Banned user user_content["cert_auth_type"] = "web"
user_content["cert_auth_type"] = "web" user_content["cert_user_id"] = "noone@zeroid.bit"
user_content["cert_user_id"] = "bad@zeroid.bit" rules = site.content_manager.getRules("data/users/1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q/content.json", user_content)
rules = site.content_manager.getRules("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content) self.assertEqual(rules["max_size"], 10000)
self.assertFalse(rules)
# User with more size limit by auth type
user_content["cert_auth_type"] = "bitmsg"
def testUserContentCert(self): user_content["cert_user_id"] = "noone@zeroid.bit"
from Site import Site rules = site.content_manager.getRules("data/users/1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q/content.json", user_content)
from cStringIO import StringIO self.assertEqual(rules["max_size"], 15000)
import json
user_addr = "1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C" # Banned user
user_priv = "5Kk7FSA63FC2ViKmKLuBxk9gQkaQ5713hKq8LmFAf4cVeXh6K6A" user_content["cert_auth_type"] = "web"
cert_addr = "14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet" user_content["cert_user_id"] = "bad@zeroid.bit"
cert_priv = "5JusJDSjHaMHwUjDT3o6eQ54pA6poo8La5fAgn1wNc3iK59jxjA" rules = site.content_manager.getRules("data/users/1C5sgvWaSgfaTpV5kjBCnCiKtENNMYo69q/content.json", user_content)
self.assertFalse(rules)
site = Site("1Hb9rY98TNnA6TYeozJv4w36bqEiBn6x8Y")
#user_content = site.storage.loadJson("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json") def testUserContentCert(self):
# site.content_manager.contents["data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json"] = user_content # Add to content manager from Site import Site
# Check if the user file is loaded from cStringIO import StringIO
self.assertTrue("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json" in site.content_manager.contents) import json
user_content = site.content_manager.contents["data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json"] # user_addr = "1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C"
cert_content = site.content_manager.contents["data/users/content.json"] user_priv = "5Kk7FSA63FC2ViKmKLuBxk9gQkaQ5713hKq8LmFAf4cVeXh6K6A"
# Override cert signer # cert_addr = "14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet"
cert_content["user_contents"]["cert_signers"]["zeroid.bit"] = ["14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet", "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz"] cert_priv = "5JusJDSjHaMHwUjDT3o6eQ54pA6poo8La5fAgn1wNc3iK59jxjA"
site = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")
# Valid cert providers # user_content = site.storage.loadJson("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json")
rules = site.content_manager.getRules("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content) # site.content_manager.contents["data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json"] = user_content # Add to content manager
self.assertEqual(rules["cert_signers"], {"zeroid.bit": ["14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet", "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz"]} ) # Check if the user file is loaded
self.assertTrue("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json" in site.content_manager.contents)
# Add cert user_content = site.content_manager.contents["data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json"]
user_content["cert_sign"] = CryptBitcoin.sign( cert_content = site.content_manager.contents["data/users/content.json"]
"1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C#%s/%s" % (user_content["cert_auth_type"], user_content["cert_user_id"].split("@")[0]), cert_priv # Override cert signer
) cert_content["user_contents"]["cert_signers"]["zeroid.bit"] = ["14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet", "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz"]
# Verify cert # Valid cert providers
self.assertTrue(site.content_manager.verifyCert("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content)) rules = site.content_manager.getRules("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content)
self.assertFalse(site.content_manager.verifyCert("data/users/badaddress/content.json", user_content)) self.assertEqual(rules["cert_signers"], {"zeroid.bit": ["14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet", "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz"]})
# Add cert
# Sign user content user_content["cert_sign"] = CryptBitcoin.sign(
#signed_content = site.content_manager.sign("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_priv, filewrite=False) "1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C#%s/%s" % (user_content["cert_auth_type"], user_content["cert_user_id"].split("@")[0]), cert_priv
signed_content = site.storage.loadJson("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json") )
# Test user cert # Verify cert
self.assertTrue(site.content_manager.verifyFile("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", StringIO(json.dumps(signed_content)), ignore_same=False)) self.assertTrue(site.content_manager.verifyCert("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content))
self.assertFalse(site.content_manager.verifyCert("data/users/badaddress/content.json", user_content))
# Test banned user
site.content_manager.contents["data/users/content.json"]["user_contents"]["permissions"][user_content["cert_user_id"]] = False # Sign user content
self.assertFalse(site.content_manager.verifyFile("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", StringIO(json.dumps(signed_content)), ignore_same=False)) signed_content = site.content_manager.sign("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_priv, filewrite=False)
# Test invalid cert # Test user cert
user_content["cert_sign"] = CryptBitcoin.sign( self.assertTrue(site.content_manager.verifyFile(
"badaddress#%s/%s" % (user_content["cert_auth_type"], user_content["cert_user_id"]), cert_priv "data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json",
) StringIO(json.dumps(signed_content)), ignore_same=False
signed_content = site.content_manager.sign("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_priv, filewrite=False) ))
self.assertFalse(site.content_manager.verifyFile("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", StringIO(json.dumps(signed_content)), ignore_same=False))
# Test banned user
site.content_manager.contents["data/users/content.json"]["user_contents"]["permissions"][user_content["cert_user_id"]] = False
def testClone(self): self.assertFalse(site.content_manager.verifyFile(
from Site import Site "data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json",
from Site import SiteManager StringIO(json.dumps(signed_content)), ignore_same=False
from User import UserManager ))
import shutil
# Test invalid cert
site = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT") # Privatekey: 5KUh3PvNm5HUWoCfSUfcYvfQ2g3PrRNJWr6Q9eqdBGu23mtMntv user_content["cert_sign"] = CryptBitcoin.sign(
self.assertEqual(site.storage.directory, "src/Test/testdata/1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT") "badaddress#%s/%s" % (user_content["cert_auth_type"], user_content["cert_user_id"]), cert_priv
)
# Remove old files signed_content = site.content_manager.sign("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_priv, filewrite=False)
if os.path.isdir("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL"): self.assertFalse(site.content_manager.verifyFile(
shutil.rmtree("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL") "data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json",
self.assertFalse(os.path.isfile("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL/content.json")) StringIO(json.dumps(signed_content)), ignore_same=False
))
# Clone 1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT to 15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc
new_site = site.clone("159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL", "5JU2p5h3R7B1WrbaEdEDNZR7YHqRLGcjNcqwqVQzX2H4SuNe2ee", address_index=1) # Privatekey: 5JU2p5h3R7B1WrbaEdEDNZR7YHqRLGcjNcqwqVQzX2H4SuNe2ee def testClone(self):
from Site import Site
# Check if clone was successful import shutil
self.assertEqual(new_site.address, "159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL")
self.assertTrue(new_site.storage.isFile("content.json")) site = Site("1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT") # Privatekey: 5KUh3PvNm5HUWoCfSUfcYvfQ2g3PrRNJWr6Q9eqdBGu23mtMntv
self.assertTrue(new_site.storage.isFile("index.html")) self.assertEqual(site.storage.directory, "src/Test/testdata/1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT")
self.assertTrue(new_site.storage.isFile("data/users/content.json"))
self.assertTrue(new_site.storage.isFile("data/zeroblog.db")) # Remove old files
if os.path.isdir("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL"):
shutil.rmtree("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL")
# Test re-cloning (updating) self.assertFalse(os.path.isfile("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL/content.json"))
# Changes in non-data files should be overwritten # Clone 1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT to 15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc
new_site.storage.write("index.html", "this will be overwritten") new_site = site.clone("159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL", "5JU2p5h3R7B1WrbaEdEDNZR7YHqRLGcjNcqwqVQzX2H4SuNe2ee", address_index=1)
self.assertEqual(new_site.storage.read("index.html"), "this will be overwritten")
# Check if clone was successful
# Changes in data file should be kept after re-cloning self.assertEqual(new_site.address, "159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL")
changed_contentjson = new_site.storage.loadJson("content.json") self.assertTrue(new_site.storage.isFile("content.json"))
changed_contentjson["description"] = "Update Description Test" self.assertTrue(new_site.storage.isFile("index.html"))
new_site.storage.writeJson("content.json", changed_contentjson) self.assertTrue(new_site.storage.isFile("data/users/content.json"))
self.assertTrue(new_site.storage.isFile("data/zeroblog.db"))
changed_data = new_site.storage.loadJson("data/data.json")
changed_data["title"] = "UpdateTest" # Test re-cloning (updating)
new_site.storage.writeJson("data/data.json", changed_data)
# Changes in non-data files should be overwritten
# Re-clone the site new_site.storage.write("index.html", "this will be overwritten")
site.clone("159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL") self.assertEqual(new_site.storage.read("index.html"), "this will be overwritten")
self.assertEqual(new_site.storage.loadJson("data/data.json")["title"], "UpdateTest") # Changes in data file should be kept after re-cloning
self.assertEqual(new_site.storage.loadJson("content.json")["description"], "Update Description Test") changed_contentjson = new_site.storage.loadJson("content.json")
self.assertNotEqual(new_site.storage.read("index.html"), "this will be overwritten") changed_contentjson["description"] = "Update Description Test"
new_site.storage.writeJson("content.json", changed_contentjson)
def testUserNewsite(self): changed_data = new_site.storage.loadJson("data/data.json")
from User import UserManager changed_data["title"] = "UpdateTest"
user = UserManager.user_manager.get() new_site.storage.writeJson("data/data.json", changed_data)
user.sites = {} # Reset user data
self.assertEqual(user.master_address, "15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc") # Re-clone the site
self.assertEqual(user.getAddressAuthIndex("15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc"), 1458664252141532163166741013621928587528255888800826689784628722366466547364755811L) site.clone("159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL")
address, address_index, site_data = user.getNewSiteData() self.assertEqual(new_site.storage.loadJson("data/data.json")["title"], "UpdateTest")
self.assertEqual(CryptBitcoin.hdPrivatekey(user.master_seed, address_index), site_data["privatekey"]) # Re-generate privatekey based on address_index self.assertEqual(new_site.storage.loadJson("content.json")["description"], "Update Description Test")
self.assertNotEqual(new_site.storage.read("index.html"), "this will be overwritten")
user.sites = {} # Reset user data
# Delete created files
self.assertNotEqual(user.getSiteData(address)["auth_address"], address) # Site address and auth address is different if os.path.isdir("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL"):
self.assertEqual(user.getSiteData(address)["auth_privatekey"], site_data["auth_privatekey"]) # Re-generate auth_privatekey for site new_site.storage.closeDb()
shutil.rmtree("src/Test/testdata/159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL")
def testUserNewsite(self):
def testSslCert(self): from User import UserManager
from Crypt import CryptConnection user = UserManager.user_manager.get()
# Remove old certs user.sites = {} # Reset user data
if os.path.isfile("%s/cert-rsa.pem" % config.data_dir): os.unlink("%s/cert-rsa.pem" % config.data_dir) self.assertEqual(user.master_address, "15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc")
if os.path.isfile("%s/key-rsa.pem" % config.data_dir): os.unlink("%s/key-rsa.pem" % config.data_dir) self.assertEqual(
user.getAddressAuthIndex("15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc"),
CryptConnection.manager.loadCerts() 1458664252141532163166741013621928587528255888800826689784628722366466547364755811L
)
self.assertIn("tls-rsa", CryptConnection.manager.crypt_supported)
self.assertEqual(CryptConnection.manager.selectCrypt(["tls-rsa", "unknown"]), "tls-rsa") address, address_index, site_data = user.getNewSiteData()
self.assertTrue(os.path.isfile("%s/cert-rsa.pem" % config.data_dir)) self.assertEqual(CryptBitcoin.hdPrivatekey(user.master_seed, address_index), site_data["privatekey"]) # Re-generate privatekey based on address_index
self.assertTrue(os.path.isfile("%s/key-rsa.pem" % config.data_dir))
user.sites = {} # Reset user data
self.assertNotEqual(user.getSiteData(address)["auth_address"], address) # Site address and auth address is different
self.assertEqual(user.getSiteData(address)["auth_privatekey"], site_data["auth_privatekey"]) # Re-generate auth_privatekey for site
def testSslCert(self):
from Crypt import CryptConnection
# Remove old certs
if os.path.isfile("%s/cert-rsa.pem" % config.data_dir):
os.unlink("%s/cert-rsa.pem" % config.data_dir)
if os.path.isfile("%s/key-rsa.pem" % config.data_dir):
os.unlink("%s/key-rsa.pem" % config.data_dir)
CryptConnection.manager.loadCerts()
self.assertIn("tls-rsa", CryptConnection.manager.crypt_supported)
self.assertEqual(CryptConnection.manager.selectCrypt(["tls-rsa", "unknown"]), "tls-rsa")
self.assertTrue(os.path.isfile("%s/cert-rsa.pem" % config.data_dir))
self.assertTrue(os.path.isfile("%s/key-rsa.pem" % config.data_dir))
# Remove created files
os.unlink("%s/cert-rsa.pem" % config.data_dir)
os.unlink("%s/key-rsa.pem" % config.data_dir)
if __name__ == "__main__": if __name__ == "__main__":
import logging import logging
logging.getLogger().setLevel(level=logging.DEBUG) logging.getLogger().setLevel(level=logging.CRITICAL)
#unittest.main(verbosity=2) unittest.main(verbosity=2)
unittest.main(verbosity=2, defaultTest="TestCase.testClone") # unittest.main(verbosity=2, defaultTest="TestCase.testUserContentCert")

View file

@ -1,5 +1,5 @@
{ {
"address": "1BLogC9LN4oPDcruNz3qo1ysa133E9AGg8", "address": "1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT",
"background-color": "white", "background-color": "white",
"description": "Blogging platform Demo", "description": "Blogging platform Demo",
"domain": "Blog.ZeroNetwork.bit", "domain": "Blog.ZeroNetwork.bit",
@ -88,13 +88,9 @@
"sha512": "8a42b98962faea74618113166886be488c09dad10ca47fe97005edc5fb40cc00", "sha512": "8a42b98962faea74618113166886be488c09dad10ca47fe97005edc5fb40cc00",
"size": 723 "size": 723
}, },
"img/post/slides.png": {
"sha512": "1933db3b90ab93465befa1bd0843babe38173975e306286e08151be9992f767e",
"size": 14439
},
"index.html": { "index.html": {
"sha512": "4989c09b0f8ebcb84200bf39ac387d0cb8387846f44c993c553f5638472dc9c6", "sha512": "c4039ebfc4cb6f116cac05e803a18644ed70404474a572f0d8473f4572f05df3",
"size": 4665 "size": 4667
}, },
"js/all.js": { "js/all.js": {
"sha512": "034c97535f3c9b3fbebf2dcf61a38711dae762acf1a99168ae7ddc7e265f582c", "sha512": "034c97535f3c9b3fbebf2dcf61a38711dae762acf1a99168ae7ddc7e265f582c",
@ -104,20 +100,30 @@
"ignore": "((js|css)/(?!all.(js|css))|data/.*db|data/users/.*/.*)", "ignore": "((js|css)/(?!all.(js|css))|data/.*db|data/users/.*/.*)",
"includes": { "includes": {
"data/users/content.json": { "data/users/content.json": {
"signers": [], "signers": ["1LSxsKfC9S9TVXGGNSM3vPHjyW82jgCX5f"],
"signers_required": 1 "signers_required": 1
},
"data/test_include/content.json": {
"added": 1424976057,
"files_allowed": "data.json",
"includes_allowed": false,
"max_size": 20000,
"signers": [ "15ik6LeBWnACWfaika1xqGapRZ1zh3JpCo" ],
"signers_required": 1,
"user_id": 47,
"user_name": "test"
} }
}, },
"modified": 1433033839.187, "modified": 1434801613.8,
"sign": [ "sign": [
23288026089939741768236374425021091801956985530578920099613839712827977534400, 107584248894581661953399064048991976924739126704981340547735906786807630121376,
96520925254285126876579021588512602074631663615139311676453830936350975122022 14052922268999375798453683972186312380248481029778104103759595432459320456230
], ],
"signers_sign": "G7W/oNvczE5nPTFYVOqv8+GOpQd23LS/Dc1Q6xQ1NRDDHlYzmoSE63UQ7Za05kD0rwIYXbuUSr8z8p6RhZmnUs8=", "signers_sign": "HDNmWJHM2diYln4pkdL+qYOvgE7MdwayzeG+xEUZBgp1HtOjBJS+knDEVQsBkjcOPicDG2it1r6R1eQrmogqSP0=",
"signs": { "signs": {
"1BLogC9LN4oPDcruNz3qo1ysa133E9AGg8": "G9i0Q/ZkhZ0H5O8ofEvXbEgGhwVJYbLxyxOwsGYxgtzIaBjiDg/HKe9l7nPRqDD3/bRG9oPH5kIQd4152vY3lI8=" "1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT": "HO9esgmZhPJqOG+fEpStwK+u5P/+4Kx5VGApNnbsyA0lBfEV6aWviIP6FBlP3sZSH/EMuoEw42lToRmLppbzmuM="
}, },
"signs_required": 1, "signs_required": 1,
"title": "ZeroBlog", "title": "ZeroBlog",
"zeronet_version": "0.3.0" "zeronet_version": "0.3.1"
} }

View file

@ -0,0 +1,12 @@
{
"files": {
"data.json": {
"sha512": "f6ea25af270ba6a67c90a053c34da8ba94e6cf2177d4ee7979fd517a31ca6479",
"size": 74
}
},
"modified": 1424976057.772182,
"signs": {
"1TaLk3zM7ZRskJvrh3ZNCDVGXvkJusPKQ": "G1Jy36d3LLu+Lh8ikGqOozyiYZ+NvF8QF1OdC6PfDt26bflPPQ0gwWw8AQdFmc/S3BMBDNt0tJshiiJcRK46j/c="
}
}

View file

@ -0,0 +1,37 @@
{
"next_topic_id": 1,
"topics": [],
"next_message_id": 5,
"comments": {
"1@2": [
{
"comment_id": 1,
"body": "New user test!",
"added": 1423442049
},
{
"comment_id": 2,
"body": "test 321",
"added": 1423531445
},
{
"comment_id": 3,
"body": "0.2.4 test.",
"added": 1424133003
}
]
},
"topic_votes": {
"1@2": 1,
"1@6": 1,
"1@69": 1,
"607@69": 1
},
"comment_votes": {
"35@2": 1,
"7@64": 1,
"8@64": 1,
"50@2": 1,
"13@77": 1
}
}

View file

@ -0,0 +1,15 @@
{
"cert_auth_type": "web",
"cert_sign": "HBsTrjTmv+zD1iY93tSci8n9DqdEtYwzxJmRppn4/b+RYktcANGm5tXPOb+Duw3AJcgWDcGUvQVgN1D9QAwIlCw=",
"cert_user_id": "toruser@zeroid.bit",
"files": {
"data.json": {
"sha512": "4868b5e6d70a55d137db71c2e276bda80437e0235ac670962acc238071296b45",
"size": 168
}
},
"modified": 1432491109.11,
"signs": {
"1CjfbrbwtP8Y2QjPy12vpTATkUT7oSiPQ9": "HMy7ZwwqE0Sk8O+5hTx/ejFW6KtIDbID6fGblCodUTpz4mJZ5GwApBHSVLMYL43vvGT/vKZOiQoJ5tQTeFVbbkk="
}
}

View file

@ -0,0 +1,12 @@
{
"next_comment_id": 2,
"comment": [
{
"comment_id": 1,
"body": "hello from Tor!",
"post_id": 38,
"date_added": 1432491109
}
],
"comment_vote": {}
}

View file

@ -12,7 +12,8 @@
"permission_rules": { "permission_rules": {
".*": { ".*": {
"files_allowed": "data.json", "files_allowed": "data.json",
"max_size": 10000 "max_size": 10000,
"signers": [ "14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet" ]
}, },
"bitid/.*@zeroid.bit": { "max_size": 40000 }, "bitid/.*@zeroid.bit": { "max_size": 40000 },
"bitmsg/.*@zeroid.bit": { "max_size": 15000 } "bitmsg/.*@zeroid.bit": { "max_size": 15000 }

View file

@ -1,26 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIEVzCCAz+gAwIBAgIJAMT6z6CFolWoMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNV
BAYTAlVTMQswCQYDVQQIDAJOWTERMA8GA1UEBwwITmV3IFlvcmsxFTATBgNVBAoM
DEV4YW1wbGUsIExMQzEYMBYGA1UEAwwPRXhhbXBsZSBDb21wYW55MR8wHQYJKoZI
hvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29tMB4XDTE1MDYwNzIyNDcwMVoXDTE1MDcw
NzIyNDcwMVowfzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMREwDwYDVQQHDAhO
ZXcgWW9yazEVMBMGA1UECgwMRXhhbXBsZSwgTExDMRgwFgYDVQQDDA9FeGFtcGxl
IENvbXBhbnkxHzAdBgkqhkiG9w0BCQEWEHRlc3RAZXhhbXBsZS5jb20wggEiMA0G
CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxQLG4PNW2okO2+seSyXduFDj6RsEE
uLKmPrLzS8phW+VKZ7WaAnCQOX4ZX5oUNLIHSbsi57JBEzSxSMAbipaKilRbLtp4
ObwDMUS+CTR2cohaYf7jCYrkWCeUWw/QT3zd65KXnysNmdPt8MTsgipiwACHPBZ6
lMfzYPv0LoYNSubXAGp3gkXdh8oSFd1s4Dz0UC0g7D+McstyN72BWpQxkKpir8wN
NYaXX02vXdXag1LHcG3tvQYE35Ssp0D7AyDOfnWOXIJBosPqAPdC9Bn2EYqs105u
KxJvLL2fwRC5OWyFlxgl2/WbaVlxPTG+tCt1Z8PzSt/Ba4beXNXWZvdPAgMBAAGj
gdUwgdIwHQYDVR0OBBYEFHpqhZLf14i9oSNLl6JCGn0Oj3ykMB8GA1UdIwQYMBaA
FHpqhZLf14i9oSNLl6JCGn0Oj3ykMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEoG
A1UdEQRDMEGCC2V4YW1wbGUuY29tgg93d3cuZXhhbXBsZS5jb22CEG1haWwuZXhh
bXBsZS5jb22CD2Z0cC5leGFtcGxlLmNvbTAsBglghkgBhvhCAQ0EHxYdT3BlblNT
TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwDQYJKoZIhvcNAQELBQADggEBADtW79uP
gSB3iiOjvGTZqiYY0Uiw6CwUVtDGHSCv/daOboGnCsdKe4TcmjRg+GG8FQGxTpcg
OJouUiCb+ATWnn0af+3wQefzMB1HISwhw+c62PcR6h+eFLITDJxVem/zK7Hhxwpq
z8ud25+W1fLED2QdKIN7RyhtAS0bTq/XoZpkC0FXNa3GY2+HzP3gdIr4QGd+q+pf
HWGg/+I9m7Uk/8trxvcQH+adohJXMIYJB8mGcHprtO28megMzQjzlnycu+fHDM/L
hb6VxJU5rYe/Kfx2QHlCiRibTidCiaG1LJnpYxyNLF6pavstbziCfiruP6ki20+r
bMzABTIXLaYxeUQ=
-----END CERTIFICATE-----

View file

@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxQLG4PNW2okO2
+seSyXduFDj6RsEEuLKmPrLzS8phW+VKZ7WaAnCQOX4ZX5oUNLIHSbsi57JBEzSx
SMAbipaKilRbLtp4ObwDMUS+CTR2cohaYf7jCYrkWCeUWw/QT3zd65KXnysNmdPt
8MTsgipiwACHPBZ6lMfzYPv0LoYNSubXAGp3gkXdh8oSFd1s4Dz0UC0g7D+Mcsty
N72BWpQxkKpir8wNNYaXX02vXdXag1LHcG3tvQYE35Ssp0D7AyDOfnWOXIJBosPq
APdC9Bn2EYqs105uKxJvLL2fwRC5OWyFlxgl2/WbaVlxPTG+tCt1Z8PzSt/Ba4be
XNXWZvdPAgMBAAECggEAFKWmjgF4G4gXPy9DJBQXt1jfsjefsD8bgEX5bmG7t0+P
C/W8r63tEr+/spDyT7w7qKGsDMrUdsQX9Ta2Of8Qvh6S6PQyOqLvBagti71iwRFi
VLTpjeTEqwihw6Q/2VIJB4izULoXt8PdbfAH4EzhRxN6fEZBkBHYoL8BWlY5Az8u
tg6gjsoZFP1AiSByir0d+tf5adDVZieo5O8WYahi95TGqtkoM49YzX74I2dJ1jWY
MNqMYxoPwvf+olNB3rMPZIGb4VMpNzsgbV73fNVyCMa9TNJSQUkELrrkym3us45w
6kaBE7uU3wciQjeZOnRyDL4MnKGSUb0eJY0JjkQnkQKBgQDYx6GeXXDl6rcCovUR
gdAvJco29rT4OPi1xbqHf9mUoBuNdXpwd2/bo4NlBfEVrZlSMZ/Vl2eTLAaYm6JI
WwshIjnRU8Pe/4cffDsVRuXmdWPduXeqHqo8jwKDT9hOYcUiidWUgRdbfo108NQs
XSvnGXXS0je58GZMTeC+A9Q1gwKBgQDRUlOkr2g7j5w2nuo2yRIKuRAdI4A1UZA/
xddw3e6RLLq4vTF/6X0Wb1bsrGUhX9aJ/khWa7arN45q/KJfxwnV+I7wuPw3VQKA
zH5tF1It7bSl7FgYFXJMqYkC77V7IdQL/PuM0vS8oewlpZInDCpJjPf/7bG7iUaw
/Bb74N5ZRQKBgBGz+9ba+qVMDbYBaNINL9sp0uG6M/0xad4uT5VRM4uXp6hdt6oH
lvLw34IYgh+rFaJIuyzOOH8kUUWVMCOIi9gg22fk11IWvAouMwUBzTSM0aMBymvy
JSTc6O+gTaHZCihP6Uk/YZDvPM4X/LvCwBsXUS/uSu68Wx5QHdJmraXRAoGAGbr8
/Slyrp+gnDY8pC9jQF4vVOWgRO2Zxb0UFpOxV7cf3MWk6AxTjAZzsPQgGlIllSDk
03q6IaHap9wWOZ/F3b+IEp8qocKZZCu+/rn3KB4oLp021v8L5dCRPwMoU9J8tlyK
r2zfGLDuzlHj/VjJefESKyuUxXDCd88FJEEoE+ECgYEAmsaUuUNP4/VH32DOzVEt
wjhYvrph9fAcv67Mm+hbnBn7ACAnCJa0Ny8ZGzHSKck4WW+Drtyn6tv8naTsPnJn
GYfZeQ6uqk46F2sMOJHpmRsoJ+1Jt3GtoEedqms2o3OsnMbseiBsPhLr4GaJOCc7
+c+EexCfljR19TVV4EDhVRw=
-----END PRIVATE KEY-----

View file

@ -1,19 +0,0 @@
{
"159EGD5srUsMP97UpcLy8AtKQbQLK2AbbL": {
"auth_key": "4YV2yD0tRsQkujR313PyTaLI",
"own": false,
"permissions": [],
"serving": true,
"size": 0,
"wrapper_key": "eRdtnDMCarLs"
},
"1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT": {
"auth_key": "VyVxJU0AJqYGNTvITwASeSJA",
"modified": 1433079881.276243,
"own": false,
"permissions": [],
"serving": true,
"size": 722338,
"wrapper_key": "amGBy0GlD6nD"
}
}

View file

@ -1,12 +0,0 @@
{
"15E5rhcAUD69WbiYsYARh4YHJ4sLm2JEyc": {
"certs": {},
"master_seed": "024bceac1105483d66585d8a60eaf20aa8c3254b0f266e0d626ddb6114e2949a",
"sites": {
"1LzBg7WGjJXwJtre2iKwbZtRXezWzUMXDJ": {
"auth_address": "15DZCFDwPjFGf9E2DFVQzZJ2voTWZEesRX",
"auth_privatekey": "5KC4tMJdA8wJkNiVTuWCjNVBm7eeXWCSTRAnGABRaH5RhMEYyet"
}
}
}
}