Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(framework:skip) Specify keyword deterministic in SerializeToString method #4163

Merged
merged 4 commits into from
Sep 10, 2024
+16 −16
Merged

fix(framework:skip) Specify keyword deterministic in SerializeToString method #4163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f400062
specify keyword
panh99 Sep 9, 2024
36f304c
udpate unittests accordingly
panh99 Sep 9, 2024
7d95f41
Merge branch 'main' into fix-grpc-serialization-issue
danieljanes Sep 9, 2024
1ed1b69
Merge branch 'main' into fix-grpc-serialization-issue
panh99 Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/py/flwr/client/grpc_rere_client/client_interceptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
),
)
)
Expand Down
2 changes: 1 addition & 1 deletion src/py/flwr/client/grpc_rere_client/client_interceptor_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
22 changes: 11 additions & 11 deletions src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down