From 1c347c593130f606cfdc7d0e2f52a0ec1db5b20a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 15 Oct 2021 15:05:21 -0400 Subject: [PATCH 1/4] replace sensitive introducer fURL with path where it can be found --- src/allmydata/introducer/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/introducer/server.py b/src/allmydata/introducer/server.py index 1e28f511b..aa0ae8336 100644 --- a/src/allmydata/introducer/server.py +++ b/src/allmydata/introducer/server.py @@ -136,7 +136,7 @@ class _IntroducerNode(node.Node): os.rename(old_public_fn, private_fn) furl = self.tub.registerReference(introducerservice, furlFile=private_fn) - self.log(" introducer is at %s" % furl, umid="qF2L9A") + self.log(" introducer can be found in {!r}".format(private_fn), umid="qF2L9A") self.introducer_url = furl # for tests def init_web(self, webport): From f2ef72e935126f55be103ac856836ebf4b2c140e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 18 Oct 2021 08:14:42 -0400 Subject: [PATCH 2/4] newsfragment in temporary location --- newsfragments/LFS-01-001.security | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/LFS-01-001.security diff --git a/newsfragments/LFS-01-001.security b/newsfragments/LFS-01-001.security new file mode 100644 index 000000000..975fd0035 --- /dev/null +++ b/newsfragments/LFS-01-001.security @@ -0,0 +1 @@ +The introducer server no longer writes the sensitive introducer fURL value to its log at startup time. Instead it writes the well-known path of the file from which this value can be read. From a8d3555ebb6eae1d65cf4cfc928357de8d9a2268 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 21 Oct 2021 15:24:53 -0400 Subject: [PATCH 3/4] reference the eventually-public ticket number --- newsfragments/{LFS-01-001.security => 3819.security} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newsfragments/{LFS-01-001.security => 3819.security} (100%) diff --git a/newsfragments/LFS-01-001.security b/newsfragments/3819.security similarity index 100% rename from newsfragments/LFS-01-001.security rename to newsfragments/3819.security From 6c0ca0b88592bffd8954cf06142cd962c1a3c654 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 22 Oct 2021 08:41:09 -0400 Subject: [PATCH 4/4] try making windows let us use longer paths --- src/allmydata/test/test_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/test/test_download.py b/src/allmydata/test/test_download.py index d61942839..8e7aa9d27 100644 --- a/src/allmydata/test/test_download.py +++ b/src/allmydata/test/test_download.py @@ -493,7 +493,7 @@ class DownloadTest(_Base, unittest.TestCase): d.addCallback(_done) return d - def test_simultaneous_onefails_onecancelled(self): + def test_simul_1fail_1cancel(self): # This exercises an mplayer behavior in ticket #1154. I believe that # mplayer made two simultaneous webapi GET requests: first one for an # index region at the end of the (mp3/video) file, then one for the