Merge remote-tracking branch 'origin/master' into 3783-storage-client-http

newsfragments/3938.bugfix

@@ -0,0 +1 @@
+Work with (and require) newer versions of pycddl.

nix/sources.json

@@ -53,10 +53,10 @@
         "homepage": "",
         "owner": "DavHau",
         "repo": "pypi-deps-db",
-        "rev": "76b8f1e44a8ec051b853494bcf3cc8453a294a6a",
-        "sha256": "18fgqyh4z578jjhk26n1xi2cw2l98vrqp962rgz9a6wa5yh1nm4x",
+        "rev": "5fe7d2d1c85cd86d64f4f079eef3f1ff5653bcd6",
+        "sha256": "0pc6mj7rzvmhh303rvj5wf4hrksm4h2rf4fsvqs0ljjdmgxrqm3f",
         "type": "tarball",
-        "url": "https://github.com/DavHau/pypi-deps-db/archive/76b8f1e44a8ec051b853494bcf3cc8453a294a6a.tar.gz",
+        "url": "https://github.com/DavHau/pypi-deps-db/archive/5fe7d2d1c85cd86d64f4f079eef3f1ff5653bcd6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

relnotes.txt

@@ -1,6 +1,6 @@
-ANNOUNCING Tahoe, the Least-Authority File Store, v1.17.1
+ANNOUNCING Tahoe, the Least-Authority File Store, v1.18.0
 
-The Tahoe-LAFS team is pleased to announce version 1.17.1 of
+The Tahoe-LAFS team is pleased to announce version 1.18.0 of
 Tahoe-LAFS, an extremely reliable decentralized storage
 system. Get it with "pip install tahoe-lafs", or download a
 tarball here:
@@ -15,10 +15,12 @@ unique security and fault-tolerance properties:
 
   https://tahoe-lafs.readthedocs.org/en/latest/about.html
 
-The previous stable release of Tahoe-LAFS was v1.17.0, released on
-December 6, 2021.
+The previous stable release of Tahoe-LAFS was v1.17.1, released on
+January 7, 2022.
 
-This release fixes two Python3-releated regressions and 4 minor bugs.
+This release drops support for Python 2 and for Python 3.6 and earlier.
+twistd.pid is no longer used (in favour of one with pid + process creation time).
+A collection of minor bugs and issues were also fixed.
 
 Please see ``NEWS.rst`` [1] for a complete list of changes.
 
@@ -132,24 +134,23 @@ Of Fame" [13].
 
 ACKNOWLEDGEMENTS
 
-This is the nineteenth release of Tahoe-LAFS to be created
-solely as a labor of love by volunteers. Thank you very much
-to the team of "hackers in the public interest" who make
-Tahoe-LAFS possible.
+This is the twentieth release of Tahoe-LAFS to be created solely as a
+labor of love by volunteers. Thank you very much to the team of
+"hackers in the public interest" who make Tahoe-LAFS possible.
 
 meejah
 on behalf of the Tahoe-LAFS team
 
-January 7, 2022
+October 1, 2022
 Planet Earth
 
 
-[1] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.17.1/NEWS.rst
+[1] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.18.0/NEWS.rst
 [2] https://github.com/tahoe-lafs/tahoe-lafs/blob/master/docs/known_issues.rst
 [3] https://tahoe-lafs.org/trac/tahoe-lafs/wiki/RelatedProjects
-[4] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.17.1/COPYING.GPL
-[5] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.17.1/COPYING.TGPPL.rst
-[6] https://tahoe-lafs.readthedocs.org/en/tahoe-lafs-1.17.1/INSTALL.html
+[4] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.18.0/COPYING.GPL
+[5] https://github.com/tahoe-lafs/tahoe-lafs/blob/tahoe-lafs-1.18.0/COPYING.TGPPL.rst
+[6] https://tahoe-lafs.readthedocs.org/en/tahoe-lafs-1.18.0/INSTALL.html
 [7] https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev
 [8] https://tahoe-lafs.org/trac/tahoe-lafs/roadmap
 [9] https://github.com/tahoe-lafs/tahoe-lafs/blob/master/CREDITS

setup.py

@@ -137,7 +137,7 @@ install_requires = [
     "werkzeug != 2.2.0",
     "treq",
     "cbor2",
-    "pycddl",
+    "pycddl >= 0.2",
 
     # for pid-file support
     "psutil",

src/allmydata/storage/http_client.py

@@ -83,35 +83,35 @@ _SCHEMAS = {
     "allocate_buckets": Schema(
         """
     response = {
-      already-have: #6.258([* uint])
-      allocated: #6.258([* uint])
+      already-have: #6.258([0*256 uint])
+      allocated: #6.258([0*256 uint])
     }
     """
     ),
     "immutable_write_share_chunk": Schema(
         """
     response = {
-      required: [* {begin: uint, end: uint}]
+      required: [0* {begin: uint, end: uint}]
     }
     """
     ),
     "list_shares": Schema(
         """
-    response = #6.258([* uint])
+    response = #6.258([0*256 uint])
     """
     ),
     "mutable_read_test_write": Schema(
         """
         response = {
           "success": bool,
-          "data": {* share_number: [* bstr]}
+          "data": {0*256 share_number: [0* bstr]}
         }
         share_number = uint
         """
     ),
     "mutable_list_shares": Schema(
         """
-        response = #6.258([* uint])
+        response = #6.258([0*256 uint])
         """
     ),
 }

src/allmydata/storage/http_server.py

@@ -260,7 +260,7 @@ _SCHEMAS = {
     "allocate_buckets": Schema(
         """
     request = {
-      share-numbers: #6.258([*256 uint])
+      share-numbers: #6.258([0*256 uint])
       allocated-size: uint
     }
     """
@@ -276,15 +276,13 @@ _SCHEMAS = {
         """
         request = {
             "test-write-vectors": {
-                ; TODO Add length limit here, after
-                ; https://github.com/anweiss/cddl/issues/128 is fixed
-                * share_number => {
-                    "test": [*30 {"offset": uint, "size": uint, "specimen": bstr}]
-                    "write": [*30 {"offset": uint, "data": bstr}]
+                0*256 share_number : {
+                    "test": [0*30 {"offset": uint, "size": uint, "specimen": bstr}]
+                    "write": [0*30 {"offset": uint, "data": bstr}]
                     "new-length": uint / null
                 }
             }
-            "read-vector": [*30 {"offset": uint, "size": uint}]
+            "read-vector": [0*30 {"offset": uint, "size": uint}]
         }
         share_number = uint
         """