This is an automated email from the ASF dual-hosted git repository.
calavera pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new d34a32c Add tests to exercise H2 and chunked encoding
new cf3d098 Merge pull request #6268 from
shinrich/add_h2_chunked_encoding_test
d34a32c is described below
commit d34a32c2aa584964fce5150c34f3ea2c2e418a32
Author: Susan Hinrichs <[email protected]>
AuthorDate: Wed Dec 18 14:43:15 2019 +0000
Add tests to exercise H2 and chunked encoding
---
tests/gold_tests/chunked_encoding/case1.sh | 19 ++++
tests/gold_tests/chunked_encoding/case2.sh | 19 ++++
tests/gold_tests/chunked_encoding/case3.sh | 19 ++++
.../chunked_encoding/chunked_encoding.test.py | 2 +-
.../chunked_encoding/chunked_encoding_h2.test.py | 106 +++++++++++++++++++++
tests/gold_tests/chunked_encoding/delay-server.sh | 20 ++++
tests/gold_tests/chunked_encoding/server2.sh | 18 ++++
tests/gold_tests/chunked_encoding/server3.sh | 18 ++++
8 files changed, 220 insertions(+), 1 deletion(-)
diff --git a/tests/gold_tests/chunked_encoding/case1.sh
b/tests/gold_tests/chunked_encoding/case1.sh
new file mode 100644
index 0000000..fff931f
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/case1.sh
@@ -0,0 +1,19 @@
+# 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.
+
+nc -l 8888 -o outserver1 -c "sh ./delay-server.sh" &
+sleep 1
+nghttp -vv https://127.0.0.1:${1}/delay-chunked-response
diff --git a/tests/gold_tests/chunked_encoding/case2.sh
b/tests/gold_tests/chunked_encoding/case2.sh
new file mode 100644
index 0000000..55a9c11
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/case2.sh
@@ -0,0 +1,19 @@
+# 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.
+
+nc -l 8888 -o outserver2 -c "sh ./server2.sh" &
+sleep 1
+curl --http2 -k https://127.0.0.1:${1}/post --verbose -H "Transfer-encoding:
chunked" -d "Knock knock"
diff --git a/tests/gold_tests/chunked_encoding/case3.sh
b/tests/gold_tests/chunked_encoding/case3.sh
new file mode 100644
index 0000000..6ed3b3c
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/case3.sh
@@ -0,0 +1,19 @@
+# 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.
+
+nc -l 8888 -o outserver3 -c "sh ./server3.sh" &
+sleep 1
+curl --http2 -k https://127.0.0.1:${1}/post-chunked --verbose -H
"Transfer-encoding: chunked" -d "Knock knock"
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 7219221..faea3af 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -17,7 +17,7 @@
# limitations under the License.
Test.Summary = '''
-Test a basic remap of a http connection
+Test chunked encoding processing
'''
# need Curl with HTTP/2
Test.SkipUnless(
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
new file mode 100644
index 0000000..1cd9297
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -0,0 +1,106 @@
+'''
+'''
+# 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
+Test.Summary = '''
+Test interaction of H2 and chunked encoding
+'''
+# need Curl
+Test.SkipUnless(
+ Condition.HasProgram("nghttp", "Nghttp need to be installed on system for
this test to work"),
+ Condition.HasProgram("nc", "Nc needs to be installed on this system for
this test to work"),
+ Condition.HasProgram("curl", "Curl need to be installed on system for this
test to work"),
+ Condition.HasCurlFeature('http2')
+)
+Test.ContinueOnFail = True
+
+# Define default ATS
+ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+
+# add ssl materials like key, certificates for the server
+ts.addSSLfile("ssl/server.pem")
+ts.addSSLfile("ssl/server.key")
+
+ts.Disk.records_config.update({
+ 'proxy.config.http2.enabled': 1, # this option is for VZM-internal only
+ 'proxy.config.diags.debug.enabled': 0,
+ 'proxy.config.diags.debug.tags': 'http',
+ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir),
+ 'proxy.config.ssl.server.private_key.path':
'{0}'.format(ts.Variables.SSLDir),
+ 'proxy.config.ssl.server.cipher_suite':
'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:RC4-SHA:RC4-MD5:AES128-SHA:AES256-SHA:DES-CBC3-SHA!SRP:!DSS:!PSK:!aNULL:!eNULL:!SSLv2',
+})
+
+ts.Disk.remap_config.AddLine(
+ 'map /delay-chunked-response http://127.0.0.1:8888'
+)
+ts.Disk.remap_config.AddLine(
+ 'map / http://127.0.0.1:8888'
+)
+
+ts.Disk.ssl_multicert_config.AddLine(
+ 'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key'
+)
+
+# Using netcat as a cheapy origin server in case 1 so we can insert a delay in
sending back the response.
+# Replaced microserver for cases 2 and 3 as well because I was getting python
exceptions when running
+# microserver if chunked encoding headers were specified for the request
headers
+
+# H2 GET request
+# chunked response without content-length
+# delay before final chunk size
+server1_out = Test.Disk.File("outserver1")
+tr = Test.AddTestRun()
+tr.Setup.Copy('delay-server.sh')
+tr.Setup.Copy('case1.sh')
+tr.Processes.Default.Command = 'sh ./case1.sh
{0}'.format(ts.Variables.ssl_port)
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.StartBefore(Test.Processes.ts)
+tr.Processes.Default.Streams.All = Testers.ExcludesExpression("RST_STREAM",
"Delayed chunk close should not cause reset")
+tr.Processes.Default.Streams.All +=
Testers.ExcludesExpression("content-length", "Should return chunked")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression(":status: 200",
"Should get successful response")
+tr.StillRunningAfter = ts
+# No resets in the output
+# No content lengths in the header
+
+# HTTP2 POST: www.example.com Host, chunked body
+server2_out = Test.Disk.File("outserver2")
+tr = Test.AddTestRun()
+tr.Setup.Copy('server2.sh')
+tr.Setup.Copy('case2.sh')
+tr.Processes.Default.Command = 'sh ./case2.sh
{0}'.format(ts.Variables.ssl_port)
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200",
"Request should succeed")
+tr.Processes.Default.Streams.All +=
Testers.ContainsExpression("content-length:", "Response should include content
length")
+server2_out = Testers.ContainsExpression("Transfer-Encoding: chunked",
"Request should be chunked encoded")
+# No content-length in header
+# Transfer encoding to origin, but no content-length
+# Content length on the way back
+
+# HTTP2 POST: chunked post body and chunked response
+server3_out = Test.Disk.File("outserver3")
+tr = Test.AddTestRun()
+tr.Setup.Copy('server3.sh')
+tr.Setup.Copy('case3.sh')
+tr.Processes.Default.Command = 'sh ./case3.sh
{0}'.format(ts.Variables.ssl_port)
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200",
"Request should succeed")
+tr.Processes.Default.Streams.All +=
Testers.ExcludesExpression("content-length:", "Response should not include
content length")
+server3_out = Testers.ContainsExpression("Transfer-Encoding: chunked",
"Request should be chunked encoded")
+# No content length in header
+# Transfer encoding to origin, but no content-length
+# No content length in the response
diff --git a/tests/gold_tests/chunked_encoding/delay-server.sh
b/tests/gold_tests/chunked_encoding/delay-server.sh
new file mode 100644
index 0000000..670c9f1
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/delay-server.sh
@@ -0,0 +1,20 @@
+# 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.
+
+printf "HTTP/1.1 200\r\nTransfer-encoding: chunked\r\n\r\n"
+printf "F\r\n123456789012345\r\n"
+sleep 1
+printf "0\r\n\r\n"
diff --git a/tests/gold_tests/chunked_encoding/server2.sh
b/tests/gold_tests/chunked_encoding/server2.sh
new file mode 100644
index 0000000..4e48d75
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/server2.sh
@@ -0,0 +1,18 @@
+# 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.
+
+printf "HTTP/1.1 200\r\nContent-length: 15\r\n\r\n"
+printf "123456789012345"
diff --git a/tests/gold_tests/chunked_encoding/server3.sh
b/tests/gold_tests/chunked_encoding/server3.sh
new file mode 100644
index 0000000..bf73609
--- /dev/null
+++ b/tests/gold_tests/chunked_encoding/server3.sh
@@ -0,0 +1,18 @@
+# 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.
+
+printf "HTTP/1.1 200\r\nTransfer-encoding: chunked\r\n\r\n"
+printf "F\r\n123456789012345\r\n0\r\n\r\n"
