[trafficserver] branch 9.1.x updated: Updates the Dockerfile for debian (#7518)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.1.x by this push: new 327d410 Updates the Dockerfile for debian (#7518) 327d410 is described below commit 327d41016977de834ee043f091d62b57a09e86db Author: Leif Hedstrom AuthorDate: Thu Feb 11 15:59:20 2021 -0700 Updates the Dockerfile for debian (#7518) (cherry picked from commit 5528ab6deadae1ebf765d1e72a97ac70220d6587) --- ci/docker/deb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/deb/Dockerfile b/ci/docker/deb/Dockerfile index 5affc9b..337356c 100644 --- a/ci/docker/deb/Dockerfile +++ b/ci/docker/deb/Dockerfile @@ -53,7 +53,7 @@ RUN apt-get update; apt-get -y dist-upgrade; \ git distcc file wget openssl hwloc intltool-debian; \ # Devel packages that ATS needs apt-get -y install libssl-dev libexpat1-dev libpcre3-dev libcap-dev \ -libhwloc-dev libhwloc5 libunwind8 libunwind8-dev zlib1g-dev \ +libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \ tcl-dev tcl8.6-dev libjemalloc-dev libluajit-5.1-dev liblzma-dev \ libhiredis-dev libbrotli-dev libncurses-dev libgeoip-dev libmagick++-dev; \ # Optional: This is for the OpenSSH server, and Jenkins account + access (comment out if not needed)
[trafficserver] branch master updated (55439ff -> df01ace)
This is an automated email from the ASF dual-hosted git repository. bnolsen pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 55439ff Add new log field for negotiated ALPN Protocol ID with the client (#7491) add df01ace slice/handleFirstServerHeader: return sooner on requested range errors (#7486) No new revisions were added by this update. Summary of changes: plugins/experimental/slice/Range.h | 2 +- plugins/experimental/slice/server.cc| 16 +--- tests/gold_tests/pluginTest/slice/slice.test.py | 9 + 3 files changed, 15 insertions(+), 12 deletions(-)
[trafficserver] branch 9.1.x updated: Updated ChangeLog
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.1.x by this push: new b7e9d9c Updated ChangeLog b7e9d9c is described below commit b7e9d9cf022d7799d97643830aca3750ba3603da Author: Leif Hedstrom AuthorDate: Fri Feb 12 08:59:32 2021 -0700 Updated ChangeLog --- CHANGELOG-9.1.0 | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG-9.1.0 b/CHANGELOG-9.1.0 index 065f53e..7dba524 100644 --- a/CHANGELOG-9.1.0 +++ b/CHANGELOG-9.1.0 @@ -113,7 +113,6 @@ Changes with Apache Traffic Server 9.1.0 #6858 - Make HostDBInfo class safer to use. #6870 - Generalize SNI support #6875 - Fix for Ubuntu 16 and Clang 5 - #6893 - AuTest: Pipfile update to use microserver 1.0.5 #6897 - Test connection timeout and retries #6905 - Remove two unused includes in HdrHeap.h. #6931 - AuTest: New log and When condition for ATS initialized @@ -153,7 +152,6 @@ Changes with Apache Traffic Server 9.1.0 #7049 - Cleans up various versions checks #7058 - Removes FIXME that is unlikely to be fixed at this point in the project history #7063 - Add an autest testcase for HTTP3 - #7064 - CacheRead: clear dir entry if doc is found to be truncated #7066 - Use system include-style for STL and OpenSSL headers #7067 - tests: gitignore ssl-delay-server binary #7068 - constify Print() methods and other low hanging fruit @@ -214,6 +212,7 @@ Changes with Apache Traffic Server 9.1.0 #7286 - Remove unfinished h2c support #7289 - Enable all h2spec test #7292 - Allow disabling SO_MARK and IP_TOS usage + #7309 - Disable client inactivity timeout while server is processing POST request #7311 - Traffic Dump: Fix stream-id printing after first transaction. #7323 - Updates the Dockerfile with more packages #7325 - AuTest for Split DNS @@ -251,11 +250,8 @@ Changes with Apache Traffic Server 9.1.0 #7405 - Improving session cache performance #7407 - Add synchronization between UDPNetProcessor::UDPBind in main Thread and initialize_thread_for_udp_net in ET_UDP Thread #7409 - Fix clang compiler complaint about an unused parameter in SNIAction. - #7410 - Fix issue with unavailable server retry codes #7412 - LGTM: Remove superfluous const qualifier in return type #7413 - Improvement to lua plugin - #7415 - Fix the Proxy Verifier AuTest extension to handle cert paths correctly - #7421 - Change comment handling for long lines in url_sig plugin #7426 - Add command line utility to help convert remap plugin usage to ATS9. #7427 - Doc: Fix typo in negative_revalidating_lifetime #7429 - Fix parent connect fail segfault @@ -264,12 +260,11 @@ Changes with Apache Traffic Server 9.1.0 #7436 - Cleanup: Remove unused members of NextHopProperty #7439 - API to retrieve NoStore set by plugins #7453 - Cleanup: Add SNIRoutingType - #7454 - Updating to Proxy Verifier v2.0.0 #7455 - Fix Makefile target for creating changelogs #7457 - Fix comment in include/tscore/Filenames.h. - #7460 - Update to the new MicroServer 1.0.6 release #7461 - Do not write to the cache if the plugin decides not to write - #7463 - Fixing compress expectation for new microserver #7466 - Change atoi to atol, causing obvious issues on what needs to be int64's #7468 - Proxy Verifier: Making use of delay directives for caching tests. #7469 - Update AuTest version update directions for pipenv + #7473 - Adjust so transfer-encoding header can be treated hop-by-hop + #7502 - traffic_dump: AuTests to use Proxy Verifier.
[trafficserver] branch 9.0.x updated: Updated ChangeLog
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.0.x by this push: new de6d269 Updated ChangeLog de6d269 is described below commit de6d26928029aae8c19a1d9e26974d307555ea12 Author: Leif Hedstrom AuthorDate: Fri Feb 12 08:57:00 2021 -0700 Updated ChangeLog --- CHANGELOG-9.0.1 | 8 1 file changed, 8 insertions(+) diff --git a/CHANGELOG-9.0.1 b/CHANGELOG-9.0.1 index 7df1fea..ac89310 100644 --- a/CHANGELOG-9.0.1 +++ b/CHANGELOG-9.0.1 @@ -2,7 +2,9 @@ Changes with Apache Traffic Server 9.0.1 #6302 - Simple and miscellaneous fixes/additions for lua plugin #6691 - Slice plugin: self heal when asset etag/last-modified block mismatches #6860 - Make format specifier for time_t portable + #6893 - AuTest: Pipfile update to use microserver 1.0.5 #6919 - slice: clean up 502 header/body generation. + #7064 - CacheRead: clear dir entry if doc is found to be truncated #7158 - Fix lua plugin mem leak problem #7257 - slice: default to throttling, fixes to manufactured 416 responses. #7259 - detect and fix stms log field having epoch time ms for intercept plugins. @@ -13,6 +15,7 @@ Changes with Apache Traffic Server 9.0.1 #7395 - Replace ::exit() with _exit() to avoid secondary cleanup cores #7410 - Fix issue with unavailable server retry codes #7414 - Remove the warning messages + #7415 - Fix the Proxy Verifier AuTest extension to handle cert paths correctly #7416 - Enhancements for compress plugin #7420 - Update documentation for TSSslSessionInsert #7421 - Change comment handling for long lines in url_sig plugin @@ -21,4 +24,9 @@ Changes with Apache Traffic Server 9.0.1 #7435 - Slice: 9.0.x back port of self healing and throttle by default #7437 - Small fix to regex_remap PR # 7347. #7443 - Change squid log code for self looping + #7454 - Updating to Proxy Verifier v2.0.0 + #7460 - Update to the new MicroServer 1.0.6 release + #7463 - Fixing compress expectation for new microserver + #7493 - AuTest: Upgrade to Proxy Verifier 2.0.2 + #7506 - Fixed build issues with Fedora 34 #7507 - Fixing DNS local_ipv* config option
[trafficserver] branch 9.1.x updated: Disable client inactivity timeout while server is processing POST request (#7309)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new a6cd433 Disable client inactivity timeout while server is processing
POST request (#7309)
a6cd433 is described below
commit a6cd433bdcb31071571b4f8164daa546d415b488
Author: Susan Hinrichs
AuthorDate: Thu Feb 11 16:34:36 2021 -0600
Disable client inactivity timeout while server is processing POST request
(#7309)
(cherry picked from commit f3eaf814753ef7dfa72e7b18f310a1a94052eb15)
---
proxy/http/HttpSM.cc | 27 ++
tests/gold_tests/timeout/case-inactive1.sh | 19
tests/gold_tests/timeout/case-inactive2.sh | 19
tests/gold_tests/timeout/case-inactive3.sh | 19
tests/gold_tests/timeout/case-inactive4.sh | 19
tests/gold_tests/timeout/case-inactive5.sh | 19
tests/gold_tests/timeout/case-inactive6.sh | 19
tests/gold_tests/timeout/delay-inactive-server.sh | 20
.../timeout/inactive_client_post_timeout.test.py | 108 +
9 files changed, 251 insertions(+), 18 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 2648131..66f3c92 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2007,28 +2007,13 @@ HttpSM::state_read_server_response_header(int event,
void *data)
// Now that we know that we have all of the origin server
// response headers, we can reset the client inactivity
-// timeout. This is unlikely to cause a recurrence of
-// old bug because there will be no more retries now that
-// the connection has been established. It is possible
-// however. We do not need to reset the inactivity timeout
-// if the request contains a body (noted by the
-// request_content_length field) because it was never
-// canceled.
-//
-
+// timeout.
// we now reset the client inactivity timeout only
// when we are ready to send the response headers. In the
// case of transform plugin, this is after the transform
// outputs the 1st byte, which can take a long time if the
// plugin buffers the whole response.
-// Also, if the request contains a body, we cancel the timeout
-// when we read the 1st byte of the origin server response.
-/*
- if (ua_txn && !t_state.hdr_info.request_content_length) {
- ua_txn->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(
- HttpConfig::m_master.accept_no_activity_timeout));
- }
- */
+
ua_txn->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_no_activity_timeout_in));
t_state.current.state = HttpTransact::CONNECTION_ALIVE;
t_state.transact_return_point = HttpTransact::HandleResponse;
@@ -3581,7 +3566,13 @@ HttpSM::tunnel_handler_post_ua(int event,
HttpTunnelProducer *p)
}
}
-// Initiate another read to catch aborts and timeouts.
+// Now that we have communicated the post body, turn off the inactivity
timeout
+// until the server starts sending data back
+if (ua_txn && t_state.hdr_info.request_content_length) {
+ ua_txn->cancel_inactivity_timeout();
+}
+
+// Initiate another read to catch aborts
ua_entry->vc_handler = ::state_watch_for_client_abort;
ua_entry->read_vio = p->vc->do_io_read(this, INT64_MAX,
ua_buffer_reader->mbuf);
break;
diff --git a/tests/gold_tests/timeout/case-inactive1.sh
b/tests/gold_tests/timeout/case-inactive1.sh
new file mode 100644
index 000..ecee593
--- /dev/null
+++ b/tests/gold_tests/timeout/case-inactive1.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 -4 -l ${2} -c "sh ./delay-inactive-server.sh" &
+sleep 1
+curl -i http://127.0.0.1:${1}/${3}
diff --git a/tests/gold_tests/timeout/case-inactive2.sh
b/tests/gold_tests/timeout/case-inactive2.sh
new file mode 100644
index 000..d172741
--- /dev/null
+++ b/tests/gold_tests/timeout/case-inactive2.sh
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under
[trafficserver] branch 9.1.x updated: Adjust so transfer-encoding header can be treated hop-by-hop (#7473)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new 6730b86 Adjust so transfer-encoding header can be treated hop-by-hop
(#7473)
6730b86 is described below
commit 6730b866e91270c355e601d2d8a03a81104cada4
Author: Susan Hinrichs
AuthorDate: Thu Feb 4 16:57:57 2021 -0600
Adjust so transfer-encoding header can be treated hop-by-hop (#7473)
(cherry picked from commit 926dd71b32ade8615fbba6737816240d6df0c9ad)
---
proxy/hdrs/HdrToken.cc | 3 +-
proxy/http/HttpSM.cc | 17 ++--
proxy/http/HttpTransact.cc | 50 ++
proxy/http/HttpTransact.h | 2 +
.../chunked_encoding/chunked_encoding.test.py | 1 -
tests/gold_tests/h2/http2.test.py | 4 +-
6 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 5ea3b4f..5fe2280 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -228,7 +228,8 @@ static HdrTokenFieldInfo
_hdrtoken_strs_field_initializers[] = {
{"Subject", MIME_SLOTID_NONE, MIME_PRESENCE_SUBJECT, HTIF_NONE},
{"Summary", MIME_SLOTID_NONE, MIME_PRESENCE_SUMMARY, HTIF_NONE},
{"TE", MIME_SLOTID_TE, MIME_PRESENCE_TE, (HTIF_COMMAS | HTIF_MULTVALS |
HTIF_HOPBYHOP)},
- {"Transfer-Encoding", MIME_SLOTID_TRANSFER_ENCODING,
MIME_PRESENCE_TRANSFER_ENCODING, (HTIF_COMMAS | HTIF_MULTVALS)},
+ {"Transfer-Encoding", MIME_SLOTID_TRANSFER_ENCODING,
MIME_PRESENCE_TRANSFER_ENCODING,
+ (HTIF_COMMAS | HTIF_MULTVALS | HTIF_HOPBYHOP)},
{"Upgrade", MIME_SLOTID_NONE, MIME_PRESENCE_UPGRADE, (HTIF_COMMAS |
HTIF_MULTVALS | HTIF_HOPBYHOP)},
{"User-Agent", MIME_SLOTID_USER_AGENT, MIME_PRESENCE_USER_AGENT, HTIF_NONE},
{"Vary", MIME_SLOTID_VARY, MIME_PRESENCE_VARY, (HTIF_COMMAS |
HTIF_MULTVALS)},
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 650107e..2648131 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2073,8 +2073,7 @@ HttpSM::state_send_server_request_header(int event, void
*data)
free_MIOBuffer(server_entry->write_buffer);
server_entry->write_buffer = nullptr;
method =
t_state.hdr_info.server_request.method_get_wksidx();
-if (!t_state.api_server_request_body_set && method != HTTP_WKSIDX_TRACE &&
-(t_state.hdr_info.request_content_length > 0 ||
t_state.client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING)) {
+if (!t_state.api_server_request_body_set && method != HTTP_WKSIDX_TRACE &&
HttpTransact::has_request_body(_state, ua_txn)) {
if (post_transform_info.vc) {
setup_transform_to_server_transfer();
} else {
@@ -5792,7 +5791,8 @@ close_connection:
void
HttpSM::do_setup_post_tunnel(HttpVC_t to_vc_type)
{
- bool chunked = (t_state.client_info.transfer_encoding ==
HttpTransact::CHUNKED_ENCODING);
+ bool chunked = t_state.client_info.transfer_encoding ==
HttpTransact::CHUNKED_ENCODING ||
+ t_state.hdr_info.request_content_length == HTTP_UNDEFINED_CL;
bool post_redirect = false;
HttpTunnelProducer *p = nullptr;
@@ -6129,6 +6129,17 @@ HttpSM::attach_server_session(PoolableSession *s)
server_session->set_inactivity_timeout(get_server_connect_timeout());
server_session->set_active_timeout(get_server_active_timeout());
+ // Do we need Transfer_Encoding?
+ if (HttpTransact::has_request_body(_state, ua_txn)) {
+// See if we need to insert a chunked header
+if
(!t_state.hdr_info.server_request.presence(MIME_PRESENCE_CONTENT_LENGTH)) {
+ // Stuff in a TE setting so we treat this as chunked, sort of.
+ t_state.server_info.transfer_encoding = HttpTransact::CHUNKED_ENCODING;
+
t_state.hdr_info.server_request.value_append(MIME_FIELD_TRANSFER_ENCODING,
MIME_LEN_TRANSFER_ENCODING, HTTP_VALUE_CHUNKED,
+ HTTP_LEN_CHUNKED, true);
+}
+ }
+
if (plugin_tunnel_type != HTTP_NO_PLUGIN_TUNNEL || will_be_private_ss) {
SMDebug("http_ss", "Setting server session to private");
server_session->set_private();
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index b89d7f4..279c532 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1501,8 +1501,7 @@ HttpTransact::HandleRequest(State *s)
}
}
}
-if (s->txn_conf->request_buffer_enabled &&
-(s->hdr_info.request_content_length > 0 ||
s->client_info.transfer_encoding == CHUNKED_ENCODING)) {
+if (s->txn_conf->request_buffer_enabled && has_request_body(s,
s->state_machine->ua_txn)) {
TRANSACT_RETURN(SM_ACTION_WAIT_FOR_FULL_BODY, nullptr);
}
}
@@ -5351,8 +5350,11 @@
[trafficserver] branch 9.1.x updated: traffic_dump: AuTests to use Proxy Verifier. (#7502)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new 3367566 traffic_dump: AuTests to use Proxy Verifier. (#7502)
3367566 is described below
commit 3367566a3f776de7efa019b03afdf57c049d78b2
Author: Brian Neradt
AuthorDate: Tue Feb 9 10:58:22 2021 -0600
traffic_dump: AuTests to use Proxy Verifier. (#7502)
This converts the Traffic Dump AuTests to use Proxy Verifier instead of
curl and microserver.
(cherry picked from commit 03455f18718f8045b419a70bfe0b84e0a638e19a)
---
.../traffic_dump/replay/traffic_dump.yaml | 335 +
.../traffic_dump/replay/various_sni.yaml | 112 +++
.../traffic_dump/ssl/server_combined.pem | 49 +++
.../pluginTest/traffic_dump/traffic_dump.test.py | 229 +++---
.../traffic_dump/traffic_dump_sni_filter.test.py | 82 ++---
5 files changed, 553 insertions(+), 254 deletions(-)
diff --git a/tests/gold_tests/pluginTest/traffic_dump/replay/traffic_dump.yaml
b/tests/gold_tests/pluginTest/traffic_dump/replay/traffic_dump.yaml
new file mode 100644
index 000..2a55a49
--- /dev/null
+++ b/tests/gold_tests/pluginTest/traffic_dump/replay/traffic_dump.yaml
@@ -0,0 +1,335 @@
+# 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.
+
+meta:
+ version: "1.0"
+
+ blocks:
+ - 200_ok_response: &200_ok_response
+ server-response:
+status: 200
+reason: OK
+headers:
+ fields:
+ - [ Content-Length, 16 ]
+ - [ Connection, close ]
+
+sessions:
+- transactions:
+ - client-request:
+ method: GET
+ url: /one
+ version: 1.1
+ headers:
+fields:
+- [ Host, www.notls.com ]
+- [ X-Request-1, ultra_sensitive ]
+- [ Content-Length, 0 ]
+- [ uuid, 1 ]
+
+proxy-request:
+ headers:
+fields:
+# The field should get through to the server. The traffic dump, though,
+# should not contain it since x-request-1 is a sensitive field.
+- [ X-Request-1, { value: ultra_sensitive, as: equal } ]
+
+server-response:
+ status: 200
+ reason: OK
+ headers:
+fields:
+- [ Content-Length, 16 ]
+- [ Set-Cookie, classified_not_for_logging ]
+
+proxy-response:
+ status: 200
+ headers:
+field:
+# Again, the sensitive set-cookie should get through to the client, it
+# just shouldn't be dumped in traffic dumps.
+- [ Set-Cookie, { value: classified_not_for_logging, as: equal } ]
+
+- transactions:
+ - client-request:
+ method: GET
+ url: /two
+ version: 1.1
+ headers:
+fields:
+- [ Host, www.notls.com ]
+- [ X-Request-2, also_very_sensitive ]
+- [ Content-Length, 0 ]
+- [ uuid, 2 ]
+
+proxy-request:
+ headers:
+fields:
+# The field should get through to the server. The traffic dump, though,
+# should not contain it since x-request-1 is a sensitive field.
+- [ X-Request-2, { value: also_very_sensitive, as: equal } ]
+
+server-response:
+ status: 200
+ reason: OK
+ headers:
+fields:
+- [ Content-Length, 16 ]
+- [ Set-Cookie, classified_not_for_logging ]
+
+proxy-response:
+ status: 200
+ headers:
+field:
+# Again, the sensitive set-cookie should get through to the client, it
+# just shouldn't be dumped in traffic dumps.
+- [ Set-Cookie, { value: classified_not_for_logging, as: equal } ]
+
+- transactions:
+ - client-request:
+ method: GET
+ url: "http://www.some.host.com/candy;
+ version: 1.1
+ headers:
+fields:
+- [ Host, www.some.host.com ]
+- [ Content-Length, 0 ]
+- [ uuid, 3 ]
+
+proxy-request:
+ # Having a mismatch in the Host header and the request target is
+ # malformed. ATS, by default, deals with this by choosing the host from
+ # the request target, making that the Host header value, and then
+
[trafficserver] branch 9.1.x updated: AuTest: Upgrade to Proxy Verifier 2.0.2 (#7493)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new e98b567 AuTest: Upgrade to Proxy Verifier 2.0.2 (#7493)
e98b567 is described below
commit e98b56779017df0ef3d7b6475d79cdb47f1f
Author: Brian Neradt
AuthorDate: Mon Feb 8 15:12:14 2021 -0600
AuTest: Upgrade to Proxy Verifier 2.0.2 (#7493)
(cherry picked from commit 29f63ee290a21642e6d6790a86452715b6f38f84)
---
tests/prepare_proxy_verifier.sh | 2 +-
tests/proxy-verifier-version.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/prepare_proxy_verifier.sh b/tests/prepare_proxy_verifier.sh
index 06a2faa..4a7a854 100755
--- a/tests/prepare_proxy_verifier.sh
+++ b/tests/prepare_proxy_verifier.sh
@@ -27,7 +27,7 @@ pv_dir="${pv_name}-${pv_version}"
pv_tar_filename="${pv_dir}.tar.gz"
pv_tar="${pv_top_dir}/${pv_tar_filename}"
pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename};
-expected_sha1="f644ac9838ba74e674b9efe7e7b3d244037faf21"
+expected_sha1="fe12c70785dead024621a6d8ec9f9925a32123f9"
pv_client="${bin_dir}/verifier-client"
pv_server="${bin_dir}/verifier-server"
TAR=${TAR:-tar}
diff --git a/tests/proxy-verifier-version.txt b/tests/proxy-verifier-version.txt
index 46b105a..f3b15f3 100644
--- a/tests/proxy-verifier-version.txt
+++ b/tests/proxy-verifier-version.txt
@@ -1 +1 @@
-v2.0.0
+v2.0.2
[trafficserver] branch 9.0.x updated: AuTest: Upgrade to Proxy Verifier 2.0.2 (#7493)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4c8ead56 AuTest: Upgrade to Proxy Verifier 2.0.2 (#7493)
4c8ead56 is described below
commit 4c8ead565885307c571de5a2f549740dd5ef6992
Author: Brian Neradt
AuthorDate: Mon Feb 8 15:12:14 2021 -0600
AuTest: Upgrade to Proxy Verifier 2.0.2 (#7493)
(cherry picked from commit 29f63ee290a21642e6d6790a86452715b6f38f84)
---
tests/prepare_proxy_verifier.sh | 2 +-
tests/proxy-verifier-version.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/prepare_proxy_verifier.sh b/tests/prepare_proxy_verifier.sh
index 06a2faa..4a7a854 100755
--- a/tests/prepare_proxy_verifier.sh
+++ b/tests/prepare_proxy_verifier.sh
@@ -27,7 +27,7 @@ pv_dir="${pv_name}-${pv_version}"
pv_tar_filename="${pv_dir}.tar.gz"
pv_tar="${pv_top_dir}/${pv_tar_filename}"
pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename};
-expected_sha1="f644ac9838ba74e674b9efe7e7b3d244037faf21"
+expected_sha1="fe12c70785dead024621a6d8ec9f9925a32123f9"
pv_client="${bin_dir}/verifier-client"
pv_server="${bin_dir}/verifier-server"
TAR=${TAR:-tar}
diff --git a/tests/proxy-verifier-version.txt b/tests/proxy-verifier-version.txt
index 46b105a..f3b15f3 100644
--- a/tests/proxy-verifier-version.txt
+++ b/tests/proxy-verifier-version.txt
@@ -1 +1 @@
-v2.0.0
+v2.0.2
[trafficserver] branch 9.0.x updated: Updating to Proxy Verifier v2.0.0 (#7454)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7eb4e48 Updating to Proxy Verifier v2.0.0 (#7454)
7eb4e48 is described below
commit 7eb4e48eaff518e71aeeb2c1357a41d645350535
Author: Brian Neradt
AuthorDate: Mon Feb 1 15:59:00 2021 -0600
Updating to Proxy Verifier v2.0.0 (#7454)
We will want to use Proxy Verifier v2.0.0 for it's delayed transaction
and HTTP/2 to server capabilities. This updates the AuTest extensions to
properly handle the new version.
(cherry picked from commit 8dc2cbeff127283e830dfc676d10d6e9570dcff5)
Conflicts:
ci/jenkins/bin/autest.sh
NOTE: I had to copy over all of ci/jenkins/bin from master into this PR,
because it got maddening with all the merge conflicts. The CI jenkins
scripts were never meant to be backported, and somehow we started
including the Jenkins scripts changes into regular PRs.
---
ci/jenkins/bin/autest.sh | 34 +--
ci/jenkins/bin/build.sh| 15 +--
ci/jenkins/bin/cache-tests.sh | 15 ---
ci/jenkins/bin/clang-analyzer.sh | 8 +---
ci/jenkins/bin/clang-format.sh | 37 +---
ci/jenkins/bin/cleanup.sh | 7 ++-
ci/jenkins/bin/docs.sh | 13 +-
ci/jenkins/bin/environment.sh | 51 ++
ci/jenkins/bin/extract.sh | 10 ++---
ci/jenkins/bin/gh-mirror.sh| 6 ++-
ci/jenkins/bin/github.sh | 26 ---
ci/jenkins/bin/regression.sh | 16 +--
tests/gold_tests/autest-site/conditions.test.ext | 4 ++
tests/gold_tests/autest-site/setup.cli.ext | 21 -
.../autest-site/verifier_client.test.ext | 13 --
.../autest-site/verifier_server.test.ext | 17 +---
tests/prepare_proxy_verifier.sh| 8 ++--
tests/proxy-verifier-version.txt | 1 +
18 files changed, 222 insertions(+), 80 deletions(-)
diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh
index 7df0372..7ec18ee 100755
--- a/ci/jenkins/bin/autest.sh
+++ b/ci/jenkins/bin/autest.sh
@@ -19,8 +19,10 @@
set +x
cd src
+sleep 30
-if [ ! -z "$ghprbActualCommit" ]; then
+git branch --contains ${ghprbActualCommit} > /dev/null
+if [ $? = 0 -a ! -z "$ghprbActualCommit" ]; then
git diff ${ghprbActualCommit}^...${ghprbActualCommit} --name-only | egrep
-E '^(build|iocore|proxy|tests|include|mgmt|plugins|proxy|src)/' > /dev/null
if [ $? = 1 ]; then
echo "No relevant files changed, skipping run"
@@ -44,6 +46,9 @@ URL="https://ci.trafficserver.apache.org/autest;
JOB_ID=${ghprbPullId:-${ATS_BRANCH:-master}}
AUSB="ausb-${JOB_ID}.${BUILD_NUMBER}"
SANDBOX="/var/tmp/${AUSB}"
+PROXY_VERIFIER_VERSIONS="/home/jenkins/proxy-verifier"
+PROXY_VERIFIER_VERSION_FILE="tests/proxy-verifier-version.txt"
+PROXY_VERIFIER_PREPARE="tests/prepare_proxy_verifier.sh"
# Optional settings
CCACHE=""
@@ -55,6 +60,7 @@ QUIC=""
CURL=""
AUTEST_DEBUG=""
AUTEST_VERBOSE=""
+PROXY_VERIFIER_ARGUMENT=""
[ "1" == "$enable_ccache" ] && CCACHE="--enable-ccache"
[ "1" == "$enable_werror" ] && WERROR="--enable-werror"
@@ -84,7 +90,8 @@ set -x
# Configure
autoreconf -if
-./configure --prefix="${INSTALL}" \
+./configure \
+--prefix="${INSTALL}" \
--with-user=jenkins \
--enable-experimental-plugins \
--enable-example-plugins \
@@ -105,7 +112,28 @@ set +x
echo -n "=== Started on "
date
-./tests/autest.sh --sandbox "$SANDBOX" --ats-bin "${INSTALL}/bin"
$AUTEST_DEBUG $AUTEST_VERBOSE
+AUTEST="/usr/bin/autest"
+[ ! -x ${AUTEST} ] && AUTEST="/usr/local/bin/autest"
+set -x
+
+pv_version=""
+if [ -f "${PROXY_VERIFIER_VERSION_FILE}" ]; then
+ pv_version=`cat "${PROXY_VERIFIER_VERSION_FILE}"`
+elif [ -f "${PROXY_VERIFIER_PREPARE}" ]; then
+ pv_version=`awk -F'"' '/^pv_version/ {print $2}' "${PROXY_VERIFIER_PREPARE}"`
+fi
+if [ "x${pv_version}" != "x" ]; then
+ PROXY_VERIFIER_BIN="${PROXY_VERIFIER_VERSIONS}/${pv_version}/bin"
+ PROXY_VERIFIER_ARGUMENT="--proxy-verifier-bin ${PROXY_VERIFIER_BIN}"
+fi
+
+${AUTEST} \
+-D ./tests/gold_tests \
+--sandbox "$SANDBOX" \
+--ats-bin "${INSTALL}/bin" \
+$PROXY_VERIFIER_ARGUMENT \
+$AUTEST_DEBUG \
+$AUTEST_VERBOSE
status=$?
set +x
diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh
index 9a9fd35..93d2328 100755
--- a/ci/jenkins/bin/build.sh
+++ b/ci/jenkins/bin/build.sh
@@ -28,24 +28,33 @@ CCACHE="--enable-ccache"
# When to enable -Werror
WERROR="--enable-werror"
+# Optional settings
+ASAN=""
+[ "1" == "$enable_asan" ] &&
[trafficserver] branch 9.0.x updated: Fixing compress expectation for new microserver (#7463)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.0.x by this push: new f6258ff Fixing compress expectation for new microserver (#7463) f6258ff is described below commit f6258ffdecc7f232425114dc181ad2ffdc8c5493 Author: Brian Neradt AuthorDate: Fri Jan 29 19:17:22 2021 -0600 Fixing compress expectation for new microserver (#7463) The new 1.0.6 microserver generates a body such that the content length for it is 71 instead of 30 for one of the tests. Updating the gold file to match this expectation. (cherry picked from commit 0e9d179c69e486239d7134947ac2e0879469413f) --- tests/gold_tests/pluginTest/compress/compress.gold | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gold_tests/pluginTest/compress/compress.gold b/tests/gold_tests/pluginTest/compress/compress.gold index 5067978..fcb 100644 --- a/tests/gold_tests/pluginTest/compress/compress.gold +++ b/tests/gold_tests/pluginTest/compress/compress.gold @@ -184,5 +184,5 @@ < Content-Type: text/javascript < Content-Encoding: gzip < Vary: Accept-Encoding -< Content-Length: 30 +< Content-Length: 71 ===
[trafficserver] branch 9.0.x updated: Fixed build issues with Fedora 34 (#7506)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.0.x by this push: new df22eea Fixed build issues with Fedora 34 (#7506) df22eea is described below commit df22eea5b16b6d2ce92d069ed0b630fbeeadf76e Author: Bryan Call AuthorDate: Tue Feb 9 15:38:43 2021 -0800 Fixed build issues with Fedora 34 (#7506) (cherry picked from commit ef21e325420a0e94548caefa24bee66e4ec43fca) --- include/tscore/Extendible.h | 1 + include/tscpp/util/TextView.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/tscore/Extendible.h b/include/tscore/Extendible.h index 2ac826f..39b636f 100644 --- a/include/tscore/Extendible.h +++ b/include/tscore/Extendible.h @@ -44,6 +44,7 @@ #include #include #include +#include #include "tscore/AtomicBit.h" #include "tscore/ink_assert.h" diff --git a/include/tscpp/util/TextView.h b/include/tscpp/util/TextView.h index bf0f8ae..eee9c36 100644 --- a/include/tscpp/util/TextView.h +++ b/include/tscpp/util/TextView.h @@ -32,6 +32,7 @@ #include #include #include +#include /** Compare views with ordering, ignoring case. *
[trafficserver] branch 9.1.x updated: Fixed build issues with Fedora 34 (#7506)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/9.1.x by this push: new a653f1f Fixed build issues with Fedora 34 (#7506) a653f1f is described below commit a653f1f65e51a92e7bbebb4c84f292175d3fbfbc Author: Bryan Call AuthorDate: Tue Feb 9 15:38:43 2021 -0800 Fixed build issues with Fedora 34 (#7506) (cherry picked from commit ef21e325420a0e94548caefa24bee66e4ec43fca) --- include/tscore/Extendible.h | 1 + include/tscpp/util/TextView.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/tscore/Extendible.h b/include/tscore/Extendible.h index ea94a74..2fbfb7a 100644 --- a/include/tscore/Extendible.h +++ b/include/tscore/Extendible.h @@ -44,6 +44,7 @@ #include #include #include +#include #include "tscore/AtomicBit.h" #include "tscore/ink_assert.h" diff --git a/include/tscpp/util/TextView.h b/include/tscpp/util/TextView.h index 27b09d9..b3b1eff 100644 --- a/include/tscpp/util/TextView.h +++ b/include/tscpp/util/TextView.h @@ -32,6 +32,7 @@ #include #include #include +#include /** Compare views with ordering, ignoring case. *
[trafficserver] branch 9.0.x updated: CacheRead: clear dir entry if doc is found to be truncated (#7064)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 253e488 CacheRead: clear dir entry if doc is found to be truncated
(#7064)
253e488 is described below
commit 253e488e6c2e4bb05b1019a7683bfe3dd1e53e57
Author: Brian Olsen
AuthorDate: Fri Jan 29 06:17:40 2021 -0700
CacheRead: clear dir entry if doc is found to be truncated (#7064)
(cherry picked from commit dd71b9d9fefa5a5de7a6dc68eb3f6b13ff341afa)
---
iocore/cache/CacheRead.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 6c89987..7cf8064 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -563,7 +563,6 @@ CacheVC::openReadReadDone(int event, Event *e)
VC_SCHED_LOCK_RETRY();
}
if (event == AIO_EVENT_DONE && !io.ok()) {
- dir_delete(_key, vol, _dir);
goto Lerror;
}
if (last_collision && // no missed lock
@@ -621,10 +620,11 @@ Lerror : {
if (request.valid()) {
int url_length;
const char *url_text = request.url_get()->string_get_ref(_length);
-Warning("Document %s truncated, url[%.*s]",
earliest_key.toHexStr(tmpstring), url_length, url_text);
+Warning("Document %s truncated, url[%.*s] .. clearing",
earliest_key.toHexStr(tmpstring), url_length, url_text);
} else {
-Warning("Document %s truncated", earliest_key.toHexStr(tmpstring));
+Warning("Document %s truncated .. clearing",
earliest_key.toHexStr(tmpstring));
}
+ dir_delete(_key, vol, _dir);
return calluser(VC_EVENT_ERROR);
}
Ldone:
[trafficserver] 02/03: AuTest: Pipfile update to use microserver 1.0.5 (#6893)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit f10702f1de5056d6a6ed1dcc5086c588013429a9 Author: Brian Neradt AuthorDate: Fri Jun 12 17:02:04 2020 -0500 AuTest: Pipfile update to use microserver 1.0.5 (#6893) The latest version of microserver applies SO_REUSEADDR on the socket it binds to. This will hopefully address the flaky behavior we've seen with the tls tests. Co-authored-by: bneradt (cherry picked from commit e657d3a55c55f33b4b3c586728d2bf875cdb1202) --- tests/Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Pipfile b/tests/Pipfile index 6cb1013..e40e3b2 100644 --- a/tests/Pipfile +++ b/tests/Pipfile @@ -32,7 +32,7 @@ dnslib = "*" requests = "*" gunicorn = "*" httpbin = "*" -microserver = ">=1.0.4" +microserver = ">=1.0.5" jsonschema = "*" python-jose = "*"
[trafficserver] 03/03: Update to the new MicroServer 1.0.6 release (#7460)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit 4af967993adfa2d0b554f8195b0372afac1cbe1a Author: Brian Neradt AuthorDate: Fri Jan 29 13:50:03 2021 -0600 Update to the new MicroServer 1.0.6 release (#7460) The new MicroServer 1.0.6 release has the following: 1. Fixes a bug in response body generation to POST requests. 2. Implements the handling of non-existent parts of keys in transactions. (cherry picked from commit bcbf09906f45f481a70d2a00536066547b9c7f81) --- tests/Pipfile | 2 +- tests/gold_tests/h2/gold/post_chunked.gold | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Pipfile b/tests/Pipfile index e40e3b2..727ea1e 100644 --- a/tests/Pipfile +++ b/tests/Pipfile @@ -32,7 +32,7 @@ dnslib = "*" requests = "*" gunicorn = "*" httpbin = "*" -microserver = ">=1.0.5" +microserver = ">=1.0.6" jsonschema = "*" python-jose = "*" diff --git a/tests/gold_tests/h2/gold/post_chunked.gold b/tests/gold_tests/h2/gold/post_chunked.gold index 0ff06d1..ad47100 100644 --- a/tests/gold_tests/h2/gold/post_chunked.gold +++ b/tests/gold_tests/h2/gold/post_chunked.gold @@ -1 +1 @@ -ab \ No newline at end of file +0123456789 \ No newline at end of file
[trafficserver] branch 9.0.x updated (0b4ac11 -> 4af9679)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 0b4ac11 Updated ChangeLog new 306f3cc Fix the Proxy Verifier AuTest extension to handle cert paths correctly (#7415) new f10702f AuTest: Pipfile update to use microserver 1.0.5 (#6893) new 4af9679 Update to the new MicroServer 1.0.6 release (#7460) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: tests/Pipfile | 2 +- tests/gold_tests/autest-site/verifier_client.test.ext | 12 tests/gold_tests/autest-site/verifier_server.test.ext | 13 + tests/gold_tests/h2/gold/post_chunked.gold| 2 +- 4 files changed, 11 insertions(+), 18 deletions(-)
[trafficserver] 01/03: Fix the Proxy Verifier AuTest extension to handle cert paths correctly (#7415)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 306f3cc5e326f7fbaca613f1bf6e1e877ac87c91
Author: Brian Neradt
AuthorDate: Tue Jan 19 15:50:39 2021 -0600
Fix the Proxy Verifier AuTest extension to handle cert paths correctly
(#7415)
None of our current AuTests use Proxy Verifier for TLS connections, but
if they do they'll need this fix to correctly copy down and reference
the needed certs in the Proxy Verifier invocations.
(cherry picked from commit e7dc28784bfa9f42afffc3b1ceffed905f0d282d)
---
tests/gold_tests/autest-site/verifier_client.test.ext | 12
tests/gold_tests/autest-site/verifier_server.test.ext | 13 +
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/tests/gold_tests/autest-site/verifier_client.test.ext
b/tests/gold_tests/autest-site/verifier_client.test.ext
index 5d96fff..41ef41a 100755
--- a/tests/gold_tests/autest-site/verifier_client.test.ext
+++ b/tests/gold_tests/autest-site/verifier_client.test.ext
@@ -78,10 +78,8 @@ def _configure_client(obj, process, name, replay_path,
http_ports=None,
raise ValueError("Tried to use '{}' for --client-cert, but it
is not "
"a valid file.".format(ssl_cert))
if ssl_cert:
-run_ssl_cert = ssl_cert
-if os.path.isfile(ssl_cert):
-run_ssl_cert = os.path.join(client_dir,
os.path.basename(ssl_cert))
-process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
+run_ssl_cert = os.path.join(client_dir, os.path.basename(ssl_cert))
+process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
command += ' --client-cert "{}" '.format(run_ssl_cert)
if ca_cert == '':
@@ -92,10 +90,8 @@ def _configure_client(obj, process, name, replay_path,
http_ports=None,
raise ValueError("Tried to use '{}' for --ca-certs, but it is
not "
"a valid file.".format(ca_cert))
if ca_cert:
-run_ca_cert = ca_cert
-if os.path.isfile(ca_cert):
-run_ca_cert = os.path.join(client_dir,
os.path.basename(ca_cert))
-process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
+run_ca_cert = os.path.join(client_dir, os.path.basename(ca_cert))
+process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
command += ' --ca-certs "{}" '.format(run_ca_cert)
if other_args:
diff --git a/tests/gold_tests/autest-site/verifier_server.test.ext
b/tests/gold_tests/autest-site/verifier_server.test.ext
index 3852e22..3fd7f44 100755
--- a/tests/gold_tests/autest-site/verifier_server.test.ext
+++ b/tests/gold_tests/autest-site/verifier_server.test.ext
@@ -78,10 +78,8 @@ def _configure_server(obj, process, name, replay_path,
http_ports=None, https_po
raise ValueError("Tried to use '{}' for --server-cert, but it
is not "
"a valid file.".format(ssl_cert))
if ssl_cert:
-run_ssl_cert = ssl_cert
-if os.path.isfile(ssl_cert):
-run_ssl_cert = os.path.join(server_dir,
os.path.basename(ssl_cert))
-process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
+run_ssl_cert = os.path.join(server_dir, os.path.basename(ssl_cert))
+process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
command += ' --server-cert "{}" '.format(run_ssl_cert)
if ca_cert == '':
@@ -92,10 +90,8 @@ def _configure_server(obj, process, name, replay_path,
http_ports=None, https_po
raise ValueError("Tried to use '{}' for --ca-certs, but it is
not "
"a valid file.".format(ca_cert))
if ca_cert:
-run_ca_cert = ca_cert
-if os.path.isfile(ca_cert):
-run_ca_cert = os.path.join(server_dir,
os.path.basename(ca_cert))
-process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
+run_ca_cert = os.path.join(server_dir, os.path.basename(ca_cert))
+process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
command += ' --ca-certs "{}" '.format(run_ca_cert)
if replay_path:
@@ -103,6 +99,7 @@ def _configure_server(obj, process, name, replay_path,
http_ports=None, https_po
run_replay_path = os.path.join(server_dir,
os.path.basename(replay_path))
process.Setup.Copy(replay_path, run_replay_path, CopyLogic.SoftFiles)
command += "{} ".format(run_replay_path)
+
if other_args:
command += "{} ".format(other_args)
process.Command = command
