1 patch for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk: Wed Aug 24 05:27:30 BST 2011 david-sarah@jacaranda.org * Implementation, tests and docs for blacklists. This version allows listing directories containing a blacklisted child. fixes #1425 New patches: [Implementation, tests and docs for blacklists. This version allows listing directories containing a blacklisted child. fixes #1425 david-sarah@jacaranda.org**20110824042730 Ignore-this: 43fd31acdc84f947d0399fe4d7da6586 ] { hunk ./docs/configuration.rst 609 "which peers am I connected to" list), and the shortened form (the first few characters) is recorded in various log messages. +``access.blacklist`` + + Gateway nodes may find it necessary to prohibit access to certain files. The + web-API has a facility to block access to filecaps by their storage index, + returning a 403 "Forbidden" error instead of the original file. For more + details, see the "Access Blacklist" section of ``_. + Example ======= hunk ./docs/frontends/webapi.rst 39 8. `Static Files in /public_html`_ 9. `Safety and Security Issues -- Names vs. URIs`_ 10. `Concurrency Issues`_ +11. `Access Blacklist`_ Enabling the web-API port hunk ./docs/frontends/webapi.rst 1959 Coordination Directive" sections of `mutable.rst <../specifications/mutable.rst>`_. +Access Blacklist +================ + +Gateway nodes may find it necessary to prohibit access to certain files. The +web-API has a facility to block access to filecaps by their storage index, +returning a 403 "Forbidden" error instead of the original file. + +This blacklist is recorded in $NODEDIR/access.blacklist, and contains one +blocked file per line. Comment lines (starting with ``#``) are ignored. Each +line consists of the storage-index (in the usual base32 format as displayed +by the "More Info" page, or by the "tahoe debug dump-cap" command), followed +by whitespace, followed by a reason string, which will be included in the 403 +error message. This could hold a URL to a page that explains why the file is +blocked, for example. + +So for example, if you found a need to block access to a file with filecap +``URI:CHK:n7r3m6wmomelk4sep3kw5cvduq:os7ijw5c3maek7pg65e5254k2fzjflavtpejjyhshpsxuqzhcwwq:3:20:14861``, +you could do the following:: + + tahoe debug dump-cap URI:CHK:n7r3m6wmomelk4sep3kw5cvduq:os7ijw5c3maek7pg65e5254k2fzjflavtpejjyhshpsxuqzhcwwq:3:20:14861 + -> storage index: whpepioyrnff7orecjolvbudeu + echo "whpepioyrnff7orecjolvbudeu my puppy told me to" >>$NODEDIR/access.blacklist + tahoe restart $NODEDIR + tahoe get URI:CHK:n7r3m6wmomelk4sep3kw5cvduq:os7ijw5c3maek7pg65e5254k2fzjflavtpejjyhshpsxuqzhcwwq:3:20:14861 + -> error, 403 Access Prohibited: my puppy told me to + +The ``access.blacklist`` file will be checked each time a file or directory +is accessed: the file's ``mtime`` is used to decide whether it need to be +reloaded. Therefore no node restart is necessary when creating the initial +blacklist, nor when adding second, third, or additional entries to the list. +When modifying the file, be careful to update it atomically, otherwise a +request may arrive while the file is only halfway written, and the partial +file may be incorrectly parsed. + +The blacklist is applied to all access paths (including FTP, SFTP, and CLI +operations), not just the web-API. The blacklist also applies to directories. +If a directory is blacklisted, the gateway will refuse access to both that +directory and any child files/directories underneath it, when accessed via +"DIRCAP/SUBDIR/FILENAME" -style URLs. Users who go directly to the child +file/dir will bypass the blacklist. + +The node will log the SI of the file being blocked, and the reason code, into +the ``logs/twistd.log`` file. + + .. [1] URLs and HTTP and UTF-8, Oh My HTTP does not provide a mechanism to specify the character set used to hunk ./src/allmydata/client.py 28 from allmydata.interfaces import IStatsProducer, RIStubClient, \ SDMF_VERSION, MDMF_VERSION from allmydata.nodemaker import NodeMaker +from allmydata.blacklist import Blacklist KiB=1024 hunk ./src/allmydata/client.py 283 self.terminator.setServiceParent(self) self.add_service(Uploader(helper_furl, self.stats_provider)) self.init_stub_client() + self.init_blacklist() self.init_nodemaker() def init_client_storage_broker(self): hunk ./src/allmydata/client.py 336 d.addErrback(log.err, facility="tahoe.init", level=log.BAD, umid="OEHq3g") + def init_blacklist(self): + fn = os.path.join(self.basedir, "access.blacklist") + self.blacklist = Blacklist(fn) + def init_nodemaker(self): self.nodemaker = NodeMaker(self.storage_broker, self._secret_holder, hunk ./src/allmydata/client.py 347 self.getServiceNamed("uploader"), self.terminator, self.get_encoding_parameters(), - self._key_generator) + self._key_generator, + self.blacklist) default = self.get_config("client", "mutable.format", default="sdmf") if default == "mdmf": self.mutable_file_default = MDMF_VERSION hunk ./src/allmydata/interfaces.py 787 read-only access with others, use get_readonly_uri(). """ - def get_write_uri(n): + def get_write_uri(): """Return the URI string that can be used by others to get write access to this node, if it is writeable. If this is a read-only node, return None.""" hunk ./src/allmydata/nodemaker.py 12 from allmydata.mutable.publish import MutableData from allmydata.dirnode import DirectoryNode, pack_children from allmydata.unknown import UnknownNode +from allmydata.blacklist import ProhibitedNode from allmydata import uri hunk ./src/allmydata/nodemaker.py 15 + class NodeMaker: implements(INodeMaker) hunk ./src/allmydata/nodemaker.py 21 def __init__(self, storage_broker, secret_holder, history, uploader, terminator, - default_encoding_parameters, key_generator): + default_encoding_parameters, key_generator, + blacklist=None): self.storage_broker = storage_broker self.secret_holder = secret_holder self.history = history hunk ./src/allmydata/nodemaker.py 30 self.terminator = terminator self.default_encoding_parameters = default_encoding_parameters self.key_generator = key_generator + self.blacklist = blacklist self._node_cache = weakref.WeakValueDictionary() # uri -> node hunk ./src/allmydata/nodemaker.py 69 else: memokey = "M" + bigcap if memokey in self._node_cache: - return self._node_cache[memokey] - cap = uri.from_string(bigcap, deep_immutable=deep_immutable, name=name) - node = self._create_from_single_cap(cap) - if node: - self._node_cache[memokey] = node # note: WeakValueDictionary + node = self._node_cache[memokey] else: hunk ./src/allmydata/nodemaker.py 71 - # don't cache UnknownNode - node = UnknownNode(writecap, readcap, deep_immutable=deep_immutable, name=name) + cap = uri.from_string(bigcap, deep_immutable=deep_immutable, + name=name) + node = self._create_from_single_cap(cap) + if node: + self._node_cache[memokey] = node # note: WeakValueDictionary + else: + # don't cache UnknownNode + node = UnknownNode(writecap, readcap, + deep_immutable=deep_immutable, name=name) + + if self.blacklist: + si = node.get_storage_index() + # if this node is blacklisted, return the reason, otherwise return None + reason = self.blacklist.check_storageindex(si) + if reason is not None: + # The original node object is cached above, not the ProhibitedNode wrapper. + # This ensures that removing the blacklist entry will make the node + # accessible if create_from_cap is called again. + node = ProhibitedNode(node, reason) return node def _create_from_single_cap(self, cap): hunk ./src/allmydata/test/no_network.py 211 self.basedir = basedir fileutil.make_dirs(basedir) + self._client_config_hooks = client_config_hooks self.servers_by_number = {} # maps to StorageServer instance self.wrappers_by_id = {} # maps to wrapped StorageServer instance self.proxies_by_id = {} # maps to IServer on which .rref is a wrapped hunk ./src/allmydata/test/no_network.py 235 f.write("[storage]\n") f.write("enabled = false\n") f.close() - c = None - if i in client_config_hooks: - # this hook can either modify tahoe.cfg, or return an - # entirely new Client instance - c = client_config_hooks[i](clientdir) - if not c: - c = NoNetworkClient(clientdir) - c.set_default_mutable_keysize(TEST_RSA_KEY_SIZE) - c.nodeid = clientid - c.short_nodeid = b32encode(clientid).lower()[:8] - c._servers = self.all_servers # can be updated later - c.setServiceParent(self) + c = self._create_client(i, clientdir, clientid) self.clients.append(c) hunk ./src/allmydata/test/no_network.py 238 + def _create_client(self, i, clientdir, clientid): + c = None + if i in self._client_config_hooks: + # this hook can either modify tahoe.cfg, or return an + # entirely new Client instance + c = self._client_config_hooks[i](clientdir) + if not c: + c = NoNetworkClient(clientdir) + c.set_default_mutable_keysize(TEST_RSA_KEY_SIZE) + c.nodeid = clientid + c.short_nodeid = b32encode(clientid).lower()[:8] + c._servers = self.all_servers # can be updated later + c.setServiceParent(self) + return c + def make_server(self, i, readonly=False): serverid = hashutil.tagged_hash("serverid", str(i))[:20] serverdir = os.path.join(self.basedir, "servers", hunk ./src/allmydata/test/no_network.py 284 for c in self.clients: c._servers = self.all_servers + def restart_client(self, i): + # we must remove the client, then build a new one with the same id + # and basedir + old_client = self.clients[i] + d = defer.maybeDeferred(old_client.disownServiceParent) + def _then(ign): + c = self._create_client(i, old_client.basedir, old_client.nodeid) + self.clients[i] = c + d.addCallback(_then) + return d + def remove_server(self, serverid): # it's enough to remove the server from c._servers (we don't actually # have to detach and stopService it) hunk ./src/allmydata/test/no_network.py 357 ss = self.g.servers_by_number[i] yield (i, ss, ss.storedir) + def restart_client(self, i=0): + d = self.g.restart_client(i) + def _then(ign): + c = self.g.clients[i] + self.client_webports[i] = c.getServiceNamed("webish").getPortnum() + self.client_baseurls[i] = c.getServiceNamed("webish").getURL() + d.addCallback(_then) + return d + def find_uri_shares(self, uri): si = tahoe_uri.from_string(uri).get_storage_index() prefixdir = storage_index_to_dir(si) hunk ./src/allmydata/test/test_web.py 173 self.history = FakeHistory() self.uploader = FakeUploader() self.uploader.setServiceParent(self) + self.blacklist = None self.nodemaker = FakeNodeMaker(None, self._secret_holder, None, self.uploader, None, None, None) hunk ./src/allmydata/test/test_web.py 5266 return d + def test_blacklist(self): + # download from a blacklisted URI, get an error + self.basedir = "web/Grid/blacklist" + self.set_up_grid() + c0 = self.g.clients[0] + c0_basedir = c0.basedir + fn = os.path.join(c0_basedir, "access.blacklist") + self.uris = {} + DATA = "off-limits " * 50 + + d = c0.upload(upload.Data(DATA, convergence="")) + def _stash_uri_and_create_dir(ur): + self.uri = ur.uri + self.url = "uri/"+self.uri + u = uri.from_string_filenode(self.uri) + self.si = u.get_storage_index() + childnode = c0.create_node_from_uri(self.uri, None) + return c0.create_dirnode({u"blacklisted.txt": (childnode,{}) }) + d.addCallback(_stash_uri_and_create_dir) + def _stash_dir(node): + self.dir_node = node + self.dir_uri = node.get_uri() + self.dir_url = "uri/"+self.dir_uri + d.addCallback(_stash_dir) + d.addCallback(lambda ign: self.GET(self.dir_url, followRedirect=True)) + def _check_dir_html(body): + self.failUnlessIn("", body) + self.failUnlessIn("blacklisted.txt", body) + d.addCallback(_check_dir_html) + d.addCallback(lambda ign: self.GET(self.url)) + d.addCallback(lambda body: self.failUnlessEqual(DATA, body)) + + def _blacklist(ign): + f = open(fn, "w") + f.write(" # this is a comment\n") + f.write(" \n") + f.write("\n") # also exercise blank lines + f.write("%s %s\n" % (base32.b2a(self.si), "off-limits to you")) + f.close() + # clients should be checking the blacklist each time, so we don't + # need to restart the client + d.addCallback(_blacklist) + d.addCallback(lambda ign: self.shouldHTTPError("get_from_blacklisted_uri", + 403, "Forbidden", + "Access Prohibited: off-limits", + self.GET, self.url)) + + # We should still be able to list the parent directory, in HTML... + d.addCallback(lambda ign: self.GET(self.dir_url, followRedirect=True)) + def _check_dir_html2(body): + self.failUnlessIn("", body) + self.failUnlessIn("blacklisted.txt", body) + d.addCallback(_check_dir_html2) + + # ... and in JSON (used by CLI). + d.addCallback(lambda ign: self.GET(self.dir_url+"?t=json", followRedirect=True)) + def _check_dir_json(res): + data = simplejson.loads(res) + self.failUnless(isinstance(data, list), data) + self.failUnlessEqual(data[0], "dirnode") + self.failUnless(isinstance(data[1], dict), data) + self.failUnlessIn("children", data[1]) + self.failUnlessIn("blacklisted.txt", data[1]["children"]) + childdata = data[1]["children"]["blacklisted.txt"] + self.failUnless(isinstance(childdata, list), data) + self.failUnlessEqual(childdata[0], "filenode") + self.failUnless(isinstance(childdata[1], dict), data) + d.addCallback(_check_dir_json) + + def _unblacklist(ign): + open(fn, "w").close() + # the Blacklist object watches mtime to tell when the file has + # changed, but on windows this test will run faster than the + # filesystem's mtime resolution. So we edit Blacklist.last_mtime + # to force a reload. + self.g.clients[0].blacklist.last_mtime -= 2.0 + d.addCallback(_unblacklist) + + # now a read should work + d.addCallback(lambda ign: self.GET(self.url)) + d.addCallback(lambda body: self.failUnlessEqual(DATA, body)) + + # read again to exercise the blacklist-is-unchanged logic + d.addCallback(lambda ign: self.GET(self.url)) + d.addCallback(lambda body: self.failUnlessEqual(DATA, body)) + + # now add a blacklisted directory, and make sure files under it are + # refused too + def _add_dir(ign): + childnode = c0.create_node_from_uri(self.uri, None) + return c0.create_dirnode({u"child": (childnode,{}) }) + d.addCallback(_add_dir) + def _get_dircap(dn): + self.dir_si_b32 = base32.b2a(dn.get_storage_index()) + self.dir_url_base = "uri/"+dn.get_write_uri() + self.dir_url_json1 = "uri/"+dn.get_write_uri()+"?t=json" + self.dir_url_json2 = "uri/"+dn.get_write_uri()+"/?t=json" + self.dir_url_json_ro = "uri/"+dn.get_readonly_uri()+"/?t=json" + self.child_url = "uri/"+dn.get_readonly_uri()+"/child" + d.addCallback(_get_dircap) + d.addCallback(lambda ign: self.GET(self.dir_url_base, followRedirect=True)) + d.addCallback(lambda body: self.failUnlessIn("", body)) + d.addCallback(lambda ign: self.GET(self.dir_url_json1)) + d.addCallback(lambda res: simplejson.loads(res)) # just check it decodes + d.addCallback(lambda ign: self.GET(self.dir_url_json2)) + d.addCallback(lambda res: simplejson.loads(res)) # just check it decodes + d.addCallback(lambda ign: self.GET(self.dir_url_json_ro)) + d.addCallback(lambda res: simplejson.loads(res)) # just check it decodes + d.addCallback(lambda ign: self.GET(self.child_url)) + d.addCallback(lambda body: self.failUnlessEqual(DATA, body)) + + def _block_dir(ign): + f = open(fn, "w") + f.write("%s %s\n" % (self.dir_si_b32, "dir-off-limits to you")) + f.close() + self.g.clients[0].blacklist.last_mtime -= 2.0 + d.addCallback(_block_dir) + d.addCallback(lambda ign: self.shouldHTTPError("get_from_blacklisted_dir base", + 403, "Forbidden", + "Access Prohibited: dir-off-limits", + self.GET, self.dir_url_base)) + d.addCallback(lambda ign: self.shouldHTTPError("get_from_blacklisted_dir json1", + 403, "Forbidden", + "Access Prohibited: dir-off-limits", + self.GET, self.dir_url_json1)) + d.addCallback(lambda ign: self.shouldHTTPError("get_from_blacklisted_dir json2", + 403, "Forbidden", + "Access Prohibited: dir-off-limits", + self.GET, self.dir_url_json2)) + d.addCallback(lambda ign: self.shouldHTTPError("get_from_blacklisted_dir json_ro", + 403, "Forbidden", + "Access Prohibited: dir-off-limits", + self.GET, self.dir_url_json_ro)) + d.addCallback(lambda ign: self.shouldHTTPError("get_from_blacklisted_dir child", + 403, "Forbidden", + "Access Prohibited: dir-off-limits", + self.GET, self.child_url)) + return d + + class CompletelyUnhandledError(Exception): pass class ErrorBoom(rend.Page): hunk ./src/allmydata/web/common.py 9 from nevow import loaders, appserver from nevow.inevow import IRequest from nevow.util import resource_filename +from allmydata import blacklist from allmydata.interfaces import ExistingChildError, NoSuchChildError, \ FileTooLargeError, NotEnoughSharesError, NoSharesError, \ EmptyPathnameComponentError, MustBeDeepImmutableError, \ hunk ./src/allmydata/web/common.py 261 "The cap is being passed in a read slot (ro_uri), or was retrieved " "from a read slot as an unknown cap.") % quoted_name return (t, http.BAD_REQUEST) + if f.check(blacklist.FileProhibited): + t = "Access Prohibited: %s" % quote_output(f.value.reason, encoding="utf-8", quotemarks=False) + return (t, http.FORBIDDEN) if f.check(WebError): return (f.value.text, f.value.code) if f.check(FileTooLargeError): hunk ./src/allmydata/web/directory.py 20 from allmydata.interfaces import IDirectoryNode, IFileNode, IFilesystemNode, \ IImmutableFileNode, IMutableFileNode, ExistingChildError, \ NoSuchChildError, EmptyPathnameComponentError, SDMF_VERSION, MDMF_VERSION +from allmydata.blacklist import ProhibitedNode from allmydata.monitor import Monitor, OperationCancelledError from allmydata import dirnode from allmydata.web.common import text_plain, WebError, \ hunk ./src/allmydata/web/directory.py 768 ctx.fillSlots("size", "-") info_link = "%s/uri/%s/?t=info" % (root, quoted_uri) + elif isinstance(target, ProhibitedNode): + ctx.fillSlots("filename", T.strike[name]) + if IDirectoryNode.providedBy(target.wrapped_node): + blacklisted_type = "DIR-BLACKLISTED" + else: + blacklisted_type = "BLACKLISTED" + ctx.fillSlots("type", blacklisted_type) + ctx.fillSlots("size", "-") + info_link = None + ctx.fillSlots("info", ["Access Prohibited:", T.br, target.reason]) + else: # unknown ctx.fillSlots("filename", html.escape(name)) hunk ./src/allmydata/web/directory.py 794 # writecap and the readcap info_link = "%s?t=info" % urllib.quote(name) - ctx.fillSlots("info", T.a(href=info_link)["More Info"]) + if info_link: + ctx.fillSlots("info", T.a(href=info_link)["More Info"]) return ctx.tag hunk ./src/allmydata/web/filenode.py 15 from allmydata.mutable.publish import MutableFileHandle from allmydata.mutable.common import MODE_READ from allmydata.util import log, base32 +from allmydata.util.encodingutil import quote_output +from allmydata.blacklist import FileProhibited, ProhibitedNode from allmydata.web.common import text_plain, WebError, RenderMixin, \ boolean_of_arg, get_arg, should_create_intermediate_directories, \ hunk ./src/allmydata/web/filenode.py 157 def childFactory(self, ctx, name): req = IRequest(ctx) + if isinstance(self.node, ProhibitedNode): + raise FileProhibited(self.node.reason) if should_create_intermediate_directories(req): hunk ./src/allmydata/web/filenode.py 160 - raise WebError("Cannot create directory '%s', because its " - "parent is a file, not a directory" % name) - raise WebError("Files have no children, certainly not named '%s'" - % name) + raise WebError("Cannot create directory %s, because its " + "parent is a file, not a directory" % quote_output(name, encoding='utf-8')) + raise WebError("Files have no children, certainly not named %s" + % quote_output(name, encoding='utf-8')) def render_GET(self, ctx): req = IRequest(ctx) hunk ./src/allmydata/webish.py 132 name = "webish" def __init__(self, client, webport, nodeurl_path=None, staticdir=None, - clock=None): + clock=None): service.MultiService.__init__(self) # the 'data' argument to all render() methods default to the Client # the 'clock' argument to root.Root is, if set, a } Context: [mutable/layout.py: fix unused import. refs #393 david-sarah@jacaranda.org**20110816225043 Ignore-this: 7c9d6d91521ceb9a7abd14b2c60c0604 ] [mutable/retrieve.py: cosmetics and remove a stale comment. refs #393 david-sarah@jacaranda.org**20110816214612 Ignore-this: 916e60c9dff1ef85595822e609ff34b7 ] [mutable/filenode.py: don't fetch more segments than necesasry to update the file Kevan Carstensen **20110813210005 Ignore-this: 2b0ad0533baa6f19f18851317dfc9f15 ] [test/test_mutable: test for incorrect div_ceil equations Kevan Carstensen **20110813183936 Ignore-this: 74e6061ab2ec5e706a1235611f87d5d6 ] [mutable/retrieve.py: use floor division to calculate segment boundaries, don't fetch more segments than necessary Kevan Carstensen **20110813183833 Ignore-this: 3e272249107afd3fbc1dd30c6a4f1e31 ] [mdmf: clean up boolean expressions, correct typos, remove self._paused, and don't unconditionally initialize block hash trees, asll as suggested by davidsarahs' review comments Kevan Carstensen **20110813183710 Ignore-this: cc6ad9f98b64f379151aa58b77b6c4e5 ] [now that tests pass with full-size keys, return test-keys to normal (522bit) warner@lothar.com**20110811175418 Ignore-this: dbce8a6699ba9a90d91cffbc8aa87900 ] [fix SHARE_HASH_CHAIN_SIZE computation warner@lothar.com**20110811175350 Ignore-this: 4508359d2207c8c1b7552b546697264 ] [More idiomatic resolution of the conflict between ticket393-MDMF-2 and trunk. refs #393 david-sarah@jacaranda.org**20110810202942 Ignore-this: 7fc54a30ab0bc6ce75b7d819800c1182 ] [Replace the hard-coded 522-bit RSA key size used for tests with a TEST_RSA_KEY_SIZE constant defined in test/common.py (part 2). refs #393 david-sarah@jacaranda.org**20110810202310 Ignore-this: 7fbd4d004279599bbcb10f7b31fb010f ] [Replace the hard-coded 522-bit RSA key size used for tests with a TEST_RSA_KEY_SIZE constant defined in test/common.py (part 1). refs #393 david-sarah@jacaranda.org**20110810202243 Ignore-this: c58d8130a2f383ff4421c632499b027b ] [merge some minor conflicts in test code from the 393-2 branch and trunk zooko@zooko.com**20110810172139 Ignore-this: 4a16f13eeae585c7c1dbe18c67072c90 ] [doc: eliminate the phrase "rootcap" from doc/frontends/FTP-and-SFTP.rst zooko@zooko.com**20110809132601 Ignore-this: f7e1dd212daa65c81fb57977bce24304 Two different people have asked me for help, saying they couldn't figure out what a "rootcap" is. Hopefully just calling it a "cap" will make it easier for them to find out from the other docs what it is. ] [test_web.py: fix a test failure dependent on whether simplejson.loads returns a unicode or str object. david-sarah@jacaranda.org**20110808213925 Ignore-this: f7b267be8be56fcabc968e3c89999490 ] [immutable/filenode: fix pyflakes warnings Kevan Carstensen **20110807004514 Ignore-this: e8d875bf8b1c5571e31b0eff42ecf64c ] [test: fix assorted tests broken by MDMF changes Kevan Carstensen **20110807004459 Ignore-this: 9a0dc7e5c74bfe840a9fce278619a103 ] [uri: add MDMF and MDMF directory caps, add extension hint support Kevan Carstensen **20110807004436 Ignore-this: 6486b7d4dc0e849c6b1e9cdfb6318eac ] [test/test_mutable: tests for MDMF Kevan Carstensen **20110807004414 Ignore-this: 29f9c3a806d67df0ed09c4f0d857d347 These are their own patch because they cut across a lot of the changes I've made in implementing MDMF in such a way as to make it difficult to split them up into the other patches. ] [webapi changes for MDMF Kevan Carstensen **20110807004348 Ignore-this: d6d4dac680baa4c99b05882b3828796c - Learn how to create MDMF files and directories through the mutable-type argument. - Operate with the interface changes associated with MDMF and #993. - Learn how to do partial updates of mutable files. ] [mutable/servermap: Rework the servermap to work with MDMF mutable files Kevan Carstensen **20110807004259 Ignore-this: 154b987fa0af716c41185b88ff7ee2e1 ] [dirnode: teach dirnode to make MDMF directories Kevan Carstensen **20110807004224 Ignore-this: 765ccd6a07ff752bf6057a3dab9e5abd ] [Fix some test failures caused by #393 patch. david-sarah@jacaranda.org**20110802032810 Ignore-this: 7f65e5adb5c859af289cea7011216fef ] [docs: amend configuration, webapi documentation to talk about MDMF Kevan Carstensen **20110802022056 Ignore-this: 4cab9b7e4ab79cc1efdabe2d457f27a6 ] [cli: teach CLI how to create MDMF mutable files Kevan Carstensen **20110802021613 Ignore-this: 18d0ff98e75be231eed3c53319e76936 Specifically, 'tahoe mkdir' and 'tahoe put' now take a --mutable-type argument. ] [frontends/sftpd: Resolve incompatibilities between SFTP frontend and MDMF changes Kevan Carstensen **20110802021207 Ignore-this: 5e0f6e961048f71d4eed6d30210ffd2e ] [mutable/layout: Define MDMF share format, write tools for working with MDMF share format Kevan Carstensen **20110802021120 Ignore-this: fa76ef4800939e19ba3cbc22a2eab4e The changes in layout.py are mostly concerned with the MDMF share format. In particular, we define read and write proxy objects used by retrieval, publishing, and other code to write and read the MDMF share format. We create equivalent proxies for SDMF objects so that these objects can be suitably general. ] [immutable/filenode: implement unified filenode interface Kevan Carstensen **20110802020905 Ignore-this: d9a442fc285157f134f5d1b4607c6a48 ] [immutable/literal.py: Implement interface changes in literal nodes. Kevan Carstensen **20110802020814 Ignore-this: 4371e71a50e65ce2607c4d67d3a32171 ] [test/common: Alter common test code to work with MDMF. Kevan Carstensen **20110802015643 Ignore-this: e564403182d0030439b168dd9f8726fa This mostly has to do with making the test code implement the new unified filenode interfaces. ] [mutable: train checker and repairer to work with MDMF mutable files Kevan Carstensen **20110802015140 Ignore-this: 8b1928925bed63708b71ab0de8d4306f ] [nodemaker: teach nodemaker about MDMF caps Kevan Carstensen **20110802014926 Ignore-this: 430c73121b6883b99626cfd652fc65c4 ] [client: teach client how to create and work with MDMF files Kevan Carstensen **20110802014811 Ignore-this: d72fbc4c2ca63f00d9ab9dc2919098ff ] [mutable/filenode: Modify mutable filenodes for use with MDMF Kevan Carstensen **20110802014501 Ignore-this: 3c230bb0ebe60a94c667b0ee0c3b28e0 In particular: - Break MutableFileNode and MutableFileVersion into distinct classes. - Implement the interface modifications made for MDMF. - Be aware of MDMF caps. - Learn how to create and work with MDMF files. ] [nodemaker: teach nodemaker how to create MDMF mutable files Kevan Carstensen **20110802014258 Ignore-this: 2bf1fd4f8c1d1ad0e855c678347b76c2 ] [interfaces: change interfaces to work with MDMF Kevan Carstensen **20110802014119 Ignore-this: 2f441022cf888c044bc9e6dd609db139 A lot of this work concerns #993, in that it unifies (to an extent) the interfaces of mutable and immutable files. ] [mutable/publish: teach the publisher how to publish MDMF mutable files Kevan Carstensen **20110802013931 Ignore-this: 115217ec2b289452ec774cb725da8a86 Like the downloader, the publisher needs some substantial changes to handle multiple segment mutable files. ] [mutable/retrieve: rework the mutable downloader to handle multiple-segment files Kevan Carstensen **20110802013524 Ignore-this: 398d11b5cb993b50e5e4fa6e7a3856dc The downloader needs substantial reworking to handle multiple segment mutable files, which it needs to handle for MDMF. ] [Fix repeated 'the' in license text. david-sarah@jacaranda.org**20110819204836 Ignore-this: b3bd4e9ec22029fe15533ad2a60003ad ] [Remove Non-Profit Open Software License from the set of 'added permission' licenses. Although it actually does qualify as an Open Source license (because it allows relicensing under plain OSL), its wording is unclear and could easily be misunderstood, and it contributes to incompatible license proliferation. david-sarah@jacaranda.org**20110819204742 Ignore-this: 7373819a6b5367581356728ea62cabb1 ] [docs: change links that pointed to COPYING.TGPPL.html to point to COPYING.TGPPL.rst instead zooko@zooko.com**20110819060142 Ignore-this: 301652554fd7ab4bfa5aa8f8a2863a9e ] [docs: formatting: reflow to fill-column 77 zooko@zooko.com**20110819060110 Ignore-this: ed1317c126f07c63b944bd2fa6aa2d21 ] [docs: formatting: M-x whitespace-cleanup zooko@zooko.com**20110819060041 Ignore-this: 8554b16a25067094d0dc4dc71e1b3950 ] [licensing: add to the list of licenses that we grant the added permission for zooko@zooko.com**20110819054656 Ignore-this: eb1490416ac6b7414a27f150a8a8a047 Added: most of the ones listed on the FSF's "List of Free Software, GPL Incompatible Licenses", plus the Non-Profit Open Software License. ] [docs: reflow the added text at the top of COPYING.GPL to fill-column 77 zooko@zooko.com**20110819053059 Ignore-this: e994ed6ffbcc12656406f11cb862ce99 ] [docs: reformat COPYING.TGPPL.html to COPYING.TGPPL.rst zooko@zooko.com**20110819052753 Ignore-this: 34ddf623e0a6de008ba859ca9c92b2fd ] [docs: reflow docs/logging.rst to fill-column 77 zooko@zooko.com**20110819044103 Ignore-this: a6901f2244995f278ddf8d75d29410bf ] [doc: fix formatting error in docs/logging.rst zooko@zooko.com**20110819043946 Ignore-this: fa182dbbe7f4fda15e0a8bfcf7f00051 ] [Cleanups for suppression of UserWarnings. refs #1435 david-sarah@jacaranda.org**20110818040749 Ignore-this: 3863ef399c1c382a1365d51f000d314c ] [suppress warning emitted by newer zope.interface with Nevow 0.10 zooko@zooko.com**20110817203134 Ignore-this: b86d4ce0ed1c0da76d1f9eaf8d08d9c4 refs #1435 ] [doc: formatting: reflow to fill-column=77 zooko@zooko.com**20110809132510 Ignore-this: 2d6d2e203d52925968b4451f36364792 ] [allmydata/__init__.py, test_version.py: make version parsing understand '<=', with test. refs #1435 david-sarah@jacaranda.org**20110815035153 Ignore-this: 8c3a75f4a2b42b56bac48b5053c5e9c2 ] [_auto_deps.py: change the requirement for zope.interface to <= 3.6.2, >= 3.6.6. fixes #1435 david-sarah@jacaranda.org**20110815025347 Ignore-this: 17a88c0f6573f044fbcd6b666667bd37 ] [Makefile and setup.py: remove setup.py commands that we no longer need, and their uses in the Makefile. Delete a stale and incorrect comment about updating _version.py. Also fix some coding style checks in the Makefile to operate on all source files. david-sarah@jacaranda.org**20110801031952 Ignore-this: 80a435dee3bc6e29058d4b37ff579922 ] [remove misc/debian[_helpers], rely upon official packaging instead. fixes #1454 warner@lothar.com**20110811182705 Ignore-this: 79673cafc7c108db49b5ab908d7b4668 ] [Makefile: remove targets that used misc/debian[_helpers] which no longer exist. Also change docs/debian.rst to reflect the fact that we no longer support building .debs using those targets. refs #1454 david-sarah@jacaranda.org**20110801031857 Ignore-this: 347cbeff45757db630ce34d0cfb84f92 ] [replace tabs with spaces in the #1441 'tahoe debug' synopsis warner@lothar.com**20110811173704 Ignore-this: 513fbfb18a3dd93119ea3700118df7ee ] [Correct the information printed by '/usr/bin/tahoe debug --help' on Debian/Ubuntu. fixes #1441 david-sarah@jacaranda.org**20110724162530 Ignore-this: 30d4b8c20e420e9a9d1b73eba1113ae ] [doc: edit the explanation of K-of-N tradeoffs zooko@zooko.com**20110804193409 Ignore-this: ab6f4e35a995c2099340b5c9c5d30f40 ] [doc: clean up formatting of doc/configuration.rst zooko@zooko.com**20110804192722 Ignore-this: 7a98a3a8afb7e5441ff1f534211199ba reflow to 77 chars line width, M-x white-space cleanup, blank link between name and definition ] [Add test for webopen. fixes #1149 david-sarah@jacaranda.org**20110724211659 Ignore-this: 1e22853f7eb05e24c3141d56a513f661 ] [test_client.py: relax a check in test_create_drop_uploader so that it should pass on Python 2.4.x. refs #1429 david-sarah@jacaranda.org**20110810052504 Ignore-this: 1380749ceaf33c30e26c50d57476616c ] [test/common_util.py: correct fix to mkdir_nonascii. refs #1472 david-sarah@jacaranda.org**20110810051906 Ignore-this: 93c0c33370bc47d95c26c4cce8e05290 ] [test/common_util.py: fix a typo. refs #1472 david-sarah@jacaranda.org**20110810044235 Ignore-this: f88643d7c82cb3577686d77bbff9e2bc ] [test_client.py, test_drop_upload.py: fix pyflakes warnings. david-sarah@jacaranda.org**20110810034505 Ignore-this: 1e2d71bf2f43d63cbb423d32a6f96793 ] [Factor out methods dealing with non-ASCII directories and filenames from test_drop_upload.py into common_util.py. refs #1429, #1472 david-sarah@jacaranda.org**20110810031558 Ignore-this: 3de8f945fa7a58fc318a1184bad0fd1a ] [test_client.py: add a test that the drop-uploader is initialized correctly by client.py. Also give the DropUploader service a name, which is necessary for the test. refs #1429 david-sarah@jacaranda.org**20110810030538 Ignore-this: 13d511ea9bbe9da2dcffe4a91ce94eae ] [drop-upload: rename 'start' method to 'startService', which is what you're supposed to use to start a Service. refs #1429 david-sarah@jacaranda.org**20110810030345 Ignore-this: d1f5e5c63937ea37be37324e2f1ae99d ] [test_drop_upload.py: add comment explaining why we don't use FilePath.setContent. refs #1429 david-sarah@jacaranda.org**20110810025942 Ignore-this: b95358030b63cb467d1d7f1b9a9b6978 ] [test_drop_upload.py: fix some grammatical and spelling nits. refs #1429 david-sarah@jacaranda.org**20110809221231 Ignore-this: fd331acddd9f754173f274a34fe62f03 ] [drop-upload: report the configured local directory being absent differently from it being a file zooko@zooko.com**20110809220930 Ignore-this: a08879100f5f20e609be3f0ffa3b25cc refs #1429 ] [drop-upload: rename the 'upload.uri' parameter to 'upload.dircap', and a couple of cleanups to error messages. refs #1429 zooko@zooko.com**20110809220508 Ignore-this: 4846368cbe331e8653bdce1f314e276b I rerecorded this patch, originally by David-Sarah, to use "darcs replace" instead of editing to do the renames. This uncovered one missed rename in Client.init_drop_uploader. (Which also means that code isn't exercised by the current unit tests.) refs #1429 ] [drop-upload test for non-existent local dir separately from test for non-directory local dir zooko@zooko.com**20110809220115 Ignore-this: cd85f345c02f5cb71b1c1527bd4ebddc A candidate patch for #1429 has a bug when it is using FilePath.is_dir() to detect whether the configured local dir exists and is a directory. FilePath.is_dir() raises exception, instead of returning False, if the thing doesn't exist. This test is to make sure that DropUploader.__init__ raise different exceptions for those two cases. refs #1429 ] [drop-upload: unit tests for the configuration options being named "cap" instead of "uri" zooko@zooko.com**20110809215913 Ignore-this: 958c78fffb3d76b3e4817647f824e7f9 This is a subset of a patch that David-Sarah attached to #1429. This is just the unit-tests part of that patch, and uses darcs record instead of hunks to change the names. refs #1429 ] [src/allmydata/storage/server.py: use the filesystem of storage/shares/, rather than storage/, to calculate remaining space. fixes #1384 david-sarah@jacaranda.org**20110719022752 Ignore-this: a4781043cfd453dbb66ae4f108d80bea ] [test_storage.py: test that we are using the filesystem of storage/shares/, rather than storage/, to calculate remaining space, and that the HTML status output reflects the values returned by fileutil.get_disk_stats. This version works with older versions of the mock library. refs #1384 david-sarah@jacaranda.org**20110809190722 Ignore-this: db447caca37a459ca49563efa58db58c ] [Work around ref #1472 by having test_drop_upload delete the non-ASCII directories it creates. david-sarah@jacaranda.org**20110809012334 Ignore-this: 5881fd5db419ba8ad12e0b2a82f6c4f0 ] [Remove all trailing whitespace from .py files. david-sarah@jacaranda.org**20110809001117 Ignore-this: d2658b5ce44af70cc606ae4d3085b7cc ] [test_drop_upload.py: fix unused imports. refs #1429 david-sarah@jacaranda.org**20110808235422 Ignore-this: 834f6b946bfea699d7d8c743edd66671 ] [Documentation for drop-upload frontend. refs #1429 david-sarah@jacaranda.org**20110808182146 Ignore-this: b33110834e586c0b784d1736c2af5779 ] [Drop-upload frontend, rerecorded for 1.9 beta (and correcting a minor mistake). Includes some fixes for Windows but not the Windows inotify implementation. fixes #1429 david-sarah@jacaranda.org**20110808234049 Ignore-this: 67f824c7f554e9a3a85f9fd2e1123d97 ] [node.py: ensure that client and introducer nodes record their port number and use that port on the next restart, fixing a regression caused by #1385. fixes #1469. david-sarah@jacaranda.org**20110806221934 Ignore-this: 1aa9d340b6570320ab2f9edc89c9e0a8 ] [test_runner.py: fix a race condition in the test when NODE_URL_FILE is written before PORTNUM_FILE. refs #1469 david-sarah@jacaranda.org**20110806231842 Ignore-this: ab01ae7cec3a073e29eec473e64052a0 ] [test_runner.py: cleanups of HOTLINE_FILE writing and removal. david-sarah@jacaranda.org**20110806231652 Ignore-this: 25f5c5d6f5d8faebb26a4ce80110a335 ] [test_runner.py: remove an unused constant. david-sarah@jacaranda.org**20110806221416 Ignore-this: eade2695cbabbea9cafeaa8debe410bb ] [node.py: fix the error path for a missing config option so that it works for a Unicode base directory. david-sarah@jacaranda.org**20110806221007 Ignore-this: 4eb9cc04b2ce05182a274a0d69dafaf3 ] [test_runner.py: test that client and introducer nodes record their port number and use that port on the next restart. This tests for a regression caused by ref #1385. david-sarah@jacaranda.org**20110806220635 Ignore-this: 40a0c040b142dbddd47e69b3c3712f5 ] [test_runner.py: fix a bug in CreateNode.do_create introduced in changeset [5114] when the tahoe.cfg file has been written with CRLF line endings. refs #1385 david-sarah@jacaranda.org**20110804003032 Ignore-this: 7b7afdcf99da6671afac2d42828883eb ] [test_client.py: repair Basic.test_error_on_old_config_files. refs #1385 david-sarah@jacaranda.org**20110803235036 Ignore-this: 31e2a9c3febe55948de7e144353663e ] [test_checker.py: increase timeout for TooParallel.test_immutable again. The ARM buildslave took 38 seconds, so 40 seconds is too close to the edge; make it 80. david-sarah@jacaranda.org**20110803214042 Ignore-this: 2d8026a6b25534e01738f78d6c7495cb ] [test_runner.py: fix RunNode.test_introducer to not rely on the mtime of introducer.furl to detect when the node has restarted. Instead we detect when node.url has been written. refs #1385 david-sarah@jacaranda.org**20110803180917 Ignore-this: 11ddc43b107beca42cb78af88c5c394c ] [Further improve error message about old config files. refs #1385 david-sarah@jacaranda.org**20110803174546 Ignore-this: 9d6cc3c288d9863dce58faafb3855917 ] [Slightly improve error message about old config files (avoid unnecessary Unicode escaping). refs #1385 david-sarah@jacaranda.org**20110803163848 Ignore-this: a3e3930fba7ccf90b8db3d2ed5829df4 ] [test_checker.py: increase timeout for TooParallel.test_immutable (was consistently failing on ARM buildslave). david-sarah@jacaranda.org**20110803163213 Ignore-this: d0efceaf12628e8791862b80c85b5d56 ] [Fix the bug that prevents an introducer from starting when introducer.furl already exists. Also remove some dead code that used to read old config files, and rename 'warn_about_old_config_files' to reflect that it's not a warning. refs #1385 david-sarah@jacaranda.org**20110803013212 Ignore-this: 2d6cd14bd06a7493b26f2027aff78f4d ] [test_runner.py: modify RunNode.test_introducer to test that starting an introducer works when the introducer.furl file already exists. refs #1385 david-sarah@jacaranda.org**20110803012704 Ignore-this: 8cf7f27ac4bfbb5ad8ca4a974106d437 ] [verifier: correct a bug introduced in changeset [5106] that caused us to only verify the first block of a file. refs #1395 david-sarah@jacaranda.org**20110802172437 Ignore-this: 87fb77854a839ff217dce73544775b11 ] [test_repairer: add a deterministic test of share data corruption that always flips the bits of the last byte of the share data. refs #1395 david-sarah@jacaranda.org**20110802175841 Ignore-this: 72f54603785007e88220c8d979e08be7 ] [verifier: serialize the fetching of blocks within a share so that we don't use too much RAM zooko@zooko.com**20110802063703 Ignore-this: debd9bac07dcbb6803f835a9e2eabaa1 Shares are still verified in parallel, but within a share, don't request a block until the previous block has been verified and the memory we used to hold it has been freed up. Patch originally due to Brian. This version has a mockery-patchery-style test which is "low tech" (it implements the patching inline in the test code instead of using an extension of the mock.patch() function from the mock library) and which unpatches in case of exception. fixes #1395 ] [add docs about timing-channel attacks Brian Warner **20110802044541 Ignore-this: 73114d5f5ed9ce252597b707dba3a194 ] ['test-coverage' now needs PYTHONPATH=. to find TOP/twisted/plugins/ Brian Warner **20110802041952 Ignore-this: d40f1f4cb426ea1c362fc961baedde2 ] [remove nodeid from WriteBucketProxy classes and customers warner@lothar.com**20110801224317 Ignore-this: e55334bb0095de11711eeb3af827e8e8 refs #1363 ] [remove get_serverid() from ReadBucketProxy and customers, including Checker warner@lothar.com**20110801224307 Ignore-this: 837aba457bc853e4fd413ab1a94519cb and debug.py dump-share commands refs #1363 ] [reject old-style (pre-Tahoe-LAFS-v1.3) configuration files zooko@zooko.com**20110801232423 Ignore-this: b58218fcc064cc75ad8f05ed0c38902b Check for the existence of any of them and if any are found raise exception which will abort the startup of the node. This is a backwards-incompatible change for anyone who is still using old-style configuration files. fixes #1385 ] [whitespace-cleanup zooko@zooko.com**20110725015546 Ignore-this: 442970d0545183b97adc7bd66657876c ] [tests: use fileutil.write() instead of open() to ensure timely close even without CPython-style reference counting zooko@zooko.com**20110331145427 Ignore-this: 75aae4ab8e5fa0ad698f998aaa1888ce Some of these already had an explicit close() but I went ahead and replaced them with fileutil.write() as well for the sake of uniformity. ] [Address Kevan's comment in #776 about Options classes missed when adding 'self.command_name'. refs #776, #1359 david-sarah@jacaranda.org**20110801221317 Ignore-this: 8881d42cf7e6a1d15468291b0cb8fab9 ] [docs/frontends/webapi.rst: change some more instances of 'delete' or 'remove' to 'unlink', change some section titles, and use two blank lines between all sections. refs #776, #1104 david-sarah@jacaranda.org**20110801220919 Ignore-this: 572327591137bb05c24c44812d4b163f ] [cleanup: implement rm as a synonym for unlink rather than vice-versa. refs #776 david-sarah@jacaranda.org**20110801220108 Ignore-this: 598dcbed870f4f6bb9df62de9111b343 ] [docs/webapi.rst: address Kevan's comments about use of 'delete' on ref #1104 david-sarah@jacaranda.org**20110801205356 Ignore-this: 4fbf03864934753c951ddeff64392491 ] [docs: some changes of 'delete' or 'rm' to 'unlink'. refs #1104 david-sarah@jacaranda.org**20110713002722 Ignore-this: 304d2a330d5e6e77d5f1feed7814b21c ] [WUI: change the label of the button to unlink a file from 'del' to 'unlink'. Also change some internal names to 'unlink', and allow 't=unlink' as a synonym for 't=delete' in the web-API interface. Incidentally, improve a test to check for the rename button as well as the unlink button. fixes #1104 david-sarah@jacaranda.org**20110713001218 Ignore-this: 3eef6b3f81b94a9c0020a38eb20aa069 ] [src/allmydata/web/filenode.py: delete a stale comment that was made incorrect by changeset [3133]. david-sarah@jacaranda.org**20110801203009 Ignore-this: b3912e95a874647027efdc97822dd10e ] [fix typo introduced during rebasing of 'remove get_serverid from Brian Warner **20110801200341 Ignore-this: 4235b0f585c0533892193941dbbd89a8 DownloadStatus.add_dyhb_request and customers' patch, to fix test failure. ] [remove get_serverid from DownloadStatus.add_dyhb_request and customers zooko@zooko.com**20110801185401 Ignore-this: db188c18566d2d0ab39a80c9dc8f6be6 This patch is a rebase of a patch originally written by Brian. I didn't change any of the intent of Brian's patch, just ported it to current trunk. refs #1363 ] [remove get_serverid from DownloadStatus.add_block_request and customers zooko@zooko.com**20110801185344 Ignore-this: 8bfa8201d6147f69b0fbe31beea9c1e This is a rebase of a patch Brian originally wrote. I haven't changed the intent of that patch, just ported it to trunk. refs #1363 ] [apply zooko's advice: storage_client get_known_servers() returns a frozenset, caller sorts warner@lothar.com**20110801174452 Ignore-this: 2aa13ea6cbed4e9084bd604bf8633692 refs #1363 ] [test_immutable.Test: rewrite to use NoNetworkGrid, now takes 2.7s not 97s warner@lothar.com**20110801174444 Ignore-this: 54f30b5d7461d2b3514e2a0172f3a98c remove now-unused ShareManglingMixin refs #1363 ] [DownloadStatus.add_known_share wants to be used by Finder, web.status warner@lothar.com**20110801174436 Ignore-this: 1433bcd73099a579abe449f697f35f9 refs #1363 ] [replace IServer.name() with get_name(), and get_longname() warner@lothar.com**20110801174428 Ignore-this: e5a6f7f6687fd7732ddf41cfdd7c491b This patch was originally written by Brian, but was re-recorded by Zooko to use darcs replace instead of hunks for any file in which it would result in fewer total hunks. refs #1363 ] [upload.py: apply David-Sarah's advice rename (un)contacted(2) trackers to first_pass/second_pass/next_pass zooko@zooko.com**20110801174143 Ignore-this: e36e1420bba0620a0107bd90032a5198 This patch was written by Brian but was re-recorded by Zooko (with David-Sarah looking on) to use darcs replace instead of editing to rename the three variables to their new names. refs #1363 ] [Coalesce multiple Share.loop() calls, make downloads faster. Closes #1268. Brian Warner **20110801151834 Ignore-this: 48530fce36c01c0ff708f61c2de7e67a ] [src/allmydata/_auto_deps.py: 'i686' is another way of spelling x86. david-sarah@jacaranda.org**20110801034035 Ignore-this: 6971e0621db2fba794d86395b4d51038 ] [tahoe_rm.py: better error message when there is no path. refs #1292 david-sarah@jacaranda.org**20110122064212 Ignore-this: ff3bb2c9f376250e5fd77eb009e09018 ] [test_cli.py: Test for error message when 'tahoe rm' is invoked without a path. refs #1292 david-sarah@jacaranda.org**20110104105108 Ignore-this: 29ec2f2e0251e446db96db002ad5dd7d ] [src/allmydata/__init__.py: suppress a spurious warning from 'bin/tahoe --version[-and-path]' about twisted-web and twisted-core packages. david-sarah@jacaranda.org**20110801005209 Ignore-this: 50e7cd53cca57b1870d9df0361c7c709 ] [test_cli.py: use to_str on fields loaded using simplejson.loads in new tests. refs #1304 david-sarah@jacaranda.org**20110730032521 Ignore-this: d1d6dfaefd1b4e733181bf127c79c00b ] [cli: make 'tahoe cp' overwrite mutable files in-place Kevan Carstensen **20110729202039 Ignore-this: b2ad21a19439722f05c49bfd35b01855 ] [SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. Also change the lines of the error messages to end in CRLF, and take into account Kevan's review comments. fixes #1442, #1446 david-sarah@jacaranda.org**20110729233102 Ignore-this: d2f2bb4664f25007d1602bf7333e2cdd ] [src/allmydata/scripts/cli.py: fix pyflakes warning. david-sarah@jacaranda.org**20110728021402 Ignore-this: 94050140ddb99865295973f49927c509 ] [Fix the help synopses of CLI commands to include [options] in the right place. fixes #1359, fixes #636 david-sarah@jacaranda.org**20110724225440 Ignore-this: 2a8e488a5f63dabfa9db9efd83768a5 ] [encodingutil: argv and output encodings are always the same on all platforms. Lose the unnecessary generality of them being different. fixes #1120 david-sarah@jacaranda.org**20110629185356 Ignore-this: 5ebacbe6903dfa83ffd3ff8436a97787 ] [docs/man/tahoe.1: add man page. fixes #1420 david-sarah@jacaranda.org**20110724171728 Ignore-this: fc7601ec7f25494288d6141d0ae0004c ] [Update the dependency on zope.interface to fix an incompatiblity between Nevow and zope.interface 3.6.4. fixes #1435 david-sarah@jacaranda.org**20110721234941 Ignore-this: 2ff3fcfc030fca1a4d4c7f1fed0f2aa9 ] [frontends/ftpd.py: remove the check for IWriteFile.close since we're now guaranteed to be using Twisted >= 10.1 which has it. david-sarah@jacaranda.org**20110722000320 Ignore-this: 55cd558b791526113db3f83c00ec328a ] [Update the dependency on Twisted to >= 10.1. This allows us to simplify some documentation: it's no longer necessary to install pywin32 on Windows, or apply a patch to Twisted in order to use the FTP frontend. fixes #1274, #1438. refs #1429 david-sarah@jacaranda.org**20110721233658 Ignore-this: 81b41745477163c9b39c0b59db91cc62 ] [misc/build_helpers/run_trial.py: undo change to block pywin32 (it didn't work because run_trial.py is no longer used). refs #1334 david-sarah@jacaranda.org**20110722035402 Ignore-this: 5d03f544c4154f088e26c7107494bf39 ] [misc/build_helpers/run_trial.py: ensure that pywin32 is not on the sys.path when running the test suite. Includes some temporary debugging printouts that will be removed. refs #1334 david-sarah@jacaranda.org**20110722024907 Ignore-this: 5141a9f83a4085ed4ca21f0bbb20bb9c ] [docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start'). david-sarah@jacaranda.org**20110718005949 Ignore-this: 81837fbce073e93d88a3e7ae3122458c ] [docs/running.rst: say to put the introducer.furl in tahoe.cfg. david-sarah@jacaranda.org**20110717194315 Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3 ] [README.txt: say that quickstart.rst is in the docs directory. david-sarah@jacaranda.org**20110717192400 Ignore-this: bc6d35a85c496b77dbef7570677ea42a ] [setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL zooko@zooko.com**20110717114226 Ignore-this: df222120d41447ce4102616921626c82 fixes #1383 ] [test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual. david-sarah@jacaranda.org**20110716181813 Ignore-this: 50113380b368c573f07ac6fe2eb1e97f ] [docs: add missing link in NEWS.rst zooko@zooko.com**20110712153307 Ignore-this: be7b7eb81c03700b739daa1027d72b35 ] [contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty zooko@zooko.com**20110712153229 Ignore-this: 723c4f9e2211027c79d711715d972c5 Also remove a couple of vestigial references to figleaf, which is long gone. fixes #1409 (remove contrib/fuse) ] [add Protovis.js-based download-status timeline visualization Brian Warner **20110629222606 Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127 provide status overlap info on the webapi t=json output, add decode/decrypt rate tooltips, add zoomin/zoomout buttons ] [add more download-status data, fix tests Brian Warner **20110629222555 Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c ] [prepare for viz: improve DownloadStatus events Brian Warner **20110629222542 Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode ] [docs: fix error in crypto specification that was noticed by Taylor R Campbell zooko@zooko.com**20110629185711 Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67 ] [setup.py: don't make bin/tahoe.pyscript executable. fixes #1347 david-sarah@jacaranda.org**20110130235809 Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a ] [Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345 david-sarah@jacaranda.org**20110626054124 Ignore-this: abb864427a1b91bd10d5132b4589fd90 ] [Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344 david-sarah@jacaranda.org**20110623205528 Ignore-this: c63e23146c39195de52fb17c7c49b2da ] [Rename test_package_initialization.py to (much shorter) test_import.py . Brian Warner **20110611190234 Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822 The former name was making my 'ls' listings hard to read, by forcing them down to just two columns. ] [tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430] zooko@zooko.com**20110611163741 Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1 Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20. fixes #1412 ] [wui: right-align the size column in the WUI zooko@zooko.com**20110611153758 Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7 Thanks to Ted "stercor" Rolle Jr. and Terrell Russell. fixes #1412 ] [docs: three minor fixes zooko@zooko.com**20110610121656 Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2 CREDITS for arc for stats tweak fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing) English usage tweak ] [docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne. david-sarah@jacaranda.org**20110609223719 Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a ] [server.py: get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous. wilcoxjg@gmail.com**20110527120135 Ignore-this: 2e7029764bffc60e26f471d7c2b6611e interfaces.py: modified the return type of RIStatsProvider.get_stats to allow for None as a return value NEWS.rst, stats.py: documentation of change to get_latencies stats.rst: now documents percentile modification in get_latencies test_storage.py: test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported. fixes #1392 ] [docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000. david-sarah@jacaranda.org**20110517011214 Ignore-this: 6a5be6e70241e3ec0575641f64343df7 ] [docs: convert NEWS to NEWS.rst and change all references to it. david-sarah@jacaranda.org**20110517010255 Ignore-this: a820b93ea10577c77e9c8206dbfe770d ] [docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404 david-sarah@jacaranda.org**20110512140559 Ignore-this: 784548fc5367fac5450df1c46890876d ] [scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342 david-sarah@jacaranda.org**20110130164923 Ignore-this: a271e77ce81d84bb4c43645b891d92eb ] [setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError zooko@zooko.com**20110128142006 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement(). ] [M-x whitespace-cleanup zooko@zooko.com**20110510193653 Ignore-this: dea02f831298c0f65ad096960e7df5c7 ] [docs: fix typo in running.rst, thanks to arch_o_median zooko@zooko.com**20110510193633 Ignore-this: ca06de166a46abbc61140513918e79e8 ] [relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342 david-sarah@jacaranda.org**20110204204902 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b ] [relnotes.txt: forseeable -> foreseeable. refs #1342 david-sarah@jacaranda.org**20110204204116 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9 ] [replace remaining .html docs with .rst docs zooko@zooko.com**20110510191650 Ignore-this: d557d960a986d4ac8216d1677d236399 Remove install.html (long since deprecated). Also replace some obsolete references to install.html with references to quickstart.rst. Fix some broken internal references within docs/historical/historical_known_issues.txt. Thanks to Ravi Pinjala and Patrick McDonald. refs #1227 ] [docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297 zooko@zooko.com**20110428055232 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39 ] [munin tahoe_files plugin: fix incorrect file count francois@ctrlaltdel.ch**20110428055312 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34 fixes #1391 ] [corrected "k must never be smaller than N" to "k must never be greater than N" secorp@allmydata.org**20110425010308 Ignore-this: 233129505d6c70860087f22541805eac ] [Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389 david-sarah@jacaranda.org**20110411190738 Ignore-this: 7847d26bc117c328c679f08a7baee519 ] [tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389 david-sarah@jacaranda.org**20110410155844 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa ] [allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389 david-sarah@jacaranda.org**20110410155705 Ignore-this: 2f87b8b327906cf8bfca9440a0904900 ] [remove unused variable detected by pyflakes zooko@zooko.com**20110407172231 Ignore-this: 7344652d5e0720af822070d91f03daf9 ] [allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388 david-sarah@jacaranda.org**20110401202750 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f ] [update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1 Brian Warner **20110325232511 Ignore-this: d5307faa6900f143193bfbe14e0f01a ] [control.py: remove all uses of s.get_serverid() warner@lothar.com**20110227011203 Ignore-this: f80a787953bd7fa3d40e828bde00e855 ] [web: remove some uses of s.get_serverid(), not all warner@lothar.com**20110227011159 Ignore-this: a9347d9cf6436537a47edc6efde9f8be ] [immutable/downloader/fetcher.py: remove all get_serverid() calls warner@lothar.com**20110227011156 Ignore-this: fb5ef018ade1749348b546ec24f7f09a ] [immutable/downloader/fetcher.py: fix diversity bug in server-response handling warner@lothar.com**20110227011153 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the _shares_from_server dict was being popped incorrectly (using shnum as the index instead of serverid). I'm still thinking through the consequences of this bug. It was probably benign and really hard to detect. I think it would cause us to incorrectly believe that we're pulling too many shares from a server, and thus prefer a different server rather than asking for a second share from the first server. The diversity code is intended to spread out the number of shares simultaneously being requested from each server, but with this bug, it might be spreading out the total number of shares requested at all, not just simultaneously. (note that SegmentFetcher is scoped to a single segment, so the effect doesn't last very long). ] [immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps warner@lothar.com**20110227011150 Ignore-this: d8d56dd8e7b280792b40105e13664554 test_download.py: create+check MyShare instances better, make sure they share Server objects, now that finder.py cares ] [immutable/downloader/finder.py: reduce use of get_serverid(), one left warner@lothar.com**20110227011146 Ignore-this: 5785be173b491ae8a78faf5142892020 ] [immutable/offloaded.py: reduce use of get_serverid() a bit more warner@lothar.com**20110227011142 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f ] [immutable/upload.py: reduce use of get_serverid() warner@lothar.com**20110227011138 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6 ] [immutable/checker.py: remove some uses of s.get_serverid(), not all warner@lothar.com**20110227011134 Ignore-this: e480a37efa9e94e8016d826c492f626e ] [add remaining get_* methods to storage_client.Server, NoNetworkServer, and warner@lothar.com**20110227011132 Ignore-this: 6078279ddf42b179996a4b53bee8c421 MockIServer stubs ] [upload.py: rearrange _make_trackers a bit, no behavior changes warner@lothar.com**20110227011128 Ignore-this: 296d4819e2af452b107177aef6ebb40f ] [happinessutil.py: finally rename merge_peers to merge_servers warner@lothar.com**20110227011124 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e ] [test_upload.py: factor out FakeServerTracker warner@lothar.com**20110227011120 Ignore-this: 6c182cba90e908221099472cc159325b ] [test_upload.py: server-vs-tracker cleanup warner@lothar.com**20110227011115 Ignore-this: 2915133be1a3ba456e8603885437e03 ] [happinessutil.py: server-vs-tracker cleanup warner@lothar.com**20110227011111 Ignore-this: b856c84033562d7d718cae7cb01085a9 ] [upload.py: more tracker-vs-server cleanup warner@lothar.com**20110227011107 Ignore-this: bb75ed2afef55e47c085b35def2de315 ] [upload.py: fix var names to avoid confusion between 'trackers' and 'servers' warner@lothar.com**20110227011103 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d ] [refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload warner@lothar.com**20110227011100 Ignore-this: 7ea858755cbe5896ac212a925840fe68 No behavioral changes, just updating variable/method names and log messages. The effects outside these three files should be minimal: some exception messages changed (to say "server" instead of "peer"), and some internal class names were changed. A few things still use "peer" to minimize external changes, like UploadResults.timings["peer_selection"] and happinessutil.merge_peers, which can be changed later. ] [storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers warner@lothar.com**20110227011056 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc ] [test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code warner@lothar.com**20110227011051 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d ] [test: increase timeout on a network test because Francois's ARM machine hit that timeout zooko@zooko.com**20110317165909 Ignore-this: 380c345cdcbd196268ca5b65664ac85b I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish. ] [docs/configuration.rst: add a "Frontend Configuration" section Brian Warner **20110222014323 Ignore-this: 657018aa501fe4f0efef9851628444ca this points to docs/frontends/*.rst, which were previously underlinked ] [web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366 "Brian Warner "**20110221061544 Ignore-this: 799d4de19933f2309b3c0c19a63bb888 ] [Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable. david-sarah@jacaranda.org**20110221015817 Ignore-this: 51d181698f8c20d3aca58b057e9c475a ] [allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355. david-sarah@jacaranda.org**20110221020125 Ignore-this: b0744ed58f161bf188e037bad077fc48 ] [Refactor StorageFarmBroker handling of servers Brian Warner **20110221015804 Ignore-this: 842144ed92f5717699b8f580eab32a51 Pass around IServer instance instead of (peerid, rref) tuple. Replace "descriptor" with "server". Other replacements: get_all_servers -> get_connected_servers/get_known_servers get_servers_for_index -> get_servers_for_psi (now returns IServers) This change still needs to be pushed further down: lots of code is now getting the IServer and then distributing (peerid, rref) internally. Instead, it ought to distribute the IServer internally and delay extracting a serverid or rref until the last moment. no_network.py was updated to retain parallelism. ] [TAG allmydata-tahoe-1.8.2 warner@lothar.com**20110131020101] Patch bundle hash: fb3c7c8bf9e055a670635c4991976239031dea7a