From 2bae204d8f5f068ce9344f2814e41e444b64628a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 22 Mar 2021 09:10:23 -0400 Subject: [PATCH 1/3] news fragment --- newsfragments/3644.other | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/3644.other diff --git a/newsfragments/3644.other b/newsfragments/3644.other new file mode 100644 index 000000000..4b159e45d --- /dev/null +++ b/newsfragments/3644.other @@ -0,0 +1 @@ +The "Great Black Swamp" proposed specification has been changed use ``v=1`` as the URL version identifier. \ No newline at end of file From bc868202739da9177980dcdb5e4597e4329b0768 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 22 Mar 2021 09:10:35 -0400 Subject: [PATCH 2/3] Change v=2 to v=1 --- docs/proposed/http-storage-node-protocol.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/proposed/http-storage-node-protocol.rst b/docs/proposed/http-storage-node-protocol.rst index 0478f213e..387298f78 100644 --- a/docs/proposed/http-storage-node-protocol.rst +++ b/docs/proposed/http-storage-node-protocol.rst @@ -101,12 +101,12 @@ Alice generates a key pair and secures it properly. Alice generates a self-signed storage node certificate with the key pair. Alice's storage node announces (to an introducer) a fURL containing (among other information) the SPKI hash. Imagine the SPKI hash is ``i5xb...``. -This results in a fURL of ``pb://i5xb...@example.com:443/g3m5...#v=2`` [#]_. +This results in a fURL of ``pb://i5xb...@example.com:443/g3m5...#v=1``. Bob creates a client node pointed at the same introducer. Bob's client node receives the announcement from Alice's storage node (indirected through the introducer). -Bob's client node recognizes the fURL as referring to an HTTP-dialect server due to the ``v=2`` fragment. +Bob's client node recognizes the fURL as referring to an HTTP-dialect server due to the ``v=1`` fragment. Bob's client node can now perform a TLS handshake with a server at the address in the fURL location hints (``example.com:443`` in this example). Following the above described validation procedures, @@ -156,7 +156,7 @@ Such an announcement will resemble this:: { "anonymous-storage-FURL": "pb://...", # The old key - "gbs-anonymous-storage-url": "pb://...#v=2" # The new key + "gbs-anonymous-storage-url": "pb://...#v=1" # The new key } The transition process will proceed in three stages: @@ -252,7 +252,7 @@ For example:: "delete-mutable-shares-with-zero-length-writev": true, "fills-holes-with-zero-bytes": true, "prevents-read-past-end-of-share-data": true, - "gbs-anonymous-storage-url": "pb://...#v=2" + "gbs-anonymous-storage-url": "pb://...#v=1" }, "application-version": "1.13.0" } From 4a117e5d9b03ce84eff8fbc33c3fc3c182bdd6ab Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 22 Mar 2021 09:25:22 -0400 Subject: [PATCH 3/3] Also get rid of the footnote target --- docs/proposed/http-storage-node-protocol.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/proposed/http-storage-node-protocol.rst b/docs/proposed/http-storage-node-protocol.rst index 387298f78..1bdc774de 100644 --- a/docs/proposed/http-storage-node-protocol.rst +++ b/docs/proposed/http-storage-node-protocol.rst @@ -498,13 +498,6 @@ Just like the immutable version. Note we use `base64url`_ rather than the Foolscap- and Tahoe-LAFS-preferred Base32. -.. [#] - Other schemes for differentiating between the two server types is possible. - If the tubID length remains different, - that provides an unambiguous (if obscure) signal about which protocol to use. - Or a different scheme could be adopted - (``[x-]pb+http``, ``x-tahoe+http``, ``x-gbs`` come to mind). - .. [#] https://www.cvedetails.com/cve/CVE-2017-5638/ .. [#]