Skip to content

Commit a058ae5

Browse files
authored
Proxy Verfier Upgrade to v2.10.1 (#10389)
This is a set of Proxy Verifier cherry-picks from master into 9.2.x to get 9.2.x up to date with the latest v2.10.1 Proxy Verifier release. --- Fix the autest Proxy Verifier version check (#9365) The Proxy Verifier autest version check logic assumed that verifier-client was in the PATH. This is most often not the case, and even if it is it can be the wrong one since the test will by default use the unpacked Proxy Verifier from bintray. This fixes the check so that it explicitly refers to the verifier-client that the test will use. (cherry picked from commit edbd10a) Upgrade to Proxy Verifier v2.7.0 (#9611) Proxy Verifier v2.7.0 adds: * Proxy Protocol support. * HTTP response reason string verification Some of the h2origin AuTest tests were over-specified with respect to reason strings. HTTP/2 explicitly removes reason strings, so they will not be in the responses nor will the verifier client find them. This removes those incorrect specifications. (cherry picked from commit b449992) Fix a crash caused by a HTTP/2 GET request with a body (#9738) * fix a crash caused by a HTTP/2 GET request with a body * Update to Proxy Verifier v2.8.0 This updates our test suite to use Proxy Verifier v2.8.0. This release comes with HTTP/2 frame replay updates. In the cherry-pick from master to 9.2.x, I removed the following test updates because they were HTTP/2 to origin specific: * h2get_with_body * background_fill (cherry picked from commit 0f70092) --------- Co-authored-by: bneradt <bneradt@yahooinc.com> (cherry picked from commit 50b6aa9) Update to Proxy Verifier v2.8.1 (#9834) Proxy Verifier v2.8.1 has fixes for the way Proxy Verifier relates to HTTP/2 CONNECT method request pseudo header fields. This will be helpful for testing HTTP/2 CONNECT requests. (cherry picked from commit d5c47a7) Proxy Verifier: update to v2.9.0 (#10083) Proxy Verifier v2.9.0 adds HTTP/2 trailer support as well as containing updates for Expect: 100-continue and quic timeout. (cherry picked from commit 183aa3e) Update Proxy Verifier to v2.10.1 (#10322) This includes the ability to specify separate DATA frames for a stream as well as a way to keep a session open after the final transaction. (cherry picked from commit c5d7b19) fix ProxyVerifier version check (#9267) (cherry picked from commit a2ab0b7)
1 parent bf992fb commit a058ae5

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

tests/gold_tests/autest-site/conditions.test.ext

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def HasCurlVersion(self, version):
6767

6868

6969
def HasProxyVerifierVersion(self, version):
70-
return self.EnsureVersion(["verifier-client", "--version"], min_version=version)
70+
verifier_path = os.path.join(self.Variables.VerifierBinPath, 'verifier-client')
71+
return self.EnsureVersion([verifier_path, "--version"], min_version=version)
7172

7273

7374
def HasCurlFeature(self, feature):
@@ -130,6 +131,7 @@ def PluginExists(self, pluginname):
130131

131132

132133
ExtendCondition(HasOpenSSLVersion)
134+
ExtendCondition(HasProxyVerifierVersion)
133135
ExtendCondition(IsBoringSSL)
134136
ExtendCondition(IsOpenSSL)
135137
ExtendCondition(HasATSFeature)

tests/prepare_proxy_verifier.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pv_dir="${pv_name}-${pv_version}"
4040
pv_tar_filename="${pv_dir}.tar.gz"
4141
pv_tar="${pv_top_dir}/${pv_tar_filename}"
4242
pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename}"
43-
expected_sha1="011bd50b74a07484683ed56a671f37afbdd0c786"
43+
expected_sha1="0f189a37596d7488b5b81b5547df6fc1eadf56a1"
4444
pv_client="${bin_dir}/verifier-client"
4545
pv_server="${bin_dir}/verifier-server"
4646
TAR=${TAR:-tar}
@@ -78,10 +78,10 @@ EOF
7878
Darwin)
7979
case $(uname -m) in
8080
x86_64)
81-
pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-x86_64"
81+
pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-amd64"
8282
;;
8383
arm64)
84-
pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-m1"
84+
pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-arm64"
8585
;;
8686
*)
8787
fail "Unrecognized Mac architecture: $(uname -m)"
@@ -90,6 +90,17 @@ EOF
9090
;;
9191
Linux)
9292
pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux"
93+
case $(uname -m) in
94+
x86_64)
95+
pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-amd64"
96+
;;
97+
aarch64)
98+
pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-arm64"
99+
;;
100+
*)
101+
fail "Unrecognized Linux architecture: $(uname -m)"
102+
;;
103+
esac
93104
;;
94105
*)
95106
fail "We need to build proxy-verifier for $(uname -s)"

tests/proxy-verifier-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.6.0
1+
v2.10.1

0 commit comments

Comments
 (0)