Changeset 4a226c7 in trunk

Timestamp:

2019-09-27T17:51:03Z (6 years ago)

Author:

meejah <meejah@…>

Branches:

master

Children:

18e24a8

Parents:

fc32d1e

git-author:

meejah <meejah@…> (2019-09-05 22:48:08)

git-committer:

meejah <meejah@…> (2019-09-27 17:51:03)

Message:

use Twisted API, and some hypothesis tests

Location:

src/allmydata

Files:

• test/web/test_root.py (modified) (5 diffs)
• web/root.py (modified) (1 diff)

src/allmydata/test/web/test_root.py ¶

@@ -10 +10 @@
 from allmydata.web.common import WebError
 
+from hypothesis import given
+from hypothesis.strategies import text
+
+# remove nevow imports when we use twisted.web.Site instead of nevow
+# for the base.
 from nevow.inevow import IRequest
 
 from zope.interface import directlyProvides
+
 
 class FakeRoot(Root):
@@ -41 +47 @@
 class RenderSlashUri(unittest.TestCase):
     """
-    Ensure that URI's starting with /uri?uri= only accept valid
+    Ensure that URIs starting with /uri?uri= only accept valid
     capabilities
     """
@@ -48 +54 @@
         self.request = DummyRequest("/uri")
         self.request.fields = {}
-        self.request.prePathURL = lambda: "http://127.0.0.1.99999/{}".format("/".join(self.request.prepath))
+
+        def prepathURL():
+            return "http://127.0.0.1.99999/{}".format(
+                "/".join(self.request.prepath)
+            )
+        self.request.prePathURL = prepathURL
         directlyProvides(self.request, IRequest)
         self.client = Mock()
@@ -57 +68 @@
         A valid capbility does not result in error
         """
-        self.request.fields["uri"] = FakeField(
-            value=(
-                "URI:CHK:nt2xxmrccp7sursd6yh2thhcky:"
-                "mukesarwdjxiyqsjinbfiiro6q7kgmmekocxfjcngh23oxwyxtzq:2:5:5874882"
-            )
-        )
+        self.request.args[b"uri"] = [(
+            b"URI:CHK:nt2xxmrccp7sursd6yh2thhcky:"
+            b"mukesarwdjxiyqsjinbfiiro6q7kgmmekocxfjcngh23oxwyxtzq:2:5:5874882"
+        )]
         self.res.render_GET(self.request)
 
@@ -69 +78 @@
         A (trivially) invalid capbility is an error
         """
-        self.request.fields["uri"] = FakeField(value="not a capability")
+        self.request.args[b"uri"] = [b"not a capability"]
+        with self.assertRaises(WebError):
+            self.res.render_GET(self.request)
+
+    @given(
+        text()
+    )
+    def test_hypothesis_error_caps(self, cap):
+        """
+        Let hypothesis try a bunch of invalid capabilities
+        """
+        # existing code insists capabilities are type "str" .. which
+        # sounds like it'll definitely be wrong for python3? (what
+        # does twisted.web produce for stuff in 'fields' or the
+        # equivalent for a plain Request? also maybe I should use that
+        # already?)
+        self.request.args[b"uri"] = [cap.encode('utf8')]
         with self.assertRaises(WebError):
             self.res.render_GET(self.request)

src/allmydata/web/root.py ¶

@@ -58 +58 @@
         preserved. New code should use "/uri/<cap>"
         """
-        uri_arg = get_arg(req, "uri", None)
+        uri_arg = req.args.get(b"uri", [None])[0]
         if uri_arg is None:
             raise WebError("GET /uri requires uri=")