Changeset e3a844e6 in trunk

Timestamp:

2021-08-27T13:25:49Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

f99f9cf

Parents:

c88130d

Message:

Maybe fields are better off as bytes in SignedCertificate?.

Location:

src/allmydata

Files:

• grid_manager.py (modified) (5 diffs)
• test/test_grid_manager.py (modified) (2 diffs)

src/allmydata/grid_manager.py ¶

@@ -7 +7 @@
 
 import sys
-import json
 from datetime import (
     datetime,
@@ -17 +16 @@
 from allmydata.util import (
     base32,
+    jsonbytes as json,
 )
 
@@ -27 +27 @@
     A signed certificate.
     """
-    # A JSON-encoded certificate.
-    certificate = attr.ib(type=unicode)
+    # A JSON-encoded, UTF-8-encoded certificate.
+    certificate = attr.ib(
+        type=bytes, validator=attr.validators.instance_of(bytes)
+    )
     # The signature in base32.
-    signature = attr.ib(type=unicode)
+    signature = attr.ib(
+        type=bytes,
+        validator=attr.validators.instance_of(bytes)
+    )
 
     @classmethod
     def load(cls, file_like):
-        return cls(**json.load(file_like))
+        data = json.load(file_like)
+        return cls(
+            certificate=data["certificate"].encode("ascii"),
+            signature=data["signature"].encode("ascii")
+        )
 
     def asdict(self):
@@ -244 +253 @@
             "version": 1,
         }
-        cert_data = json.dumps(cert_info, separators=(',',':'), sort_keys=True).encode('utf8')
+        cert_data = json.dumps_bytes(cert_info, separators=(',',':'), sort_keys=True)
         sig = ed25519.sign_data(self._private_key, cert_data)
         certificate = SignedCertificate(
@@ -372 +381 @@
         ed25519.verify_signature(
             gm_key,
-            base32.a2b(alleged_cert.signature.encode('ascii')),
-            alleged_cert.certificate.encode('ascii'),
+            base32.a2b(alleged_cert.signature),
+            alleged_cert.certificate,
         )
     except ed25519.BadSignature:

src/allmydata/test/test_grid_manager.py ¶

@@ +1 @@
+from past.builtins import unicode
+
 from datetime import (
     timedelta,
@@ -431 +433 @@
         """
         # make signature invalid
-        self.cert0.signature = invalid_signature
+        self.cert0.signature = invalid_signature.encode("ascii")
 
         verify = create_grid_manager_verifier(