fix(framework:skip) Specify keyword deterministic in `SerializeToSt…

…ring` method (#4163)
adap · Sep 11, 2024 · 937b93b · 937b93b
1 parent 878fb6a
commit 937b93b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/py/flwr/client/grpc_rere_client/client_interceptor.py b/src/py/flwr/client/grpc_rere_client/client_interceptor.py
@@ -130,13 +130,12 @@ def intercept_unary_unary(
             if self.shared_secret is None:
                 raise RuntimeError("Failure to compute hmac")
 
+            message_bytes = request.SerializeToString(deterministic=True)
             metadata.append(
                 (
                     _AUTH_TOKEN_HEADER,
                     base64.urlsafe_b64encode(
-                        compute_hmac(
-                            self.shared_secret, request.SerializeToString(True)
-                        )
+                        compute_hmac(self.shared_secret, message_bytes)
                     ),
                 )
             )

diff --git a/src/py/flwr/client/grpc_rere_client/client_interceptor_test.py b/src/py/flwr/client/grpc_rere_client/client_interceptor_test.py
@@ -73,7 +73,7 @@ def unary_unary(
         """Handle unary call."""
         with self._lock:
             self._received_client_metadata = context.invocation_metadata()
-            self._received_message_bytes = request.SerializeToString(True)
+            self._received_message_bytes = request.SerializeToString(deterministic=True)
 
             if isinstance(request, CreateNodeRequest):
                 context.send_initial_metadata(

diff --git a/src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor.py b/src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor.py
@@ -188,7 +188,8 @@ def _verify_hmac(
         self, public_key: ec.EllipticCurvePublicKey, request: Request, hmac_value: bytes
     ) -> bool:
         shared_secret = generate_shared_key(self.server_private_key, public_key)
-        return verify_hmac(shared_secret, request.SerializeToString(True), hmac_value)
+        message_bytes = request.SerializeToString(deterministic=True)
+        return verify_hmac(shared_secret, message_bytes, hmac_value)
 
     def _create_authenticated_node(
         self,

diff --git a/src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor_test.py b/src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor_test.py
@@ -166,7 +166,7 @@ def test_successful_delete_node_with_metadata(self) -> None:
             self._node_private_key, self._server_public_key
         )
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -195,7 +195,7 @@ def test_unsuccessful_delete_node_with_metadata(self) -> None:
         node_private_key, _ = generate_key_pairs()
         shared_secret = generate_shared_key(node_private_key, self._server_public_key)
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -222,7 +222,7 @@ def test_successful_pull_task_ins_with_metadata(self) -> None:
             self._node_private_key, self._server_public_key
         )
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -251,7 +251,7 @@ def test_unsuccessful_pull_task_ins_with_metadata(self) -> None:
         node_private_key, _ = generate_key_pairs()
         shared_secret = generate_shared_key(node_private_key, self._server_public_key)
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -280,7 +280,7 @@ def test_successful_push_task_res_with_metadata(self) -> None:
             self._node_private_key, self._server_public_key
         )
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -311,7 +311,7 @@ def test_unsuccessful_push_task_res_with_metadata(self) -> None:
         node_private_key, _ = generate_key_pairs()
         shared_secret = generate_shared_key(node_private_key, self._server_public_key)
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -339,7 +339,7 @@ def test_successful_get_run_with_metadata(self) -> None:
             self._node_private_key, self._server_public_key
         )
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -369,7 +369,7 @@ def test_unsuccessful_get_run_with_metadata(self) -> None:
         node_private_key, _ = generate_key_pairs()
         shared_secret = generate_shared_key(node_private_key, self._server_public_key)
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -396,7 +396,7 @@ def test_successful_ping_with_metadata(self) -> None:
             self._node_private_key, self._server_public_key
         )
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -425,7 +425,7 @@ def test_unsuccessful_ping_with_metadata(self) -> None:
         node_private_key, _ = generate_key_pairs()
         shared_secret = generate_shared_key(node_private_key, self._server_public_key)
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)
@@ -469,7 +469,7 @@ def test_successful_restore_node(self) -> None:
             self._node_private_key, self._server_public_key
         )
         hmac_value = base64.urlsafe_b64encode(
-            compute_hmac(shared_secret, request.SerializeToString(True))
+            compute_hmac(shared_secret, request.SerializeToString(deterministic=True))
         )
         public_key_bytes = base64.urlsafe_b64encode(
             public_key_to_bytes(self._node_public_key)