bneradt commented on code in PR #13383: URL: https://github.com/apache/trafficserver/pull/13383#discussion_r3582344841
########## tests/gold_tests/pluginTest/client_packet_mark/client_packet_mark.test.py: ########## @@ -0,0 +1,102 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import socket + +Test.Summary = ''' +Verify TSHttpTxnClientPacketMarkSet sets the client-side firewall mark to the +supplied value, using a test plugin that reads the applied mark back off the +client socket. +''' + + +def _can_set_so_mark() -> bool: + """Probe whether SO_MARK can actually be set on this host. + + Setting SO_MARK is Linux-only and requires CAP_NET_ADMIN. On any host that + lacks the capability (or the platform), setsockopt raises, and the applied + value would be unobservable -- so the test is skipped rather than failed. + """ Review Comment: gpt-5.6-sol: > Since Linux 5.17, CAP_NET_RAW also permits SO_MARK. It's just a review comment on your comment here. It says the implementation of the function is fine. ########## tests/gold_tests/pluginTest/client_packet_mark/client_packet_mark.test.py: ########## @@ -0,0 +1,102 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import socket + +Test.Summary = ''' +Verify TSHttpTxnClientPacketMarkSet sets the client-side firewall mark to the +supplied value, using a test plugin that reads the applied mark back off the +client socket. +''' + + +def _can_set_so_mark() -> bool: + """Probe whether SO_MARK can actually be set on this host. + + Setting SO_MARK is Linux-only and requires CAP_NET_ADMIN. On any host that + lacks the capability (or the platform), setsockopt raises, and the applied + value would be unobservable -- so the test is skipped rather than failed. + """ + if not hasattr(socket, "SO_MARK"): + return False + try: + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as probe: + probe.setsockopt(socket.SOL_SOCKET, socket.SO_MARK, 0x1) + return True + except (OSError, PermissionError): + return False + + +Test.SkipUnless( + Condition.IsPlatform("linux"), + Condition(_can_set_so_mark, "Setting SO_MARK requires Linux with CAP_NET_ADMIN", True), + Condition.PluginExists('client_packet_mark.so'), +) + + +class ClientPacketMarkTest: + """Drive TSHttpTxnClientPacketMarkSet through a test plugin and assert on the + firewall mark read back off the client socket. + + The starting mark is seeded per process via + proxy.config.net.sock_packet_mark_in, applied at accept time. + """ + + # Value the plugin sets; the mark is expected to become exactly this. + SET_MARK = 0x0000000A + + def __init__(self): + self._server = self._make_server() + self._ts = self._make_ats("ts", seed_mark=0x0000FF00) + + def _make_server(self) -> 'Process': + server = Test.MakeOriginServer("server") + request_header = {"headers": "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""} + response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n", "timestamp": "1469733493.993", "body": ""} + server.addResponse("sessionlog.json", request_header, response_header) + return server + + def _make_ats(self, name: str, seed_mark: int) -> 'Process': + ts = Test.MakeATSProcess(name, enable_cache=False) + ts.Disk.records_config.update( + { + 'proxy.config.net.sock_packet_mark_in': seed_mark, Review Comment: gpt-5.6-sol observes: The test sets `sock_packet_mark_in` but leaves `sock_option_flag_in` at its `0x1` default. ATS only calls `setsockopt(SO_MARK)` when bit 16 is enabled. Consequently, both the seeded `0xff00` mark and the later API-applied `0x0a` mark are no-ops. On a capable Linux host where the test actually runs, getsockopt() should normally return 0, failing the assertion. The test should set: ```python 'proxy.config.net.sock_option_flag_in': 0x11, ``` That preserves the default TCP_NODELAY bit and adds PACKET_MARK. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
