From: Brian Warner <warner@lothar.com>
Date: Tue, 21 Apr 2015 17:48:06 +0000 (-0700)
Subject: remove control-port upload/download file interfaces
X-Git-Tag: allmydata-tahoe-1.10.1a1~38
X-Git-Url: https://git.rkrishnan.org/pf/content/en/?a=commitdiff_plain;h=2eea4e9a078c21e76f9e96e0d64161b37cb2f2e4;p=tahoe-lafs%2Ftahoe-lafs.git

remove control-port upload/download file interfaces

FURLs are unguessable, but an attacker who somehow learned this FURL
could overwrite files and read sensitive data.

This will break the memory tests. I will add a new interface to support
the memory tests soon.

refs ticket:1737
---

diff --git a/src/allmydata/control.py b/src/allmydata/control.py
index 15ab382d..c29d5572 100644
--- a/src/allmydata/control.py
+++ b/src/allmydata/control.py
@@ -60,22 +60,6 @@ class ControlServer(Referenceable, service.Service):
     def remote_wait_for_client_connections(self, num_clients):
         return self.parent.debug_wait_for_client_connections(num_clients)
 
-    def remote_upload_from_file_to_uri(self, filename, convergence):
-        uploader = self.parent.getServiceNamed("uploader")
-        u = upload.FileName(filename, convergence=convergence)
-        d = uploader.upload(u)
-        d.addCallback(lambda results: results.get_uri())
-        return d
-
-    def remote_download_from_uri_to_file(self, uri, filename):
-        filenode = self.parent.create_node_from_uri(uri, name=filename)
-        if not IFileNode.providedBy(filenode):
-            raise AssertionError("The URI does not reference a file.")
-        c = FileWritingConsumer(filename)
-        d = filenode.read(c)
-        d.addCallback(lambda res: filename)
-        return d
-
     def remote_speed_test(self, count, size, mutable):
         assert size > 8
         log.msg("speed_test: count=%d, size=%d, mutable=%s" % (count, size,