Skip to content

[MCC-1548828] Python Lib - Remove x-client-public-ip header from Python SDK Arrow Flight options [Dev Only] #64

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

Open
glondhe-mdsol wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[MCC-1548828] Python Lib - Remove x-client-public-ip header from Python SDK Arrow Flight options [Dev Only] #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba3926b
refactor: Remove client IP address retrieval from ArrowFlightTranspor…
glondhe-mdsol Sep 10, 2026
88f37ff
refactor: Remove unnecessary blank lines in test_connect_injects_all_…
glondhe-mdsol Sep 10, 2026
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
10 changes: 0 additions & 10 deletions dataconnect/transport/arrow_flight/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import dataclasses
import json
import platform
import socket
import subprocess
from datetime import UTC, datetime
from importlib.metadata import version
Expand Down Expand Up @@ -133,15 +132,6 @@ def __init__(
client_info_value = f"Python_SDK;{sdk_version};"
self._call_headers.append((b"x-client-dataconnect", client_info_value.encode("utf-8")))

try:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.connect(("8.8.8.8", 80))
client_ip = s.getsockname()[0]
s.close()
except Exception:
client_ip = "127.0.0.1"
self._call_headers.append((b"x-client-public-ip", client_ip.encode("utf-8")))

if token:
self._call_headers.append((b"authorization", f"Bearer {token}".encode()))

Expand Down
36 changes: 0 additions & 36 deletions tests/test_logging_headers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from __future__ import annotations

import importlib.metadata
import socket
from unittest.mock import MagicMock, patch

import pytest
Expand Down Expand Up @@ -37,15 +36,6 @@ def test_connect_injects_all_required_logging_headers(mock_flight_client: MagicM
assert b"x-client-dataconnect" in headers_dict
assert headers_dict[b"x-client-dataconnect"] == b"Python_SDK;v1.2.3-test;"

# AC-04: Client IP Address validation
assert b"x-client-public-ip" in headers_dict
try:
socket.inet_aton(headers_dict[b"x-client-public-ip"].decode("utf-8"))
ip_is_valid = True
except OSError:
ip_is_valid = False
assert ip_is_valid

# Check that existing auth token logic is preserved
Comment thread
glondhe-mdsol marked this conversation as resolved.
assert b"authorization" in headers_dict
assert headers_dict[b"authorization"] == f"Bearer {test_token}".encode()
Expand All @@ -71,32 +61,6 @@ def test_sdk_type_remains_python_across_different_sdk_versions(
assert headers_dict[b"x-client-dataconnect"] == expected_client_info


# ---------------------------------------------------------------------------
# Edge cases & Error handling
# ---------------------------------------------------------------------------


@patch("pyarrow.flight.FlightClient")
def test_client_ip_falls_back_to_localhost_on_socket_error(mock_flight_client: MagicMock) -> None:
"""AC-04: Check if the IP falls back to 127.0.0.1 when the machine is offline."""
with (
patch("socket.socket.connect", side_effect=OSError("No network")),
patch("dataconnect.transport.arrow_flight.transport.version", return_value="1.0.0"),
):
client = DataConnectClient.connect(
host="localhost",
port=8888,
use_tls=False,
user_uuid="dummy-uuid",
)

transport = client._service._transport
headers_dict = dict(transport._call_headers)

assert b"x-client-public-ip" in headers_dict
assert headers_dict[b"x-client-public-ip"] == b"127.0.0.1"


@patch("pyarrow.flight.FlightClient")
def test_sdk_version_falls_back_on_package_not_found_error(mock_flight_client: MagicMock) -> None:
"""AC-02: Checks if the version falls back to 0.1.0 when package metadata is missing.."""
Expand Down
Loading