Skip to content

[10.2.x] Fix unit test & AuTest #13341

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
masaori335 wants to merge 3 commits into
base: 10.2.x
Choose a base branch
from
Open

[10.2.x] Fix unit test & AuTest #13341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de14b9a
proxy/unit_tests: restore IpAllow::subjects stub definition
masaori335 Jun 26, 2026
cb22905
tls autests: use ssl_multicert.config instead of yaml
masaori335 Jun 26, 2026
bc30f06
curl 8.20 test update: curl PROXY destination changes (#13239)
bneradt Jun 4, 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
2 changes: 2 additions & 0 deletions src/proxy/unit_tests/stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
*/

#include "proxy/IPAllow.h"

uint8_t IpAllow::subjects[IpAllow::Subject::MAX_SUBJECTS];
13 changes: 9 additions & 4 deletions tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
# plaintext HTTP
tr = Test.AddTestRun()
tr.TimeOut = 10
tr.Processes.Default.Command = f"curl --haproxy-protocol --haproxy-clientip 1.2.3.4 'http://127.0.0.1:{ts.Variables.proxy_protocol_port}/httpbin/get'"
tr.Processes.Default.Command = (
f"curl --haproxy-protocol --haproxy-clientip 1.2.3.4 "
f"'http://127.0.0.1:{ts.Variables.proxy_protocol_port}/httpbin/get'")
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(httpbin)
tr.Processes.Default.StartBefore(Test.Processes.ts)
Expand All @@ -84,7 +86,9 @@
# HTTPS
tr = Test.AddTestRun()
tr.TimeOut = 10
tr.Processes.Default.Command = f"curl --haproxy-protocol --haproxy-clientip 5.6.7.8 -k 'https://127.0.0.1:{ts.Variables.proxy_protocol_ssl_port}/httpbin/get'"
tr.Processes.Default.Command = (
f"curl --haproxy-protocol --haproxy-clientip 5.6.7.8 -k "
f"'https://127.0.0.1:{ts.Variables.proxy_protocol_ssl_port}/httpbin/get'")
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "test_TSVConnPPInfo_curl1.gold"
tr.StillRunningAfter = httpbin
Expand All @@ -95,7 +99,8 @@
tr.Processes.Default.ReturnCode = 0
f = tr.Disk.File(log_path)
f.Content = "test_TSVConnPPInfo_plugin_log.gold"
# curl 8.20+ intentionally uses --haproxy-clientip for both PROXY addresses so the address family matches.
f.Content += Testers.ContainsExpression(
"PP Info Received:V1,P2,T1,SRC1.2.3.4,DST127.0.0.1", "Expected information should be received")
r"PP Info Received:V1,P2,T1,SRC1\.2\.3\.4,DST(127\.0\.0\.1|1\.2\.3\.4)", "Expected information should be received")
f.Content += Testers.ContainsExpression(
"PP Info Received:V1,P2,T1,SRC5.6.7.8,DST127.0.0.1", "Expected information should be received")
r"PP Info Received:V1,P2,T1,SRC5\.6\.7\.8,DST(127\.0\.0\.1|5\.6\.7\.8)", "Expected information should be received")
8 changes: 1 addition & 7 deletions tests/gold_tests/tls/tls_flow_control.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,7 @@ def _configure_trafficserver(self) -> 'Process':
TestTlsFlowControl._ts_counter += 1

ts.addDefaultSSLFiles()
ts.Disk.ssl_multicert_yaml.AddLines(
"""
ssl_multicert:
- dest_ip: "*"
ssl_cert_name: server.pem
ssl_key_name: server.key
""".split("\n"))
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{self._server.Variables.Port}')
ts.Disk.records_config.update(
{
Expand Down
8 changes: 1 addition & 7 deletions tests/gold_tests/tls/tls_record_size.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,7 @@ def _configure_trafficserver(self) -> 'Process':
TestRecordSizeClamp._ts_counter += 1

ts.addDefaultSSLFiles()
ts.Disk.ssl_multicert_yaml.AddLines(
"""
ssl_multicert:
- dest_ip: "*"
ssl_cert_name: server.pem
ssl_key_name: server.key
""".split("\n"))
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{self._server.Variables.Port}')
ts.Disk.records_config.update(
{
Expand Down
12 changes: 3 additions & 9 deletions tests/gold_tests/tls/tls_reload_under_load.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'''
Existing cert/SNI reload tests reload while the server is idle. This one drives
continuous concurrent TLS handshakes and reloads ssl_multicert.yaml on top of
continuous concurrent TLS handshakes and reloads ssl_multicert.config on top of
them, stressing the SSL/BIO ownership boundary of the layered TLS VConnection.
The swapped-in certificate must take effect, every handshake must succeed, and
ATS must not crash.
Expand Down Expand Up @@ -51,13 +51,7 @@ def _configure_trafficserver(self) -> 'Process':
ts.addSSLfile("ssl/signed-bar.key")
ts.addSSLfile("ssl/signed2-bar.pem")

ts.Disk.ssl_multicert_yaml.AddLines(
"""
ssl_multicert:
- dest_ip: "*"
ssl_cert_name: signed-bar.pem
ssl_key_name: signed-bar.key
""".split("\n"))
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=signed-bar.pem ssl_key_name=signed-bar.key')
ts.Disk.records_config.update(
{
'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}',
Expand All @@ -69,7 +63,7 @@ def _configure_trafficserver(self) -> 'Process':

# The reload must actually have run (otherwise the test would be vacuous).
ts.Disk.diags_log.Content = Testers.ContainsExpression(
"ssl_multicert.yaml finished loading", "the cert configuration must reload while load is in flight")
"ssl_multicert.config finished loading", "the cert configuration must reload while load is in flight")
# The reload-under-load must not crash or trip an assertion / sanitizer.
ts.Disk.traffic_out.Content = Testers.ExcludesExpression(
"received signal|failed assertion", "ATS must not crash reloading certs under load")
Expand Down
8 changes: 1 addition & 7 deletions tests/gold_tests/tls/tls_renegotiation.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,7 @@ def _configure_trafficserver(self) -> 'Process':

ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.Disk.ssl_multicert_yaml.AddLines(
"""
ssl_multicert:
- dest_ip: "*"
ssl_cert_name: server.pem
ssl_key_name: server.key
""".split("\n"))
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.records_config.update(
{
'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}',
Expand Down
8 changes: 1 addition & 7 deletions tests/gold_tests/tls/tls_renegotiation_allowed.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,7 @@ def _configure_trafficserver(self) -> 'Process':

ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.Disk.ssl_multicert_yaml.AddLines(
"""
ssl_multicert:
- dest_ip: "*"
ssl_cert_name: server.pem
ssl_key_name: server.key
""".split("\n"))
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key')
ts.Disk.records_config.update(
{
'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}',
Expand Down