ref(py3): Fix string casting in relay tests (#20447)

Co-authored-by: Markus Unterwaditzer <markus-honeypot@unterwaditzer.net>

tests/sentry/api/endpoints/test_relay_projectconfigs.py

@@ -45,13 +45,13 @@ def private_key(key_pair):
 
 @pytest.fixture
 def relay_id():
-    return six.binary_type(six.text_type(uuid4()).encode("ascii"))
+    return six.text_type(uuid4())
 
 
 @pytest.fixture
 def relay(relay_id, public_key):
     return Relay.objects.create(
-        relay_id=relay_id, public_key=six.binary_type(public_key), is_internal=True
+        relay_id=relay_id, public_key=six.text_type(public_key), is_internal=True
     )
 
 

tests/sentry/api/endpoints/test_relay_projectids.py

@@ -30,12 +30,10 @@ class RelayProjectIdsEndpointTest(APITestCase):
 
         self.public_key = self.key_pair[1]
         self.private_key = self.key_pair[0]
-        self.relay_id = six.binary_type(six.text_type(uuid4()).encode("ascii"))
+        self.relay_id = six.text_type(uuid4())
 
         self.relay = Relay.objects.create(
-            relay_id=self.relay_id,
-            public_key=six.binary_type(self.public_key),
-            is_internal=internal,
+            relay_id=self.relay_id, public_key=self.public_key, is_internal=internal,
         )
 
         self.project = self.create_project()
@@ -49,7 +47,7 @@ class RelayProjectIdsEndpointTest(APITestCase):
         if add_org_key:
             org.update_option(
                 "sentry:trusted-relays",
-                [{"public_key": self.relay.public_key, "name": "main-relay"}],
+                [{"public_key": six.text_type(self.relay.public_key), "name": "main-relay"}],
             )
 
     def _call_endpoint(self, public_key):

tests/sentry/api/endpoints/test_relay_publickeys.py

@@ -26,23 +26,23 @@ class RelayPublicKeysConfigTest(APITestCase):
 
         self.internal_relay = Relay.objects.create(
             relay_id=six.text_type(uuid4()),
-            public_key=six.binary_type(self.public_key),
+            public_key=six.text_type(self.public_key),
             is_internal=True,
         )
 
         self.external_relay = Relay.objects.create(
             relay_id=six.text_type(uuid4()),
-            public_key=six.binary_type(self.public_key),
+            public_key=six.text_type(self.public_key),
             is_internal=False,
         )
         self.relay_a = Relay.objects.create(
             relay_id=six.text_type(uuid4()),
-            public_key=six.binary_type(self.public_key),
+            public_key=six.text_type(self.public_key),
             is_internal=False,
         )
         self.relay_b = Relay.objects.create(
             relay_id=six.text_type(uuid4()),
-            public_key=six.binary_type(self.public_key),
+            public_key=six.text_type(self.public_key),
             is_internal=True,
         )
 

tests/sentry/api/endpoints/test_relay_register.py

@@ -21,15 +21,15 @@ class RelayRegisterTest(APITestCase):
         self.key_pair = generate_key_pair()
 
         self.public_key = self.key_pair[1]
-        settings.SENTRY_RELAY_WHITELIST_PK.append(six.binary_type(self.public_key))
+        settings.SENTRY_RELAY_WHITELIST_PK.append(six.text_type(self.public_key))
 
         self.private_key = self.key_pair[0]
-        self.relay_id = six.binary_type(six.text_type(uuid4()).encode("ascii"))
+        self.relay_id = six.text_type(uuid4())
 
         self.path = reverse("sentry-api-0-relay-register-challenge")
 
     def test_valid_register(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -44,7 +44,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 200, resp.content
 
     def test_register_missing_relay_id(self):
-        data = {"public_key": six.binary_type(self.public_key)}
+        data = {"public_key": six.text_type(self.public_key)}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -84,7 +84,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_register_missing_header(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -98,7 +98,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_register_missing_header2(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -112,7 +112,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_register_wrong_sig(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -127,7 +127,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_valid_register_response(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -158,7 +158,7 @@ class RelayRegisterTest(APITestCase):
         assert relay.relay_id == self.relay_id
 
     def test_forge_public_key(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -185,9 +185,9 @@ class RelayRegisterTest(APITestCase):
 
         keys = generate_key_pair()
 
-        settings.SENTRY_RELAY_WHITELIST_PK.append(six.binary_type(keys[1]))
+        settings.SENTRY_RELAY_WHITELIST_PK.append(six.text_type(keys[1]))
 
-        data = {"public_key": six.binary_type(keys[1]), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(keys[1]), "relay_id": self.relay_id}
 
         raw_json, signature = keys[0].pack(data)
 
@@ -202,7 +202,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_expired_challenge(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -229,7 +229,7 @@ class RelayRegisterTest(APITestCase):
 
         keys = generate_key_pair()
 
-        data = {"token": six.binary_type(result.get("token")), "relay_id": self.relay_id}
+        data = {"token": six.text_type(result.get("token")), "relay_id": self.relay_id}
 
         raw_json, signature = keys[0].pack(data)
 
@@ -244,7 +244,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 401, resp.content
 
     def test_forge_public_key_on_register(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -270,7 +270,7 @@ class RelayRegisterTest(APITestCase):
 
         keys = generate_key_pair()
 
-        data = {"token": six.binary_type(result.get("token")), "relay_id": self.relay_id}
+        data = {"token": six.text_type(result.get("token")), "relay_id": self.relay_id}
 
         raw_json, signature = keys[0].pack(data)
 
@@ -285,7 +285,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_invalid_json_response(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -313,7 +313,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_missing_token_response(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -343,7 +343,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_missing_sig_response(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -370,7 +370,7 @@ class RelayRegisterTest(APITestCase):
         assert resp.status_code == 400, resp.content
 
     def test_relay_id_missmatch_response(self):
-        data = {"public_key": six.binary_type(self.public_key), "relay_id": self.relay_id}
+        data = {"public_key": six.text_type(self.public_key), "relay_id": self.relay_id}
 
         raw_json, signature = self.private_key.pack(data)
 
@@ -391,7 +391,7 @@ class RelayRegisterTest(APITestCase):
             reverse("sentry-api-0-relay-register-response"),
             data=raw_json,
             content_type="application/json",
-            HTTP_X_SENTRY_RELAY_ID=six.binary_type(six.text_type(uuid4()).encode("ascii")),
+            HTTP_X_SENTRY_RELAY_ID=six.text_type(uuid4()),
             HTTP_X_SENTRY_RELAY_SIGNATURE=signature,
         )