(trafficserver-ci) branch main updated (248b51c -> c26e3cf)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git from 248b51c Add --privileged to github autest docker container (#349) add 72442eb Add PRB of CI Rocky ASan new c26e3cf Merge pull request #348 from masaori335/asan-0 The 1 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: jenkins/github/{rocky.pipeline => rocky-asan.pipeline} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) copy jenkins/github/{rocky.pipeline => rocky-asan.pipeline} (96%)
(trafficserver-ci) 01/01: Merge pull request #348 from masaori335/asan-0
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git commit c26e3cffcf72c653ef00e74383a41de941770296 Merge: 248b51c 72442eb Author: Evan Zelkowitz AuthorDate: Wed May 8 16:41:37 2024 -0600 Merge pull request #348 from masaori335/asan-0 Add PRB of CI Rocky ASan jenkins/github/rocky-asan.pipeline | 113 + 1 file changed, 113 insertions(+)
(trafficserver-site) branch asf-site updated: Add 9.2.4 and 8.1.10
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/trafficserver-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e8e424e Add 9.2.4 and 8.1.10 e8e424e is described below commit e8e424e55fb3c256cc9cb181634ffc7c6890d1e3 Author: Evan Zelkowitz AuthorDate: Wed Apr 3 12:05:01 2024 -0600 Add 9.2.4 and 8.1.10 --- source/markdown/downloads.mdtext | 36 ++-- source/markdown/index.html | 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/source/markdown/downloads.mdtext b/source/markdown/downloads.mdtext index 49c6510..6c2f41e 100644 --- a/source/markdown/downloads.mdtext +++ b/source/markdown/downloads.mdtext @@ -32,36 +32,36 @@ will be needed. You can also [browse through all releases](https://archive.apache.org/dist/trafficserver/) and hash signatures. -# Current v9.x Release -- 9.2.3 # {#9.2.3} +# Current v9.x Release -- 9.2.4 # {#9.2.4} - Apache Traffic Server v9.2.3 was released on October 9th, 2023. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.3.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.3.tar.bz2.sha512)] + Apache Traffic Server v9.2.4 was released on April 3rd, 2024. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.4.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.4.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-9.2.3.tar.bz2; - class="download_ts">Traffic Server 9.2.3 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-9.2.4.tar.bz2; + class="download_ts">Traffic Server 9.2.4 -v9.2.3 is our latest stable release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.3) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:9.2.3). +v9.2.4 is our latest stable release. Additional details for this release are in the +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.4) +and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:9.2.4). For details on the v9.x release, please see [9.2.x News](https://docs.trafficserver.apache.org/en/9.2.x/release-notes/whats-new.en.html) (there's a new section specific to v9.2.x). There are also details about [upgrading to 9.x](https://docs.trafficserver.apache.org/en/9.2.x/release-notes/upgrading.en.html). -# Current v8.x Release -- 8.1.9 # {#8.1.9} +# Current v8.x Release -- 8.1.10 # {#8.1.10} - Apache Traffic Server v8.1.9 was released on October 9th, 2023. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.9.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.9.tar.bz2.sha512)] + Apache Traffic Server v8.1.10 was released on April 3rd, 2024. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.10.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.10.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.9.tar.bz2; - class="download_ts">Traffic Server 8.1.9 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.10.tar.bz2; + class="download_ts">Traffic Server 8.1.10 -v8.1.9 is our latest stable release for the 8.x release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.9) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.9). +v8.1.10 is our latest stable release for the 8.x release. Additional details for this release are in the +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.10) +and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.10). # Archived Releases diff --git a/source/markdown/index.html b/source/markdown/index.html index b455afe..923e0d8 100644 --- a/source/markdown/index.html +++ b/source/markdown/index.html @@ -287,6 +287,7 @@ + April 3, 2024:We are releasing both v9.2.4 and v8.1.10. We recommend everyone to upgrade to one of these versions of ATS. October 9, 2023:We are releasing both v9.2.3 and v8.1.9. We recommend everyone to upgrade to one of these versions of ATS. August 3, 2023: We are releasing both v9.2.2 and v8.1.8 which include security fixes. We recommend everyone to upgrade to one of these versions of ATS. June 12,
svn commit: r68293 - in /release/trafficserver: trafficserver-8.1.10.tar.bz2 trafficserver-8.1.10.tar.bz2.asc trafficserver-8.1.10.tar.bz2.sha512
Author: eze Date: Wed Apr 3 17:57:05 2024 New Revision: 68293 Log: Release 8.1.10 Added: release/trafficserver/trafficserver-8.1.10.tar.bz2 (with props) release/trafficserver/trafficserver-8.1.10.tar.bz2.asc release/trafficserver/trafficserver-8.1.10.tar.bz2.sha512 Added: release/trafficserver/trafficserver-8.1.10.tar.bz2 == Binary file - no diff available. Propchange: release/trafficserver/trafficserver-8.1.10.tar.bz2 -- svn:mime-type = application/octet-stream Added: release/trafficserver/trafficserver-8.1.10.tar.bz2.asc == --- release/trafficserver/trafficserver-8.1.10.tar.bz2.asc (added) +++ release/trafficserver/trafficserver-8.1.10.tar.bz2.asc Wed Apr 3 17:57:05 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmYNepcACgkQRmN2b7bo +5OPUnA//dUqU3IlJwPrji6VI0uwW1wa6uZ8PJkj+pkSUGVFn9GGU2yTgy+ePTtJi +dlSqZRvVD38k1kHzP2rVRWJjKP9W1nWuAoNpFsNP9erUrpmuzCXOmfaHn91T+CqS +2Kn59liJVblUPMTGyUAdZd+pgh8rvrcRDw/qZcU7I2GOAB8MGMFtvAnlRG6PUqDD +QzpUDECI5Hm55Iy9yeByKNCr9PHz0Y8DEe8Zc/pkryVvxdj0ecDIUdS3+zZmedoR +Lv6TJOvGddSVzSaFIDeeWMCbxAyJFpd4beMYqvnfwsCnsLk2v0RWuXCXnOzCFP6d +XEMXlckedpQm2NAw363iyZ4vmSFDMY2dk9VkoqR7WDDockWx1bgT6ajBu63jVzBg +BXbwWcZ0djtUqFuvM01MPoo4RJPSe7JXKRczyQnZo54JWU+IqFOZDaGr24dMvQEt +tIScwjpcpnPpYAYLAyO52Tho5DW2p8GY7k/KF9ItHMms6QVPFE/1auQxBSDMO8aS +aZ3Vm/sTYWfwAhR7fJ4rjtnwmBYyk2+ci+o3zYbIO4IOIE0UqVOje6zPUpY1o2r+ +3twDNFjv8ayNuKcmoYt64i0sNpg5VtwQ+pynfLjvR9x1R45QKgfO9HE+8PrBN59B +9XJr7Z4/84mZfpjN4Iy2mN3VeRsgzdocA/H5dU/nXbGfu3B0ot4= +=glVk +-END PGP SIGNATURE- Added: release/trafficserver/trafficserver-8.1.10.tar.bz2.sha512 == --- release/trafficserver/trafficserver-8.1.10.tar.bz2.sha512 (added) +++ release/trafficserver/trafficserver-8.1.10.tar.bz2.sha512 Wed Apr 3 17:57:05 2024 @@ -0,0 +1 @@ +c8fd3dbe6c88a11c9a3095815088de1d2f9d019cfed5cee12190bfba50d918b97fd6520528a9701beaf2b0ed7321d9da31560cb7295a0faaf3f4a843b3b59d14 trafficserver-8.1.10.tar.bz2
(trafficserver) annotated tag 8.1.10-rc0 updated (10bcf26410 -> 8e6033be8a)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.10-rc0 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.10-rc0 was modified! *** from 10bcf26410 (commit) to 8e6033be8a (tag) tagging 10bcf264100911987463c5e1cf42998ed257c231 (commit) replaces 8.1.9-rc0 by Evan Zelkowitz on Wed Apr 3 09:49:43 2024 -0600 - Log - Release Candidate 8.1.10-rc0 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmYNepcZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk4+iOD/0WrOpI3c9X1X9V7nXF66LD FQxRPxNx5jZEu3ZFqIWh1o0lNIYN75HyRoTmuhpfMaAc4QpjvVuXEO8vq2wOjllb Empm7THrN2I45zSq68fD2DpAYJepeNm5fJqIiRSaNHJd1GNw/pttjuN89mFrKF+z 6z/ejrZ3fwWzO+kQnNPWoVzLoi0eyg/nguyyQva9yeUcQnADFUQBRfyxRE3baA5f 5yw4Vzgfgr/RiCIyr9Z+v2e2ZEHMCTlxtdNF3pl4C1vfdyT3c0zBloJvISujZpJk FjR3MamGs+JzAf/8WCwtk8xUuKyU3vbmcok/VVOTu9T1pUm1rdrPLYh7Ar1e4qIy BTi2tm/UzbXFk96qnxG7p/j4ap/ysuTscv4QELnw0mN8uJ9skIUl3eIJyh3YjMdi 1s2gCOFfUKqBsr90mytjgoZmDDqBtfGGL4B5qyE+bcfU2bViMw8C3D2OWqYEm686 KsQvnm0mQVNYpTa0P+9dICrtvqaMEkZ/NT+2/T4BYoqPNzqohyInvbIA5wks8kdq s81G+syWyY+hHHj9ibPqouFyr5rqt97gkx2j3gNAPzXtHLek/HyaIF1OqmBhz/ZF IHKJFLR1yK4R9wWx+Xhr94cmQLRznbcnI/tbKJm1qZTeOy165wQASCQuhoXaZvoO DC9/ADIdTQvJfYnkK8rKJA== =CoYm -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(trafficserver) branch 8.1.x updated: Add 8.1.10 changelog and update version number
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 10bcf26410 Add 8.1.10 changelog and update version number 10bcf26410 is described below commit 10bcf264100911987463c5e1cf42998ed257c231 Author: Evan Zelkowitz AuthorDate: Wed Apr 3 09:45:00 2024 -0600 Add 8.1.10 changelog and update version number --- CHANGELOG-8.1.10 | 4 configure.ac | 4 ++-- tools/package/trafficserver.spec | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG-8.1.10 b/CHANGELOG-8.1.10 new file mode 100644 index 00..09cedf3d0c --- /dev/null +++ b/CHANGELOG-8.1.10 @@ -0,0 +1,4 @@ +Changes with Apache Traffic Server 8.1.10 + #10618 - Fix typo in block_errors documentation (#10591) + #10623 - Fix H2 debug message for a rate limit (#10583) + #11207 - Add proxy.config.http2.max_continuation_frames_per_minute diff --git a/configure.ac b/configure.ac index ad939855a7..6cb1eabc62 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # -m4_define([TS_VERSION_S],[8.1.9]) -m4_define([TS_VERSION_N],[8001009]) +m4_define([TS_VERSION_S],[8.1.10]) +m4_define([TS_VERSION_N],[8001010]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [d...@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) AC_PREREQ([2.59]) diff --git a/tools/package/trafficserver.spec b/tools/package/trafficserver.spec index 537856bfcd..082f406840 100755 --- a/tools/package/trafficserver.spec +++ b/tools/package/trafficserver.spec @@ -26,7 +26,7 @@ Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache Name: trafficserver -Version: 8.1.9 +Version: 8.1.10 Release: %{release}%{?dist} License: Apache Software License 2.0 (AL2) Group: System Environment/Daemons
(trafficserver) branch 8.1.x updated: Add proxy.config.http2.max_continuation_frames_per_minute (#11207)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new d8cb125e55 Add proxy.config.http2.max_continuation_frames_per_minute (#11207) d8cb125e55 is described below commit d8cb125e55ad7f9cc043e655f7ef25acbbbe0a2c Author: Masakazu Kitajo AuthorDate: Wed Apr 3 09:38:35 2024 -0600 Add proxy.config.http2.max_continuation_frames_per_minute (#11207) * proxy.config.http2.max_continuation_frames_per_minute This adds the ability to rate limite HTTP/2 CONTINUATION frames per stream per minute. * Add a missing function * Clang-format - Co-authored-by: Masaori Koshiba --- doc/admin-guide/files/records.config.en.rst| 11 - .../statistics/core/http-connection.en.rst | 11 - include/tscore/Ptr.h | 1 + mgmt/RecordsConfig.cc | 2 + proxy/http2/HTTP2.cc | 56 -- proxy/http2/HTTP2.h| 2 + proxy/http2/Http2ConnectionState.cc| 23 + proxy/http2/Http2ConnectionState.h | 3 ++ 8 files changed, 80 insertions(+), 29 deletions(-) diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst index fc9aae122f..67f930703b 100644 --- a/doc/admin-guide/files/records.config.en.rst +++ b/doc/admin-guide/files/records.config.en.rst @@ -3689,8 +3689,15 @@ HTTP/2 Configuration .. ts:cv:: CONFIG proxy.config.http2.max_rst_stream_frames_per_minute INT 14 :reloadable: - Specifies how many RST_STREAM frames |TS| receives for a minute at maximum. - Clients exceeded this limit will be immediately disconnected with an error + Specifies how many RST_STREAM frames |TS| receives per minute at maximum. + Clients exceeding this limit will be immediately disconnected with an error + code of ENHANCE_YOUR_CALM. + +.. ts:cv:: CONFIG proxy.config.http2.max_continuation_frames_per_minute INT 120 + :reloadable: + + Specifies how many CONTINUATION frames |TS| receives per minute at maximum. + Clients exceeding this limit will be immediately disconnected with an error code of ENHANCE_YOUR_CALM. .. ts:cv:: CONFIG proxy.config.http2.min_avg_window_update FLOAT 2560.0 diff --git a/doc/admin-guide/monitoring/statistics/core/http-connection.en.rst b/doc/admin-guide/monitoring/statistics/core/http-connection.en.rst index b14e72bd75..d336c0080f 100644 --- a/doc/admin-guide/monitoring/statistics/core/http-connection.en.rst +++ b/doc/admin-guide/monitoring/statistics/core/http-connection.en.rst @@ -241,10 +241,17 @@ HTTP/2 .. ts:stat:: global proxy.process.http2.max_rst_stream_frames_per_minute_exceeded integer :type: counter - Represents the total number of closed HTTP/2 connections for exceeding the - maximum allowed number of rst_stream frames per minute limit which is configured by + Represents the total number of HTTP/2 connections closed for exceeding the + maximum allowed number of ``RST_STREAM`` frames per minute limit which is configured by :ts:cv:`proxy.config.http2.max_rst_stream_frames_per_minute`. +.. ts:stat:: global proxy.process.http2.max_continuation_frames_per_minute_exceeded integer + :type: counter + + Represents the total number of HTTP/2 connections closed for exceeding the + maximum allowed number of ``CONTINUATION`` frames per minute limit which is + configured by :ts:cv:`proxy.config.http2.max_continuation_frames_per_minute`. + .. ts:stat:: global proxy.process.http2.insufficient_avg_window_update integer :type: counter diff --git a/include/tscore/Ptr.h b/include/tscore/Ptr.h index d067604a9e..750996ac6b 100644 --- a/include/tscore/Ptr.h +++ b/include/tscore/Ptr.h @@ -24,6 +24,7 @@ #pragma once #include "tscore/ink_atomic.h" +#include diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index c2d84dc0e8..fba9fd52ce 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1348,6 +1348,8 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.http2.max_rst_stream_frames_per_minute", RECD_INT, "200", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , + {RECT_CONFIG, "proxy.config.http2.max_continuation_frames_per_minute", RECD_INT, "120", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} + , {RECT_CONFIG, "proxy.config.http2.min_avg_window_update", RECD_FLOAT, "2560.0", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , {RECT_CONFIG, "proxy.con
(trafficserver) branch master updated: Add copying of _templates dir so sphinx can generate the version menu (#11151)
This is an automated email from the ASF dual-hosted git repository. eze 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 1c4825ddbf Add copying of _templates dir so sphinx can generate the version menu (#11151) 1c4825ddbf is described below commit 1c4825ddbf8c8fa5b2a4b6c7a5df1e8aa5981023 Author: Evan Zelkowitz AuthorDate: Fri Mar 8 10:44:02 2024 -0700 Add copying of _templates dir so sphinx can generate the version menu (#11151) Co-authored-by: Evan Zelkowitz --- doc/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 41d2bf549c..c58033b8db 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -35,6 +35,8 @@ add_custom_target( generate_docs_setup COMMENT "Copy static files to build directory" COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/static ${CMAKE_CURRENT_BINARY_DIR}/static + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/_templates + ${CMAKE_CURRENT_BINARY_DIR}/_templates ) # generate svg files from uml files
(trafficserver) branch master updated: TSFile - remove from background_fetch plugin (#10980)
This is an automated email from the ASF dual-hosted git repository. eze 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 c70884108f TSFile - remove from background_fetch plugin (#10980) c70884108f is described below commit c70884108fa71063f34b0f8427dc402fb14a9b0a Author: Evan Zelkowitz AuthorDate: Wed Jan 10 11:04:32 2024 -0700 TSFile - remove from background_fetch plugin (#10980) * TSFile - remove from background_fetch plugin. * Update docs. * Moved back to .h, used in other places besides configs.cc * Update cmake and includes to reference the moved tscpputil to tsutil - Co-authored-by: Alan M. Carroll --- doc/admin-guide/plugins/background_fetch.en.rst | 2 + plugins/background_fetch/CMakeLists.txt | 1 + plugins/background_fetch/configs.cc | 150 +++-- plugins/background_fetch/configs.h | 16 ++- plugins/background_fetch/rules.cc | 171 plugins/background_fetch/rules.h| 47 --- 6 files changed, 204 insertions(+), 183 deletions(-) diff --git a/doc/admin-guide/plugins/background_fetch.en.rst b/doc/admin-guide/plugins/background_fetch.en.rst index 659976599f..1cd9addd9c 100644 --- a/doc/admin-guide/plugins/background_fetch.en.rst +++ b/doc/admin-guide/plugins/background_fetch.en.rst @@ -73,6 +73,8 @@ The contents of the config-file could be as below:: exclude Content-Type text exclude X-Foo-Bar text exclude Content-Length <1000 + exclude Client-IP 127.0.0.1 + include Client-IP 10.0.0.0/16 .. important:: diff --git a/plugins/background_fetch/CMakeLists.txt b/plugins/background_fetch/CMakeLists.txt index 94c86f4e46..0638a1071f 100644 --- a/plugins/background_fetch/CMakeLists.txt +++ b/plugins/background_fetch/CMakeLists.txt @@ -16,3 +16,4 @@ ### add_atsplugin(background_fetch background_fetch.cc configs.cc headers.cc rules.cc) +target_link_libraries(background_fetch PRIVATE libswoc::libswoc ts::tsutil) diff --git a/plugins/background_fetch/configs.cc b/plugins/background_fetch/configs.cc index a7b86dc23f..2e8a6d9fa4 100644 --- a/plugins/background_fetch/configs.cc +++ b/plugins/background_fetch/configs.cc @@ -28,6 +28,12 @@ #include "configs.h" +#include +#include +#include + +using namespace swoc::literals; + // Parse the command line options. This got a little wonky, since we decided to have different // syntax for remap vs global plugin initialization, and the global BG fetch state :-/. Clean up // later... @@ -78,98 +84,102 @@ BgFetchConfig::parseOptions(int argc, const char *argv[]) bool BgFetchConfig::readConfig(const char *config_file) { - char file_path[4096]; - TSFile file; - if (nullptr == config_file) { TSError("[%s] invalid config file", PLUGIN_NAME); return false; } + swoc::file::path path(config_file); + Dbg(Bg_dbg_ctl, "trying to open config file in this path: %s", config_file); - if (*config_file == '/') { -snprintf(file_path, sizeof(file_path), "%s", config_file); - } else { -snprintf(file_path, sizeof(file_path), "%s/%s", TSConfigDirGet(), config_file); + if (!path.is_absolute()) { +path = swoc::file::path(TSConfigDirGet()) / path; } - Dbg(Bg_dbg_ctl, "chosen config file is at: %s", file_path); - - file = TSfopen(file_path, "r"); - if (nullptr == file) { -TSError("[%s] invalid config file: %s", PLUGIN_NAME, file_path); -Dbg(Bg_dbg_ctl, "invalid config file: %s", file_path); + Dbg(Bg_dbg_ctl, "chosen config file is at: %s", path.c_str()); + + std::error_code ec; + auto content = swoc::file::load(path, ec); + if (ec) { +swoc::bwprint(ts::bw_dbg, "[{}] invalid config file: {} {}", PLUGIN_NAME, path, ec); +TSError("%s", ts::bw_dbg.c_str()); +Dbg(Bg_dbg_ctl, "%s", ts::bw_dbg.c_str()); return false; } - BgFetchRule *cur = nullptr; - char buffer[8192]; - - memset(buffer, 0, sizeof(buffer)); - while (TSfgets(file, buffer, sizeof(buffer) - 1) != nullptr) { -char *eol = nullptr; + swoc::TextView text{content}; + while (text) { +auto line = text.take_prefix_at('\n').ltrim_if(); -// make sure line was not bigger than buffer -if (nullptr == (eol = strchr(buffer, '\n')) && nullptr == (eol = strstr(buffer, "\r\n"))) { - TSError("[%s] exclusion line too long, did not get a good line in cfg, skipping, line: %s", PLUGIN_NAME, buffer); - memset(buffer, 0, sizeof(buffer)); +if (line.empty() || line.front() == '#') { continue; } -// make sure line has something useful on it -if (eol - buffer < 2 || buffer[0] == '#') { -
(trafficserver-ci) branch ezelkow1-patch-1 deleted (was 76557ae)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch ezelkow1-patch-1 in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git was 76557ae Update coverity.pipeline The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(trafficserver-ci) branch ezelkow1-patch-1 created (now 76557ae)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch ezelkow1-patch-1 in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git at 76557ae Update coverity.pipeline This branch includes the following new commits: new 76557ae Update coverity.pipeline The 1 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.
(trafficserver-ci) 01/01: Merge pull request #298 from apache/ezelkow1-patch-1
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git commit 7e22df95997653a7e9da786976bab7e54b4f325d Merge: 88b7d9c 76557ae Author: Evan Zelkowitz AuthorDate: Thu Dec 7 09:09:01 2023 -0700 Merge pull request #298 from apache/ezelkow1-patch-1 Update coverity.pipeline jenkins/branch/coverity.pipeline | 1 + 1 file changed, 1 insertion(+)
(trafficserver-ci) branch main updated (88b7d9c -> 7e22df9)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git from 88b7d9c rockylinux:8 make Python3.8 the default alternate (#297) add 76557ae Update coverity.pipeline new 7e22df9 Merge pull request #298 from apache/ezelkow1-patch-1 The 1 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: jenkins/branch/coverity.pipeline | 1 + 1 file changed, 1 insertion(+)
(trafficserver-ci) 01/01: Update coverity.pipeline
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch ezelkow1-patch-1 in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git commit 76557ae176ec276c7d6416e966e42652cd36ce63 Author: Evan Zelkowitz AuthorDate: Thu Dec 7 09:08:17 2023 -0700 Update coverity.pipeline --- jenkins/branch/coverity.pipeline | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/branch/coverity.pipeline b/jenkins/branch/coverity.pipeline index 25d1577..3fa096f 100644 --- a/jenkins/branch/coverity.pipeline +++ b/jenkins/branch/coverity.pipeline @@ -28,6 +28,7 @@ pipeline { git 'https://github.com/apache/trafficserver.git' sh '''#!/bin/bash set +x + source /opt/rh/gcc-toolset-11/enable rm -rf cov_tools rm -rf cov-int mkdir cov_tools
(trafficserver) branch master updated: Coverity fixes (#10817)
This is an automated email from the ASF dual-hosted git repository. eze 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 e55f73fdf5 Coverity fixes (#10817) e55f73fdf5 is described below commit e55f73fdf580542142826a7a59b4a3d753d793e8 Author: Evan Zelkowitz AuthorDate: Fri Nov 17 13:28:01 2023 -0700 Coverity fixes (#10817) * Check return codes on TS funcs in mmdb.cc fixes #10328 Remove dead condition in nexthop fixes #10356 --- plugins/experimental/maxmind_acl/mmdb.cc | 9 ++--- src/proxy/http/remap/NextHopConsistentHash.cc | 6 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/experimental/maxmind_acl/mmdb.cc b/plugins/experimental/maxmind_acl/mmdb.cc index 501281d2c8..359a712966 100644 --- a/plugins/experimental/maxmind_acl/mmdb.cc +++ b/plugins/experimental/maxmind_acl/mmdb.cc @@ -78,11 +78,14 @@ Acl::init(char const *filename) return status; } - // Associate our config file with remap.config to be able to initiate reloads + // Associate our config file with remap.config if possible to be able to initiate reloads TSMgmtString result; const char *var_name = "proxy.config.url_remap.filename"; - TSMgmtStringGet(var_name, ); - TSMgmtConfigFileAdd(result, configloc.c_str()); + if (TS_SUCCESS != TSMgmtStringGet(var_name, )) { +TSWarning("[%s] Could not retrieve remap filename", PLUGIN_NAME); + } else if (TS_SUCCESS != TSMgmtConfigFileAdd(result, configloc.c_str())) { +TSWarning("[%s] Error adding mgmt config file", PLUGIN_NAME); + } // Find our database name and convert to full path as needed status = loaddb(maxmind["database"]); diff --git a/src/proxy/http/remap/NextHopConsistentHash.cc b/src/proxy/http/remap/NextHopConsistentHash.cc index 340f4dea50..8d05b37031 100644 --- a/src/proxy/http/remap/NextHopConsistentHash.cc +++ b/src/proxy/http/remap/NextHopConsistentHash.cc @@ -341,11 +341,7 @@ NextHopConsistentHash::findNextHop(TSHttpTxn txnp, void *ih, time_t now) break; case NH_EXHAUST_RING: default: - if (!wrapped) { -cur_ring = result.last_group; - } else if (groups > 1) { -cur_ring = (result.last_group + 1) % groups; - } + cur_ring = result.last_group; break; } }
(trafficserver) branch master updated: Enable quiche on rocky ci preset (#10760)
This is an automated email from the ASF dual-hosted git repository. eze 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 8f8313a980 Enable quiche on rocky ci preset (#10760) 8f8313a980 is described below commit 8f8313a9807814171f1e1b2fd47be6f0df63 Author: Evan Zelkowitz AuthorDate: Thu Nov 9 16:48:09 2023 -0700 Enable quiche on rocky ci preset (#10760) * enable quiche for general ci-rocky build --- CMakePresets.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 18bd69b01d..1ae99461bf 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -117,7 +117,8 @@ "cacheVariables": { "OPENSSL_ROOT_DIR": "/opt/boringssl", "quiche_ROOT": "/opt/quiche", -"CMAKE_INSTALL_PREFIX": "/tmp/ats-quiche" +"CMAKE_INSTALL_PREFIX": "/tmp/ats-quiche", + "ENABLE_QUICHE": true } }, {
(trafficserver) branch master updated: Add check for config existence before cont creation (#10752)
This is an automated email from the ASF dual-hosted git repository. eze 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 69437d3452 Add check for config existence before cont creation (#10752) 69437d3452 is described below commit 69437d345229a93f7136804433e93afbb3294865 Author: Evan Zelkowitz AuthorDate: Thu Nov 9 08:09:08 2023 -0700 Add check for config existence before cont creation (#10752) --- plugins/stats_over_http/stats_over_http.cc | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/stats_over_http/stats_over_http.cc b/plugins/stats_over_http/stats_over_http.cc index 6c6e3829de..97d84f08fa 100644 --- a/plugins/stats_over_http/stats_over_http.cc +++ b/plugins/stats_over_http/stats_over_http.cc @@ -737,9 +737,12 @@ init: TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, main_cont); /* Create continuation for management updates to re-read config file */ - config_cont = TSContCreate(config_handler, TSMutexCreate()); - TSContDataSet(config_cont, (void *)config_holder); - TSMgmtUpdateRegister(config_cont, PLUGIN_NAME); + if (config_holder->config_path != nullptr) { +config_cont = TSContCreate(config_handler, TSMutexCreate()); +TSContDataSet(config_cont, (void *)config_holder); +TSMgmtUpdateRegister(config_cont, PLUGIN_NAME); + } + Dbg(dbg_ctl, "stats module registered with path %s", config_holder->config->stats_path.c_str()); done:
(trafficserver) branch master updated: testing changes (#10699)
This is an automated email from the ASF dual-hosted git repository. eze 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 a2659ea313 testing changes (#10699) a2659ea313 is described below commit a2659ea31323881edc684d164e787d66fa0a2228 Author: Evan Zelkowitz AuthorDate: Tue Nov 7 10:29:33 2023 -0700 testing changes (#10699) --- plugins/experimental/url_sig/url_sig.cc | 50 + 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/plugins/experimental/url_sig/url_sig.cc b/plugins/experimental/url_sig/url_sig.cc index b45500db81..6e84ebfd6f 100644 --- a/plugins/experimental/url_sig/url_sig.cc +++ b/plugins/experimental/url_sig/url_sig.cc @@ -284,11 +284,13 @@ TSRemapDeleteInstance(void *ih) } static void -err_log(const char *url, const char *msg) +err_log(const char *url, int url_len, const char *msg) { if (msg && url) { -Dbg(dbg_ctl, "[URL=%s]: %s", url, msg); -TSError("[url_sig] [URL=%s]: %s", url, msg); // This goes to error.log +Dbg(dbg_ctl, "Test"); + +Dbg(dbg_ctl, "[URL=%.*s]: %s", url_len, url, msg); +TSError("[url_sig] [URL=%.*s]: %s", url_len, url, msg); // This goes to error.log } else { TSError("[url_sig] Invalid err_log request"); } @@ -561,7 +563,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) char sig_string[2 * MAX_SIG_SIZE + 1]; if (current_url_len >= MAX_REQ_LEN - 1) { -err_log(current_url, "Request Url string too long"); +err_log(current_url, current_url_len, "Request Url string too long"); goto deny; } @@ -575,7 +577,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) } url = TSUrlStringGet(mbuf, ul, _len); if (url_len >= MAX_REQ_LEN - 1) { - err_log(url, "Pristine URL string too long."); + err_log(url, url_len, "Pristine URL string too long."); goto deny; } } else { @@ -608,7 +610,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) if (query == nullptr || strstr(query, "E=") == nullptr) { char *const parsed = urlParse(url, cfg->sig_anchor, new_path, 8192, path_params, 8192); if (parsed == nullptr) { -err_log(url, "Unable to parse/decode new url path parameters"); +err_log(url, url_len, "Unable to parse/decode new url path parameters"); goto deny; } @@ -616,7 +618,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) query = strstr(parsed, ";"); if (query == nullptr) { -err_log(url, "Has no signing query string or signing path parameters."); +err_log(url, url_len, "Has no signing query string or signing path parameters."); TSfree(parsed); goto deny; } @@ -651,7 +653,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) Dbg(dbg_ctl, "ip->sa_family: AF_INET"); has_path_params == false ? (pp = strstr(cp, "&")) : (pp = strstr(cp, ";")); if ((pp - cp) > INET_ADDRSTRLEN - 1 || (pp - cp) < 4) { - err_log(url, "IP address string too long or short."); + err_log(url, url_len, "IP address string too long or short."); goto deny; } strncpy(client_ip, cp, (pp - cp)); @@ -660,7 +662,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) inet_ntop(AF_INET, &(((struct sockaddr_in *)ip)->sin_addr), ipstr, sizeof ipstr); Dbg(dbg_ctl, "Peer address: -%s-", ipstr); if (strcmp(ipstr, client_ip) != 0) { - err_log(url, "Client IP doesn't match signature."); + err_log(url, url_len, "Client IP doesn't match signature."); goto deny; } break; @@ -668,7 +670,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) Dbg(dbg_ctl, "ip->sa_family: AF_INET6"); has_path_params == false ? (pp = strstr(cp, "&")) : (pp = strstr(cp, ";")); if ((pp - cp) > INET6_ADDRSTRLEN - 1 || (pp - cp) < 4) { - err_log(url, "IP address string too long or short."); + err_log(url, url_len, "IP address string too long or short."); goto deny; } strncpy(client_ip, cp, (pp - cp)); @@ -677,7 +679,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri) inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)ip)->sin6_addr), ips
(trafficserver) branch master updated: Codeql cmake (#10691)
This is an automated email from the ASF dual-hosted git repository. eze 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 2f6b3b8b0e Codeql cmake (#10691) 2f6b3b8b0e is described below commit 2f6b3b8b0eea381112f6b3dfa2da54aa28eb4903 Author: Evan Zelkowitz AuthorDate: Mon Oct 30 10:47:25 2023 -0600 Codeql cmake (#10691) * Update codeql.yml --- .github/workflows/codeql.yml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7fc3b1f44a..acf9dc38d1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | sudo apt update -sudo apt install libmagick++-dev libncurses-dev libpcre2-dev libbrotli-dev libluajit-5.1-dev luajit libjansson-dev libcjose-dev libmaxminddb-dev libgeoip-dev +sudo apt install libmagick++-dev libncurses-dev libpcre2-dev libbrotli-dev libluajit-5.1-dev luajit libjansson-dev libcjose-dev libmaxminddb-dev libgeoip-dev ninja-build # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 @@ -67,9 +67,8 @@ jobs: - run: | echo "Run, Build Application using script" - autoreconf -fiv - ./configure --enable-experimental-plugins - make + cmake -B build --preset ci + cmake --build build -v - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 with:
[trafficserver] branch master updated: Add VIA RWW cache result as acceptable for an IMS_HIT (#10640)
This is an automated email from the ASF dual-hosted git repository. eze 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 60bf0c1c2c Add VIA RWW cache result as acceptable for an IMS_HIT (#10640) 60bf0c1c2c is described below commit 60bf0c1c2ca3e379c28d1631979341bc3d88c4ab Author: Evan Zelkowitz AuthorDate: Wed Oct 18 14:46:58 2023 -0600 Add VIA RWW cache result as acceptable for an IMS_HIT (#10640) --- proxy/http/HttpTransactHeaders.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc index c4aa4f974a..46b71105c2 100644 --- a/proxy/http/HttpTransactHeaders.cc +++ b/proxy/http/HttpTransactHeaders.cc @@ -520,7 +520,8 @@ HttpTransactHeaders::generate_and_set_squid_codes(HTTPHdr *header, char *via_str else { if (via_string[VIA_CLIENT_REQUEST] == VIA_CLIENT_IMS) { - if ((via_string[VIA_CACHE_RESULT] == VIA_IN_CACHE_FRESH) || (via_string[VIA_CACHE_RESULT] == VIA_IN_RAM_CACHE_FRESH)) { + if ((via_string[VIA_CACHE_RESULT] == VIA_IN_CACHE_FRESH) || (via_string[VIA_CACHE_RESULT] == VIA_IN_RAM_CACHE_FRESH) || + (via_string[VIA_CACHE_RESULT] == VIA_IN_CACHE_RWW_HIT)) { log_code = SQUID_LOG_TCP_IMS_HIT; } else { if (via_string[VIA_CACHE_RESULT] == VIA_IN_CACHE_STALE && via_string[VIA_SERVER_RESULT] == VIA_SERVER_NOT_MODIFIED) {
[trafficserver] branch 8.1.x updated: Fix H2 debug message for a rate limit (#10583) (#10623)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 3f122e3e07 Fix H2 debug message for a rate limit (#10583) (#10623) 3f122e3e07 is described below commit 3f122e3e07584423c5a81438959c3427007b487f Author: Masakazu Kitajo AuthorDate: Tue Oct 17 07:10:20 2023 +0900 Fix H2 debug message for a rate limit (#10583) (#10623) (cherry picked from commit a8efca589716168a9c9cb32a74ddcb0915d59f7f) Conflicts: proxy/http2/Http2ConnectionState.cc --- proxy/http2/Http2ConnectionState.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc index ce66c31eb7..7393f22bb1 100644 --- a/proxy/http2/Http2ConnectionState.cc +++ b/proxy/http2/Http2ConnectionState.cc @@ -528,7 +528,7 @@ rcv_rst_stream_frame(Http2ConnectionState , const Http2Frame ) if (cstate.get_received_rst_stream_frame_count() > Http2::max_rst_stream_frames_per_minute) { HTTP2_INCREMENT_THREAD_DYN_STAT(HTTP2_STAT_MAX_RST_STREAM_FRAMES_PER_MINUTE_EXCEEDED, this_ethread()); Http2StreamDebug(cstate.ua_session, stream_id, "Observed too frequent RST_STREAM frames: %u frames within a last minute", - cstate.get_received_settings_frame_count()); + cstate.get_received_rst_stream_frame_count()); return Http2Error(Http2ErrorClass::HTTP2_ERROR_CLASS_CONNECTION, Http2ErrorCode::HTTP2_ERROR_ENHANCE_YOUR_CALM, "reset too frequent RST_STREAM frames"); }
[trafficserver-ci] branch osx-pull-fix deleted (was 3c7a087)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch osx-pull-fix in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git was 3c7a087 Update osx.pipeline The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[trafficserver-ci] branch main updated (7b2f1b7 -> d580891)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git from 7b2f1b7 rocky: for real this time, /tmp/ats-quiche (#232) add 3c7a087 Update osx.pipeline new d580891 Merge pull request #233 from apache/osx-pull-fix The 1 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: jenkins/github/osx.pipeline | 21 + 1 file changed, 17 insertions(+), 4 deletions(-)
[trafficserver-ci] 01/01: Merge pull request #233 from apache/osx-pull-fix
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git commit d5808918a8ddd81787718e2c56c151dbe03c32bb Merge: 7b2f1b7 3c7a087 Author: Evan Zelkowitz AuthorDate: Mon Oct 16 10:45:11 2023 -0600 Merge pull request #233 from apache/osx-pull-fix Update osx.pipeline jenkins/github/osx.pipeline | 21 + 1 file changed, 17 insertions(+), 4 deletions(-)
[trafficserver-ci] branch osx-pull-fix updated: Update osx.pipeline
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch osx-pull-fix in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/osx-pull-fix by this push: new 3c7a087 Update osx.pipeline 3c7a087 is described below commit 3c7a0870086a2f6cded2bc820744e164a6b9d699 Author: Evan Zelkowitz AuthorDate: Mon Oct 16 10:42:38 2023 -0600 Update osx.pipeline --- jenkins/github/osx.pipeline | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/jenkins/github/osx.pipeline b/jenkins/github/osx.pipeline index 703bd05..d4be42a 100644 --- a/jenkins/github/osx.pipeline +++ b/jenkins/github/osx.pipeline @@ -7,11 +7,24 @@ pipeline { echo "${sha1}" checkout([$class: 'GitSCM', branches: [[name: sha1]], -extensions: [], - //+refs/pull/${GITHUB_PR_NUMBER}/merge:refs/remotes/origin-pull/pull/${GITHUB_PR_NUMBER}/merge +extensions: [ +// We have to set an idenity for the merge step because Git requires +// the user.name and user.email to be set to do a merge. +[$class: "UserIdentity", +name: "ATS CI User", +email: "nore...@trafficserver.apache.org" +], +[$class: "PreBuildMerge", +options: [ +mergeTarget: "${GITHUB_PR_TARGET_BRANCH}", +fastForwardMode: "NO_FF", +mergeRemote: "origin", +mergeStrategy: "DEFAULT" +] +], +], userRemoteConfigs: [[url: github_url, refspec: '+refs/pull/*:refs/remotes/origin/pr/*']]]) -//userRemoteConfigs: [[url: 'https://github.com/ezelkow1/trafficserver', refspec: '+refs/pull/*:refs/remotes/origin/pr/*']]]) -//userRemoteConfigs: [[url: 'https://github.com/ezelkow1/trafficserver', refspec: '+refs/pull/${sha1}/merge:refs/remotes/origin/pull/${sha1}/merge']]]) +sh 'git show -n 10 --decorate --graph --oneline --no-patch' } echo 'Finished Cloning' }
[trafficserver-ci] branch osx-pull-fix created (now 7b2f1b7)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch osx-pull-fix in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git at 7b2f1b7 rocky: for real this time, /tmp/ats-quiche (#232) No new revisions were added by this update.
svn commit: r64458 - in /release/trafficserver: trafficserver-8.1.9.tar.bz2 trafficserver-8.1.9.tar.bz2.asc trafficserver-8.1.9.tar.bz2.sha512
Author: eze Date: Tue Oct 10 15:11:02 2023 New Revision: 64458 Log: Missing configure version update Modified: release/trafficserver/trafficserver-8.1.9.tar.bz2 release/trafficserver/trafficserver-8.1.9.tar.bz2.asc release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 Modified: release/trafficserver/trafficserver-8.1.9.tar.bz2 == Binary files - no diff available. Modified: release/trafficserver/trafficserver-8.1.9.tar.bz2.asc == --- release/trafficserver/trafficserver-8.1.9.tar.bz2.asc (original) +++ release/trafficserver/trafficserver-8.1.9.tar.bz2.asc Tue Oct 10 15:11:02 2023 @@ -1,11 +1,11 @@ -BEGIN PGP SIGNATURE- -iQEzBAABCgAdFiEEcxRKqDsQqXsEwemDFa1i6UAQTpYFAmUkTwYACgkQFa1i6UAQ -TpYiawf+LI6N5Tiog1O5sar31emyOmNmktytiGbBMDnjphf6TZvesD068+IbwFL9 -CDOEiJ+VRxws3QkzJqIwMqoiR0h6ohcK9W+ypRbJm2nDWowLyoCByqhS0eo9sk2Z -Ff43iWx4ZcqDb/6cMnMCZK5CyCjsjQok49EF/B3eUghICJk9FKJyOzX8MZ+G7D9D -o0EBlSdPM2ccFwQ2dzu+/j5kBPZpaLknFkxrObPTQpIA76l1noRckR8AM/eibNO2 -wGdhL2R74EfmejNbOKodNr9JZ3CQnOJ2bb7dkVJpRgrL7IrU2wKULfxKAff3XMOY -OBXX/JUWDvm0uhP32aOq7HgpekCO4w== -=2/MQ +iQEzBAABCgAdFiEEcxRKqDsQqXsEwemDFa1i6UAQTpYFAmUlZ2IACgkQFa1i6UAQ +TpZz5QgAzgbT0+MiuXhuUKA2Fmb4LDaas0iPEzgGSS+scfwDOarJKNqc5VbzTiDE +Vh3Xq1p4rH+9Dq0LX6ruz99ZfOk+5cdxmHCFwBKNDs4lXv4rMsBSdgMHmgmMzEXL +ECJSZJ2yUrJGHmpSRhP6jicuDO5qgJcSt0RCB0h1OZN3P+OsY2ZawMUTfTKwVHex +YwD8G5BPSQFNI37uQUOc1KcJ8ewXdW+MriZ5jDXOsUgMH3O8umpextgAdToBWFkd +NbjPI65wW+CheRIBf8bciQZrh7Xq4/Eo6yJLzoAFi76erb8SKHnVBKcpsflguqkE +fXm41xk2imm6PQNuJfwxnBJ0kVDZNg== +=+RyQ -END PGP SIGNATURE- Modified: release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 == --- release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 (original) +++ release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 Tue Oct 10 15:11:02 2023 @@ -1 +1 @@ -377542915f8e7bea7fc6c2b9201f714512c7204f51d4882d88648c5cb6ff3db8bdbdd7c81a26ac617bfebcb2c9cf2a47957a48871552962565b12257ffcf62f3 trafficserver-8.1.9.tar.bz2 +907768a84c89cb6843f3d210b9f4fcd4ac90e5b5ea40afcc12e9014fdfea9cda2efa02800ff5268b520ab407ff8e920e8d35856b4bf992e6b6b3503c6908edd6 *trafficserver-8.1.9.tar.bz2
[trafficserver] annotated tag 8.1.9-rc0 updated (073ba3f5c3 -> 4c0d3edf9b)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.9-rc0 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.9-rc0 was modified! *** from 073ba3f5c3 (tag) to 4c0d3edf9b (tag) tagging 796ffd3a329b4b1f2ec0dd51158e62c94914c4ca (commit) replaces 8.1.8-rc1 by Evan Zelkowitz on Tue Oct 10 09:02:03 2023 -0600 - Log - Release Candidate 8.1.9-rc0 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmUlZ2sZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk4xenEACk4pAnJuVs7YQTYSzjAVI0 pDhwCvju8VA9ajyOnylQAEazWuPPtKYGkurmyY1E74BLAN1/ZKvfj5s4EZkzIpdg Lvoukrc6gqg24YNmB9XxwwgjYVyBPVIpLX1Soquo051zGHMCx3uUrzGyU7H4t9im yUa2Qn/myc03ttiNn3PDrLMjMenUZzcFfVT3BaCZNL9XCUaK+jOjpi6Tt+7ILdAc uybF1Uf2/1WMo/IQFUXh4gRac5O0ukVPYOzACw5zg0DVlNpBKepkJ0yGDJI9+tjX XXq54L0mTGcP0XQ9E+YvPtINIRlsiWVpgCVI8QZ0na1gJ0EYOxQPk7G73pWFqIMT MO6oHl0hUaglLJJEBlkP3zrNganAkZ1AZOFHF/zlQ4i2x15CAWtJE9Qb/h07MDDO yK579oeFiRjCHtQCW66jcNnRV5DuixfsXp5pJy8ob4yihRQ40DfPTIuoJR0+23Uv /8Akd7IdRE19tw1kDKbThtfQm2RTXDs2CDGpmM+LRpzfJjpHJlH+xpSy4731bkEA OwWl6nMlyq9bOwrlL456sBwPgfJFDdiGMQ9DR7XvbltRUC56jaC6k5bukkMoZFg/ 2ohZBBVDpnfzIoxuxFl+HDR0PX1tW2ctPLi0EzwTO0OnJkcuku+h2mJCRJAX8JVT vwXnXM/v9b1bGOgF26IJWw== =LLEW -END PGP SIGNATURE- --- from fd8fb86334 Adding for 8.1.9 rc0 add 796ffd3a32 Fix configure.ac missing version update No new revisions were added by this update. Summary of changes: configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver] tag 8.1.9 created (now 796ffd3a32)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to tag 8.1.9 in repository https://gitbox.apache.org/repos/asf/trafficserver.git at 796ffd3a32 (commit) No new revisions were added by this update.
[trafficserver] tag 8.1.9 deleted (was fd8fb86334)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to tag 8.1.9 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.9 was deleted! *** was fd8fb86334 Adding for 8.1.9 rc0 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[trafficserver] branch 8.1.x updated: Fix configure.ac missing version update
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 796ffd3a32 Fix configure.ac missing version update 796ffd3a32 is described below commit 796ffd3a329b4b1f2ec0dd51158e62c94914c4ca Author: Evan Zelkowitz AuthorDate: Tue Oct 10 08:52:42 2023 -0600 Fix configure.ac missing version update --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 12c9bb697b..ad939855a7 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # m4_define([TS_VERSION_S],[8.1.9]) -m4_define([TS_VERSION_N],[8001008]) +m4_define([TS_VERSION_N],[8001009]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [d...@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) AC_PREREQ([2.59])
[trafficserver] tag 8.1.9 created (now fd8fb86334)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to tag 8.1.9 in repository https://gitbox.apache.org/repos/asf/trafficserver.git at fd8fb86334 (commit) No new revisions were added by this update.
[trafficserver-site] branch asf-site updated: update header on downloads
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/trafficserver-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 40e7af7 update header on downloads new 81aae3e Merge branch 'asf-site' of github.com:apache/trafficserver-site into asf-site 40e7af7 is described below commit 40e7af7e77711af4d9fed6a455c202d1e30a0654 Author: Evan Zelkowitz AuthorDate: Mon Oct 9 18:05:40 2023 -0600 update header on downloads --- source/markdown/downloads.mdtext | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/markdown/downloads.mdtext b/source/markdown/downloads.mdtext index e76a224..49c6510 100644 --- a/source/markdown/downloads.mdtext +++ b/source/markdown/downloads.mdtext @@ -20,8 +20,8 @@ RSS: /rss/releases.rss The latest stable release of Apache Traffic Server is v9.2.3, released on 2023-10-9. -In addition, we continue to support the v8.1.x LTS release train, currently v8.1.8, -which was released on 2023-08-03. We follow the [Semantic Versioning](http://semver.org) +In addition, we continue to support the v8.1.x LTS release train, currently v8.1.9, +which was released on 2023-10-09. We follow the [Semantic Versioning](http://semver.org) scheme. The goal is to release patch releases frequently, and minor releases as needed. Within the major versions, all such patch and minor releases are all compatible.
[trafficserver-site] branch asf-site updated: Add 9.2.3 and 8.1.9 releases
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/trafficserver-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 3036b8a Add 9.2.3 and 8.1.9 releases 3036b8a is described below commit 3036b8a9f1e6e68c76fef6f5b2a415ce8145ffa6 Author: Evan Zelkowitz AuthorDate: Mon Oct 9 18:04:26 2023 -0600 Add 9.2.3 and 8.1.9 releases --- source/markdown/downloads.mdtext | 20 ++-- source/markdown/index.html | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/markdown/downloads.mdtext b/source/markdown/downloads.mdtext index 8d1bda8..e76a224 100644 --- a/source/markdown/downloads.mdtext +++ b/source/markdown/downloads.mdtext @@ -34,7 +34,7 @@ and hash signatures. # Current v9.x Release -- 9.2.3 # {#9.2.3} - Apache Traffic Server v9.2.3 was released on August 3rd, 2023. + Apache Traffic Server v9.2.3 was released on October 9th, 2023. [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.3.tar.bz2.asc)] [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.3.tar.bz2.sha512)] @@ -50,18 +50,18 @@ For details on the v9.x release, please see (there's a new section specific to v9.2.x). There are also details about [upgrading to 9.x](https://docs.trafficserver.apache.org/en/9.2.x/release-notes/upgrading.en.html). -# Current v8.x Release -- 8.1.8 # {#8.1.8} +# Current v8.x Release -- 8.1.9 # {#8.1.9} - Apache Traffic Server v8.1.8 was released on August 3rd, 2023. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.8.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.8.tar.bz2.sha512)] + Apache Traffic Server v8.1.9 was released on October 9th, 2023. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.9.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.9.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.8.tar.bz2; - class="download_ts">Traffic Server 8.1.8 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.9.tar.bz2; + class="download_ts">Traffic Server 8.1.9 -v8.1.6 is our latest stable release for the 8.x release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.8) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.8). +v8.1.9 is our latest stable release for the 8.x release. Additional details for this release are in the +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.9) +and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.9). # Archived Releases diff --git a/source/markdown/index.html b/source/markdown/index.html index 9b37eb2..b455afe 100644 --- a/source/markdown/index.html +++ b/source/markdown/index.html @@ -287,7 +287,7 @@ - October 9, 2023:We are releasing v9.2.3. We recommend everyone to upgrade to one of these versions of ATS. + October 9, 2023:We are releasing both v9.2.3 and v8.1.9. We recommend everyone to upgrade to one of these versions of ATS. August 3, 2023: We are releasing both v9.2.2 and v8.1.8 which include security fixes. We recommend everyone to upgrade to one of these versions of ATS. June 12, 2023: We are releasing both v9.2.1 and v8.1.7 which include security fixes. We recommend everyone to upgrade to one of these versions of ATS. January 23, 2023:The first version of the stable v9.2.x ATS branch is now available for download. This version, \
svn commit: r64440 - in /release/trafficserver: trafficserver-8.1.9.tar.bz2 trafficserver-8.1.9.tar.bz2.asc trafficserver-8.1.9.tar.bz2.sha512
Author: eze Date: Mon Oct 9 23:57:20 2023 New Revision: 64440 Log: Release 8.1.9 Added: release/trafficserver/trafficserver-8.1.9.tar.bz2 (with props) release/trafficserver/trafficserver-8.1.9.tar.bz2.asc release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 Added: release/trafficserver/trafficserver-8.1.9.tar.bz2 == Binary file - no diff available. Propchange: release/trafficserver/trafficserver-8.1.9.tar.bz2 -- svn:mime-type = application/octet-stream Added: release/trafficserver/trafficserver-8.1.9.tar.bz2.asc == --- release/trafficserver/trafficserver-8.1.9.tar.bz2.asc (added) +++ release/trafficserver/trafficserver-8.1.9.tar.bz2.asc Mon Oct 9 23:57:20 2023 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEcxRKqDsQqXsEwemDFa1i6UAQTpYFAmUkTwYACgkQFa1i6UAQ +TpYiawf+LI6N5Tiog1O5sar31emyOmNmktytiGbBMDnjphf6TZvesD068+IbwFL9 +CDOEiJ+VRxws3QkzJqIwMqoiR0h6ohcK9W+ypRbJm2nDWowLyoCByqhS0eo9sk2Z +Ff43iWx4ZcqDb/6cMnMCZK5CyCjsjQok49EF/B3eUghICJk9FKJyOzX8MZ+G7D9D +o0EBlSdPM2ccFwQ2dzu+/j5kBPZpaLknFkxrObPTQpIA76l1noRckR8AM/eibNO2 +wGdhL2R74EfmejNbOKodNr9JZ3CQnOJ2bb7dkVJpRgrL7IrU2wKULfxKAff3XMOY +OBXX/JUWDvm0uhP32aOq7HgpekCO4w== +=2/MQ +-END PGP SIGNATURE- Added: release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 == --- release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 (added) +++ release/trafficserver/trafficserver-8.1.9.tar.bz2.sha512 Mon Oct 9 23:57:20 2023 @@ -0,0 +1 @@ +377542915f8e7bea7fc6c2b9201f714512c7204f51d4882d88648c5cb6ff3db8bdbdd7c81a26ac617bfebcb2c9cf2a47957a48871552962565b12257ffcf62f3 trafficserver-8.1.9.tar.bz2
[trafficserver] annotated tag 8.1.9-rc0 updated (fd8fb86334 -> 073ba3f5c3)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.9-rc0 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.9-rc0 was modified! *** from fd8fb86334 (commit) to 073ba3f5c3 (tag) tagging fd8fb86334c192d7c538f14b9612fbd9aae11a6e (commit) replaces 8.1.8-rc1 by Evan Zelkowitz on Mon Oct 9 13:06:01 2023 -0600 - Log - Release Candidate 8.1.9-rc0 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmUkTxkZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk409HD/9UEgOdhy8reQ0pcUak/Klc xecewQHrxgRXzlV5lLEXLCzaSgRrRJGIJ253/E64Bp4NaMeId5gy9E8E86ytpWAD dpBGkHUwaPXcGk9R/2zU8fc1GJzTA5EZ+OrMlfTjIUmqUv8tj4Lnc7zL2BT4V8Kb cFO5qzWSfnw8NpJDhpiR22ITnkwqMN9Ss6Af+TNqbIcG+G62w3Tl7Gm3GWucWz7B B0axxLJ+tNKn4nwvXxB21i4nnbbQQHhA0AmUiAyP2BlHoHHie9H1qvnf2sLEodzf El1FpnNqo3hfy6fDHyIWGcCeISY0ayijAdN2wnRFkH2Ev9daLXh3pIB7EzalYWNG wxi2aJNnihj1YjHn7GPNlt0WwQhCH/yukpIsCbK1CIkF8M0gLXO7uSOgrt+LDjVj Ks8ScWE40xNsAJ1zGf0yXu+9Z8wZHFqxOg/ug9tIJlZvI6Q5UYNZaKCsIVoZPv8l WYZZVoTOAEZ8G/LnBJI5DlG6WOdNN/HFD2z69qcpa8oXpRaE6qCE83++hMjVIo4D eGnJZuC3BpE/252F6j2eRZv5ckMT2SgxM6Ck+cZG19Q1KM0u0Zp1BPuXIhXdmBnR ct4TwqSXAH7l2Vg8f21NU4sZpYmTaAC2JJksqh66zKuaY5d5A5g8V41ys9/aneMy m2oRMP4M/JjspmKiN+aMXw== =Nwl2 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] 01/02: Updating files for 8.1.9 rc0
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit 33bf0a6ce2be91ddc120de8910b360689ab0dcc8 Author: Evan Zelkowitz AuthorDate: Mon Oct 9 13:02:29 2023 -0600 Updating files for 8.1.9 rc0 --- configure.ac | 2 +- tools/package/trafficserver.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1720e41294..12c9bb697b 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # -m4_define([TS_VERSION_S],[8.1.8]) +m4_define([TS_VERSION_S],[8.1.9]) m4_define([TS_VERSION_N],[8001008]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [d...@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) diff --git a/tools/package/trafficserver.spec b/tools/package/trafficserver.spec index 5d171cde83..537856bfcd 100755 --- a/tools/package/trafficserver.spec +++ b/tools/package/trafficserver.spec @@ -26,7 +26,7 @@ Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache Name: trafficserver -Version: 8.1.8 +Version: 8.1.9 Release: %{release}%{?dist} License: Apache Software License 2.0 (AL2) Group: System Environment/Daemons
[trafficserver] branch 8.1.x updated (32cbd5baad -> fd8fb86334)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 32cbd5baad Add support for vconn start handler for lua plugin (#10575) new 33bf0a6ce2 Updating files for 8.1.9 rc0 new fd8fb86334 Adding for 8.1.9 rc0 The 2 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: CHANGELOG-8.1.9 | 6 ++ configure.ac | 2 +- tools/package/trafficserver.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 CHANGELOG-8.1.9
[trafficserver] 02/02: Adding for 8.1.9 rc0
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit fd8fb86334c192d7c538f14b9612fbd9aae11a6e Author: Evan Zelkowitz AuthorDate: Mon Oct 9 13:02:55 2023 -0600 Adding for 8.1.9 rc0 --- CHANGELOG-8.1.9 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG-8.1.9 b/CHANGELOG-8.1.9 new file mode 100644 index 00..40f1f6ef09 --- /dev/null +++ b/CHANGELOG-8.1.9 @@ -0,0 +1,6 @@ +Changes with Apache Traffic Server 8.1.9 + #10565 - Add an HTTP/2 related rate limiting + #10567 - s3_auth: Fix hash calculation + #10569 - clang-format + #10572 - APIs to get the h2 error codes and a plugin to use them + #10575 - Add support for vconn start handler for lua plugin
[trafficserver] branch master updated (f1a5f6186a -> f75cee4311)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from f1a5f6186a Make Cripts buildable on Fedora 39 (#10453) add f75cee4311 adding a pristine option for strategies (#10410) No new revisions were added by this update. Summary of changes: configs/strategies.schema.json | 4 proxy/ParentSelection.h | 1 + proxy/http/HttpTransact.cc | 10 -- proxy/http/remap/NextHopConsistentHash.cc| 10 ++ proxy/http/remap/NextHopSelectionStrategy.cc | 4 proxy/http/remap/NextHopSelectionStrategy.h | 1 + 6 files changed, 28 insertions(+), 2 deletions(-)
[trafficserver-ci] branch main updated: Create github_polling.pipeline
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/main by this push: new 58c614b Create github_polling.pipeline 58c614b is described below commit 58c614b0430c73fa9fc36c9865a59c3651c33d1f Author: Evan Zelkowitz AuthorDate: Wed Aug 23 10:34:49 2023 -0600 Create github_polling.pipeline --- jenkins/github/github_polling.pipeline | 282 + 1 file changed, 282 insertions(+) diff --git a/jenkins/github/github_polling.pipeline b/jenkins/github/github_polling.pipeline new file mode 100644 index 000..b82b6cf --- /dev/null +++ b/jenkins/github/github_polling.pipeline @@ -0,0 +1,282 @@ +TOP_JOB_DESC = "Builds:\\n" + +String buildJob(String ghcontext, String jobName, String shard='') { + //setGitHubPullRequestStatus(context: ghcontext, message: 'Building', state: 'PENDING') + + if (currentBuild.description == null) { + currentBuild.description = "Builds:" + } + currentBuild.displayName = "PR: #${GITHUB_PR_NUMBER} - Build: #${BUILD_NUMBER}" + https_github_url = GITHUB_REPO_GIT_URL.replace("git://", "https://;) + + def parms = [ + string(name: 'SHA1', value: GITHUB_PR_HEAD_SHA), + string(name: 'GITHUB_URL', value: https_github_url), + string(name: 'GITHUB_PR_NUMBER', value: GITHUB_PR_NUMBER), + string(name: 'GITHUB_PR_TARGET_BRANCH', value: GITHUB_PR_TARGET_BRANCH), + ] + + def displayname = jobName + if (shard != '') { + parms << string(name: 'AUTEST_SHARD', value: shard) + displayname += ' ' + shard + } + + def jobBuild = build job: jobName, propagate: false, parameters: parms + def jobURL = jobBuild.getAbsoluteUrl() + currentBuild.description += " ${displayname} - ${jobURL} " + + def jobResult = jobBuild.getResult() + + echo "Build of '${displayname}' returned result: ${jobResult}" + + if (jobResult == 'SUCCESS') { + //setGitHubPullRequestStatus(context: ghcontext, message: "Success - ${jobURL}", state: jobResult) + } else { + //setGitHubPullRequestStatus(context: ghcontext, message: "Failure - ${jobURL}", state: jobResult) + } + return jobResult +} + +pipeline { + agent none + + stages { + stage('Quick Checks') { + parallel { + stage('Clang-Format') { + when { + anyOf { + environment name: 'GITHUB_PR_COMMENT_BODY_MATCH', value: '' + expression { GITHUB_PR_COMMENT_BODY_MATCH ==~ /.*clang-format.*/ } + } + } + steps { + script { + echo GITHUB_PR_COMMENT_BODY_MATCH + result = buildJob('Clang-Format', 'Github_Builds/clang-format') + if (result == 'FAILURE') { + error('Clang-Format failed') + } + } + } + } + stage('RAT') { + when { + anyOf { + environment name: 'GITHUB_PR_COMMENT_BODY_MATCH', value: '' + expression { GITHUB_PR_COMMENT_BODY_MATCH ==~ /.*rat.*/ } + } + } + steps { + script { + result = buildJob('RAT', 'Github_Builds/rat') + if (result == 'FAILURE') { + error('RAT failed') + } + } + } + } + stage('Docs') { +
[trafficserver] branch master updated: Revert "Make OSX and FreeBSD not required temporarily (#10237)" (#10248)
This is an automated email from the ASF dual-hosted git repository. eze 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 6d342c6004 Revert "Make OSX and FreeBSD not required temporarily (#10237)" (#10248) 6d342c6004 is described below commit 6d342c6004c651606be0c47c5f616c61a83f6a45 Author: Brian Neradt AuthorDate: Thu Aug 17 23:34:00 2023 -0500 Revert "Make OSX and FreeBSD not required temporarily (#10237)" (#10248) This reverts commit 28d1d18c5105537567c55ab751d054dda07309c8. OSX and FreeBSD connectivity is back up, so we should make these required for merging again. Co-authored-by: bneradt --- .asf.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 51ae047269..c240593213 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -57,9 +57,8 @@ github: - Fedora - RAT - Ubuntu - # Add these back once connectivity to them is restored. - #- OSX - #- FreeBSD + - OSX + - FreeBSD required_pull_request_reviews: dismiss_stale_reviews: true required_approving_review_count: 1
[trafficserver] annotated tag 8.1.8 updated (579fd8dac9 -> cce2883648)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.8 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.8 was modified! *** from 579fd8dac9 (commit) to cce2883648 (tag) tagging 579fd8dac9c55e74a883cbcea264053a6433aaec (commit) replaces 8.1.8-rc0 by Evan Zelkowitz on Wed Aug 2 12:37:32 2023 -0600 - Log - Release Candidate 8.1.8-rc1 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmTKomwZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk46y/D/45IUStoCJ88DDTAWn+EAAS ygE7dQOnsa3GauX04RrYyi86mkvt5+sl3mSPNMYIZsPQJ+aItPhjtkhpw6JDAA7/ is/t3gs6NAcbbmmKHXpTUvTUgp9wlY8RwApiq3c6HYXrMH3THTPw+zSOr2CbT02l SNzVGeCRgHpgv2zkpbkg3UCYDAAD2es3uiLqX8/DaBeUDor9mWVhs+bB2hR73nGz yob1jHh0XrUPELWXNcLenSA5k8+VQPqlOXTqwfdC5DLX836/pq5F/W/To2SMdZXQ 23ae4lS9en0in3kNORRvseQUIE5dE91Zpcy5nzlFpE4HQlDTGtY1MU7VWr1luDVH Pwev2Tw2fwoTi+QKuhChCsz0A5HkfvNIt3ZTS85WovMBTVW7ZqHv/t6IKlBa1kLe Mf/+GwAAKKwZnr81RA+8pJlZuQjmfMs/9yWl8lG3LfUExuTLfSyljkxuzF8/EGXj 2HcXsmJF/xeAD6CS1W265hNedhW7fdnZ97BPVAwOh+5q5k6Xc+CEB8HNCPjLF9mT Vf828vl2ojyXtV8SrIOPJMle56tRS2c1nRL934T0sBnzfhmWDVeomVmmH/1evIgd arrmiZ0BMn12c6TMVX4P46sc09xmNZD273xcHNvM19/fim/DyY6epjtomZu/UlQZ Lx1ixOi2Y7UlglTOtUstMQ== =Eddx -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] annotated tag 8.1.8-rc1 deleted (was cce2883648)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.8-rc1 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.8-rc1 was deleted! *** tag was cce2883648 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r63348 - in /release/trafficserver: trafficserver-8.1.8.tar.bz2 trafficserver-8.1.8.tar.bz2.asc trafficserver-8.1.8.tar.bz2.sha512
Author: eze Date: Thu Aug 3 22:41:42 2023 New Revision: 63348 Log: Release 8.1.8 Added: release/trafficserver/trafficserver-8.1.8.tar.bz2 (with props) release/trafficserver/trafficserver-8.1.8.tar.bz2.asc release/trafficserver/trafficserver-8.1.8.tar.bz2.sha512 Added: release/trafficserver/trafficserver-8.1.8.tar.bz2 == Binary file - no diff available. Propchange: release/trafficserver/trafficserver-8.1.8.tar.bz2 -- svn:mime-type = application/octet-stream Added: release/trafficserver/trafficserver-8.1.8.tar.bz2.asc == --- release/trafficserver/trafficserver-8.1.8.tar.bz2.asc (added) +++ release/trafficserver/trafficserver-8.1.8.tar.bz2.asc Thu Aug 3 22:41:42 2023 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEcxRKqDsQqXsEwemDFa1i6UAQTpYFAmTKomwACgkQFa1i6UAQ +TpYArAgAmkv1yLl+uGuvy1w2UStGjD0BLANRP6DHkX01++pQlOvEoKjWJ+mU+MTj +6Ek2h3ScpZhiRfEncHjt70Mto513d9T/WIaxWNTUa2pFDK6OYuV5Z86o/uDIrgDW +fcNlJvetwOM9qIIIBDEjxpjl2+SPZMIgHeqBCqYPVhe0qgUjVEhwscp1ipuDYdYg ++yICS1Q5D2i1qHTr51xLBqhg51bcaZXhrmuPU31yWYkPnUyvKoHs7Bz/fHU4bVQT +YD1PB+E0dLsYXMK13JEd4ydIyvtpm/eY2KAwds6/HX/Axeks97VYr9luv+LOJtEQ +viw4j8N0gOpzTcUiqAbDup+pmJxmmA== +=HT4J +-END PGP SIGNATURE- Added: release/trafficserver/trafficserver-8.1.8.tar.bz2.sha512 == --- release/trafficserver/trafficserver-8.1.8.tar.bz2.sha512 (added) +++ release/trafficserver/trafficserver-8.1.8.tar.bz2.sha512 Thu Aug 3 22:41:42 2023 @@ -0,0 +1 @@ +d4b816b00277b01df4a30f11205747d326a7e053368c807c4ef23106e27d13ff766400ff93422edd54330cf9751f710a93e62005bd94151610ad18f70f47664a *trafficserver-8.1.8-rc1.tar.bz2
[trafficserver] annotated tag 8.1.8-rc1 updated (579fd8dac9 -> cce2883648)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.8-rc1 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.8-rc1 was modified! *** from 579fd8dac9 (commit) to cce2883648 (tag) tagging 579fd8dac9c55e74a883cbcea264053a6433aaec (commit) replaces 8.1.8-rc0 by Evan Zelkowitz on Wed Aug 2 12:37:32 2023 -0600 - Log - Release Candidate 8.1.8-rc1 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmTKomwZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk46y/D/45IUStoCJ88DDTAWn+EAAS ygE7dQOnsa3GauX04RrYyi86mkvt5+sl3mSPNMYIZsPQJ+aItPhjtkhpw6JDAA7/ is/t3gs6NAcbbmmKHXpTUvTUgp9wlY8RwApiq3c6HYXrMH3THTPw+zSOr2CbT02l SNzVGeCRgHpgv2zkpbkg3UCYDAAD2es3uiLqX8/DaBeUDor9mWVhs+bB2hR73nGz yob1jHh0XrUPELWXNcLenSA5k8+VQPqlOXTqwfdC5DLX836/pq5F/W/To2SMdZXQ 23ae4lS9en0in3kNORRvseQUIE5dE91Zpcy5nzlFpE4HQlDTGtY1MU7VWr1luDVH Pwev2Tw2fwoTi+QKuhChCsz0A5HkfvNIt3ZTS85WovMBTVW7ZqHv/t6IKlBa1kLe Mf/+GwAAKKwZnr81RA+8pJlZuQjmfMs/9yWl8lG3LfUExuTLfSyljkxuzF8/EGXj 2HcXsmJF/xeAD6CS1W265hNedhW7fdnZ97BPVAwOh+5q5k6Xc+CEB8HNCPjLF9mT Vf828vl2ojyXtV8SrIOPJMle56tRS2c1nRL934T0sBnzfhmWDVeomVmmH/1evIgd arrmiZ0BMn12c6TMVX4P46sc09xmNZD273xcHNvM19/fim/DyY6epjtomZu/UlQZ Lx1ixOi2Y7UlglTOtUstMQ== =Eddx -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] branch 8.1.x updated: Update changelog to include mcx16 build fix
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 579fd8dac9 Update changelog to include mcx16 build fix 579fd8dac9 is described below commit 579fd8dac9c55e74a883cbcea264053a6433aaec Author: Evan Zelkowitz AuthorDate: Wed Aug 2 12:34:04 2023 -0600 Update changelog to include mcx16 build fix --- CHANGELOG-8.1.8 | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-8.1.8 b/CHANGELOG-8.1.8 index 838601f485..b905676166 100644 --- a/CHANGELOG-8.1.8 +++ b/CHANGELOG-8.1.8 @@ -3,3 +3,4 @@ Changes with Apache Traffic Server 8.1.8 #10132 - Updates to 8.1.x to compile on newer OSes #10133 - Remove duplicate slashes at the beginning of the incoming URL #10134 - 8.1.x: Fix a crash triggered by invalid range header + #10140 - 81x mcx16 build fix
[trafficserver] branch 8.1.x updated: Fix use of -mcx16 flag - only use if it compiles cleanly. (#7684) (#10140)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new ea5bdd6fe1 Fix use of -mcx16 flag - only use if it compiles cleanly. (#7684) (#10140) ea5bdd6fe1 is described below commit ea5bdd6fe11c434a5aa457aa513028dad4b72441 Author: Evan Zelkowitz AuthorDate: Wed Aug 2 12:31:32 2023 -0600 Fix use of -mcx16 flag - only use if it compiles cleanly. (#7684) (#10140) (cherry picked from commit b05c5bea4f0669fd7e6d994b8b854ef920fc09fb) Co-authored-by: Alan M. Carroll --- configure.ac | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 717abcecf5..1720e41294 100644 --- a/configure.ac +++ b/configure.ac @@ -1462,6 +1462,8 @@ __saved_CXXFLAGS="${CXXFLAGS}" __saved_CFLAGS="${CFLAGS}" has_128bit_cas=0 +# Don't add the -mcx16 flag unless needed and it compiles cleanly. +needs_mcx16_for_cas=0 TS_TRY_COMPILE_NO_WARNING([],[ __int128_t x = 0; @@ -1480,6 +1482,7 @@ TS_TRY_COMPILE_NO_WARNING([],[ ], [ AC_MSG_RESULT(yes) has_128bit_cas=1 +needs_mcx16_for_cas=1 ], [ AC_MSG_RESULT(no) ]) @@ -1490,11 +1493,9 @@ CFLAGS="${__saved_CFLAGS}" AC_LANG_POP AC_SUBST(has_128bit_cas) -AS_IF([test "x$has_128bit_cas" = "x1"], [ - AS_IF([test "x$ax_cv_c_compiler_vendor" != "xintel"], [ +AS_IF([test "x$needs_mcx16_for_cas" = "x1"], [ TS_ADDTO(AM_CFLAGS, [-mcx16]) TS_ADDTO(AM_CXXFLAGS, [-mcx16]) - ]) ]) # Check for POSIX capabilities library.
[trafficserver] annotated tag 8.1.8-rc0 updated (448dc494da -> e1d4e80fd0)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.8-rc0 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.8-rc0 was modified! *** from 448dc494da (commit) to e1d4e80fd0 (tag) tagging 448dc494daf16a8061a4d6281f4b639f0df7e8cf (commit) replaces 8.1.7-rc0 by Evan Zelkowitz on Tue Aug 1 16:02:19 2023 -0600 - Log - Release Candidate 8.1.8-rc0 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmTJgOsZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk44lUD/4+7pOmLBbDbK8syNqdpoOx fIVKHuxhdk/jE8x16VJkW5k/A4x3tHqJgVI3+kPZ0shde+GkPeXWMBAk3uT/M6vY fOriNoPRaN/nTiuWJU6DNexy1cpGMbz4n6qSUqVY5GzNjg/fUWuiRY16bICpogQL mWVFAYDMRGms5YpU+B6Up4E91GwWUBL+/M432S/GX9f/RNdAwT5JC3guvAkjJQE3 kMokvHItjqtcxn2kKbX3bLZhgImeL9NFw6naJCYEi9lonS/gD3ySx4pTovtDfQgq +dO9cjr5wYigZfznu2rg/aeZmpaweR6OC0/bwHwLcRlwuuxDmqjQiEeNoQ6Zarqx byMBR+RJF7hJOdGIAxXC1EUsGamPvqLddcbiiznQ4FuDG87TYWHr7Kuf7MxpSHkt DzT/V3ZWe3zboXb9y2YktEVWGDeg1bUZAGxERXiaj7fIoxRXER/fnRpNW6xW3KKU hOjcuc8Yee83WqwSOftbtzY3HMV6eYgD0FHPrImgRUJxB+zip8qbTWDNX54ypOWw AZNEKo+pA3KOygFrMxA8Yai8usdnJHI9hraVweJxqGqdBegnq2ETyDikmESQRgXc uOGVqPiUq8ClsDgeaF2MmHtoCTmJzSKmoNmSqd2zAnF7YojLlrohToLtTOomsPdx 3/awz8AAykX+zPgGhDiA2w== =yeGh -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] branch 8.1.x updated: Create new changelog and bump version to 8.1.8
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 448dc494da Create new changelog and bump version to 8.1.8 448dc494da is described below commit 448dc494daf16a8061a4d6281f4b639f0df7e8cf Author: Evan Zelkowitz AuthorDate: Tue Aug 1 16:01:08 2023 -0600 Create new changelog and bump version to 8.1.8 --- CHANGELOG-8.1.8 | 5 + configure.ac | 4 ++-- tools/package/trafficserver.spec | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG-8.1.8 b/CHANGELOG-8.1.8 new file mode 100644 index 00..838601f485 --- /dev/null +++ b/CHANGELOG-8.1.8 @@ -0,0 +1,5 @@ +Changes with Apache Traffic Server 8.1.8 + #10128 - 8.1.x: Correctly handle encoding for cache hash generation + #10132 - Updates to 8.1.x to compile on newer OSes + #10133 - Remove duplicate slashes at the beginning of the incoming URL + #10134 - 8.1.x: Fix a crash triggered by invalid range header diff --git a/configure.ac b/configure.ac index 6985d3ae00..717abcecf5 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # -m4_define([TS_VERSION_S],[8.1.7]) -m4_define([TS_VERSION_N],[8001007]) +m4_define([TS_VERSION_S],[8.1.8]) +m4_define([TS_VERSION_N],[8001008]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [d...@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) AC_PREREQ([2.59]) diff --git a/tools/package/trafficserver.spec b/tools/package/trafficserver.spec index 08340a0c87..5d171cde83 100755 --- a/tools/package/trafficserver.spec +++ b/tools/package/trafficserver.spec @@ -26,7 +26,7 @@ Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache Name: trafficserver -Version: 8.1.7 +Version: 8.1.8 Release: %{release}%{?dist} License: Apache Software License 2.0 (AL2) Group: System Environment/Daemons
[trafficserver] branch 8.1.x updated: Remove duplicate slashes at the beginning of the incoming URL (#10133)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 3640b5f8da Remove duplicate slashes at the beginning of the incoming URL (#10133) 3640b5f8da is described below commit 3640b5f8daefe7f9a8d7c060f3f2a0cb04eb7532 Author: Bryan Call AuthorDate: Tue Aug 1 14:52:34 2023 -0700 Remove duplicate slashes at the beginning of the incoming URL (#10133) --- proxy/hdrs/URL.cc | 8 + proxy/hdrs/unit_tests/test_URL.cc | 389 ++ 2 files changed, 397 insertions(+) diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc index e38df3379b..9977ad6a5b 100644 --- a/proxy/hdrs/URL.cc +++ b/proxy/hdrs/URL.cc @@ -1473,6 +1473,10 @@ done: if (!path_end) { path_end = cur; } +// Remove all preceding slashes +while (path_start < path_end && *path_start == '/') { + ++path_start; +} url_path_set(heap, url, path_start, path_end - path_start, copy_strings); } if (params_start) { @@ -1553,6 +1557,10 @@ url_parse_http_no_path_component_breakdown(HdrHeap *heap, URLImpl *url, const ch // path is anything that's left. if (cur < end) { +// Remove all preceding slashes +while (cur < end && *cur == '/') { + cur++; +} url_path_set(heap, url, cur, end - cur, copy_strings); cur = end; } diff --git a/proxy/hdrs/unit_tests/test_URL.cc b/proxy/hdrs/unit_tests/test_URL.cc index 44f621c76f..d5fc7f471c 100644 --- a/proxy/hdrs/unit_tests/test_URL.cc +++ b/proxy/hdrs/unit_tests/test_URL.cc @@ -145,3 +145,392 @@ TEST_CASE("UrlHashGet", "[url][hash_get]") } } } + +struct url_parse_test_case { + const std::string input_uri; + const std::string expected_printed_url; + const bool verify_host_characters; + const std::string expected_printed_url_regex; + const bool is_valid; + const bool is_valid_regex; +}; + +constexpr bool IS_VALID = true; +constexpr bool VERIFY_HOST_CHARACTERS = true; + +// clang-format off +std::vector url_parse_test_cases = { + { +"///dirindex.html", +"/dirindex.html", +VERIFY_HOST_CHARACTERS, +"/dirindex.html", +IS_VALID, +IS_VALID + }, + { +"/index.html", +"/index.html", +VERIFY_HOST_CHARACTERS, +"/index.html", +IS_VALID, +IS_VALID + }, + { +"//index.html", +"/index.html", +VERIFY_HOST_CHARACTERS, +"/index.html", +IS_VALID, +IS_VALID + }, + { +// The following scheme-only URI is technically valid per the spec, but we +// have historically returned this as invalid and I'm not comfortable +// changing it in case something depends upon this behavior. Besides, a +// scheme-only URI is probably not helpful to us nor something likely +// Traffic Server will see. +"http://;, +"", +VERIFY_HOST_CHARACTERS, +"", +!IS_VALID, +!IS_VALID + }, + { +"https:///;, +"https:///;, +VERIFY_HOST_CHARACTERS, +"https:///;, +IS_VALID, +IS_VALID + }, + { +// RFC 3986 section-3: When authority is not present, the path cannot begin +// with two slash characters ("//"). We have historically allowed this, +// however, and will continue to do so. +"https:;, +"https:///;, +VERIFY_HOST_CHARACTERS, +"https:///;, +IS_VALID, +IS_VALID + }, + { +// By convention, our url_print() function adds a path of '/' at the end of +// URLs that have no path, query, or fragment after the authority. +"mailto:test.u...@example.com;, +"mailto:test.u...@example.com/;, +VERIFY_HOST_CHARACTERS, +"mailto:test.u...@example.com/;, +IS_VALID, +IS_VALID + }, + { +"mailto:test.u...@example.com:25;, +"mailto:test.u...@example.com:25/;, +VERIFY_HOST_CHARACTERS, +"mailto:test.u...@example.com:25/;, +IS_VALID, +IS_VALID + }, + { +"https://www.example.com;, +"https://www.example.com/;, +VERIFY_HOST_CHARACTERS, +"https://www.example.com/;, +IS_VALID, +IS_VALID + }, + { +"https://www.example.com/;, +"https://www.example.com/;, +VERIFY_HOST_CHARACTERS, +"https://www.example.com/;, +IS_VALID, +IS_VALID + }, + { +"https://www.example.com//;, +"https://www.example.com/;, +VERIFY_HOST_CHARACTERS, +"https://www.example.com/;, +IS_VALID, +IS_VALID + }, + { +"https://127.0.0.1;, +"https://127.0.0.1/;, +VERIFY_HOST_CHARACTERS, +"https://127.0.0.1/;, +IS_VALID, +IS_VALID + }, + { +&qu
[trafficserver] branch 8.1.x updated: 8.1.x: Fix a crash triggered by invalid range header (#10134)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new c50ee6c4f2 8.1.x: Fix a crash triggered by invalid range header (#10134) c50ee6c4f2 is described below commit c50ee6c4f2ae32f2c849fccb5b0f367165fe9c20 Author: Zhengxi Li AuthorDate: Tue Aug 1 17:25:42 2023 -0400 8.1.x: Fix a crash triggered by invalid range header (#10134) Co-authored-by: Katsutoshi Ikenoya --- proxy/http/HttpTransact.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index c5a37a3b2e..c1d0cba06b 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -2820,7 +2820,7 @@ HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code) // this late. TxnDebug("http_seq", "[HttpTransact::HandleCacheOpenReadHit] Out-of-order Range request - tunneling"); s->cache_info.action = CACHE_DO_NO_ACTION; - if (s->force_dns) { + if (s->force_dns || s->dns_info.lookup_success) { HandleCacheOpenReadMiss(s); // DNS is already completed no need of doing DNS } else { CallOSDNSLookup(s);
[trafficserver] branch 8.1.x updated: Updates to 8.1.x to compile on newer OSes (#10132)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 5dc3d2d324 Updates to 8.1.x to compile on newer OSes (#10132) 5dc3d2d324 is described below commit 5dc3d2d3249832a7bcfe0774be73db3e53fa50e7 Author: Bryan Call AuthorDate: Tue Aug 1 14:17:38 2023 -0700 Updates to 8.1.x to compile on newer OSes (#10132) --- example/cppapi/websocket/WSBuffer.h | 1 + include/tscpp/util/TextView.h | 1 + plugins/experimental/slice/Config.h | 1 + 3 files changed, 3 insertions(+) diff --git a/example/cppapi/websocket/WSBuffer.h b/example/cppapi/websocket/WSBuffer.h index 4b12f168cd..5061b8f122 100644 --- a/example/cppapi/websocket/WSBuffer.h +++ b/example/cppapi/websocket/WSBuffer.h @@ -24,6 +24,7 @@ #pragma once #include +#include enum ws_frametype { WS_FRAME_CONTINUATION = 0x0, diff --git a/include/tscpp/util/TextView.h b/include/tscpp/util/TextView.h index d4494cd9c0..1ab8bd2f6c 100644 --- a/include/tscpp/util/TextView.h +++ b/include/tscpp/util/TextView.h @@ -35,6 +35,7 @@ #include #include #include +#include /// Apache Traffic Server commons. namespace ts diff --git a/plugins/experimental/slice/Config.h b/plugins/experimental/slice/Config.h index e4955f8af5..a2c32871a7 100644 --- a/plugins/experimental/slice/Config.h +++ b/plugins/experimental/slice/Config.h @@ -27,6 +27,7 @@ #endif #include +#include // Data Structures and Classes struct Config {
[trafficserver] branch 8.1.x updated: Correctly handle encoding for cache hash generation (#10128)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 811f8dee8b Correctly handle encoding for cache hash generation (#10128) 811f8dee8b is described below commit 811f8dee8b50816db9d05083771477ddd0cf1230 Author: Brian Neradt AuthorDate: Tue Aug 1 13:51:44 2023 -0500 Correctly handle encoding for cache hash generation (#10128) Since origins may treat URL encoded or unencoded paths, query parameters, or fragments differently, we should cache them separately. This updates our URL cache hashing logic to not unencode these components of a URI. --- proxy/hdrs/URL.cc | 10 proxy/hdrs/unit_tests/test_URL.cc | 101 ++ 2 files changed, 111 insertions(+) diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc index 9edf1a43cc..e38df3379b 100644 --- a/proxy/hdrs/URL.cc +++ b/proxy/hdrs/URL.cc @@ -1776,6 +1776,16 @@ url_CryptoHash_get_general(const URLImpl *url, CryptoContext , CryptoHash while (t < ends[i]) { if ((i == 0) || (i == 6)) { // scheme and host unescape_str_tolower(p, e, t, ends[i], s); +} else if (i == 8 || i == 10 || i == 12) { // path, params, query + // Don't unescape the parts of the URI that are processed by the + // origin since it may behave differently based upon whether these are + // escaped or not. Therefore differently encoded strings should be + // cached separately via differentiated hashes. + int path_len = ends[i] - t; + int min_len = std::min(path_len, static_cast(e - p)); + memcpy(p, t, min_len); + p += min_len; + t += min_len; } else { unescape_str(p, e, t, ends[i], s); } diff --git a/proxy/hdrs/unit_tests/test_URL.cc b/proxy/hdrs/unit_tests/test_URL.cc index b022d068e4..44f621c76f 100644 --- a/proxy/hdrs/unit_tests/test_URL.cc +++ b/proxy/hdrs/unit_tests/test_URL.cc @@ -44,3 +44,104 @@ TEST_CASE("Validate Scheme", "[proxy][validscheme]") } } } + +struct get_hash_test_case { + const std::string description; + const std::string uri_1; + const std::string uri_2; + const bool has_equal_hash; +}; + +constexpr bool HAS_EQUAL_HASH = true; + +// clang-format off +std::vector get_hash_test_cases = { + { +"No encoding: equal hashes", + "http://one.example.com/a/path?name=value#some=value?with_question#fragment;, + "http://one.example.com/a/path?name=value#some=value?with_question#fragment;, +HAS_EQUAL_HASH, + }, + { +"Scheme encoded: equal hashes", + "http%3C://one.example.com/a/path?name=value#some=value?with_question#fragment", + "http<://one.example.com/a/path?name=value#some=value?with_question#fragment", +HAS_EQUAL_HASH, + }, + { +"Host encoded: equal hashes", + "http://one%2Eexample.com/a/path?name=value#some=value?with_question#fragment;, + "http://one.example.com/a/path?name=value#some=value?with_question#fragment;, +HAS_EQUAL_HASH, + }, + { +"Path encoded: differing hashes", + "http://one.example.com/a%2Fpath?name=value#some=value?with_question#fragment;, + "http://one.example.com/a/path?name=value#some=value?with_question#fragment;, +!HAS_EQUAL_HASH, + }, + { +"Query = encoded: differing hashes", + "http://one.example.com/a/path?name%3Dvalue#some=value?with_question#fragment;, + "http://one.example.com/a/path?name=value#some=value?with_question#fragment;, +!HAS_EQUAL_HASH, + }, + { +"Query internal encoded: differing hashes", + "http://one.example.com/a/path?name=valu%5D#some=value?with_question#fragment;, + "http://one.example.com/a/path?name=valu]#some=value?with_question#fragment;, +!HAS_EQUAL_HASH, + }, + { +"Fragment encoded: fragment is not part of the hash", + "http://one.example.com/a/path?name=value#some=value?with_question#frag%7Dent;, + "http://one.example.com/a/path?name=value#some=value?with_question/frag}ent;, +HAS_EQUAL_HASH, + }, + { +"Username encoded: equal hashes", +"mysql://my%7Eser:mypassword@localhost/mydatabase", +"mysql://my~ser:mypassword@localhost/mydatabase", +HAS_EQUAL_HASH, + }, + { +"Password encoded: equal hashes", +"mysql://myuser:mypa%24sword@localhost/mydatabase", +"mysql://myuser:mypa$sword@localhost/mydatabase", +HAS_EQUAL_HASH, + }, +}; + +/** Return the hash related to a URI. + * + * @param[in] uri The URI to hash. + * @return The hash of the URI. + */ +CryptoHash +get_hash(const std::string ) +{ + URL url; + Hd
[trafficserver] branch master updated: Reject reserved h2 to h3 frame types (#10113)
This is an automated email from the ASF dual-hosted git repository. eze 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 dc1a7e3c6f Reject reserved h2 to h3 frame types (#10113) dc1a7e3c6f is described below commit dc1a7e3c6f89a3b897054516ec63505fb8c84f9a Author: Evan Zelkowitz AuthorDate: Fri Jul 28 14:38:00 2023 -0600 Reject reserved h2 to h3 frame types (#10113) --- proxy/http3/Http3DebugNames.cc| 6 ++ proxy/http3/Http3ProtocolEnforcer.cc | 11 ++- proxy/http3/test/test_Http3FrameDispatcher.cc | 130 -- 3 files changed, 120 insertions(+), 27 deletions(-) diff --git a/proxy/http3/Http3DebugNames.cc b/proxy/http3/Http3DebugNames.cc index 9e3fbf9640..321c33b328 100644 --- a/proxy/http3/Http3DebugNames.cc +++ b/proxy/http3/Http3DebugNames.cc @@ -44,6 +44,12 @@ Http3DebugNames::frame_type(Http3FrameType type) return "GOAWAY"; case Http3FrameType::DUPLICATE_PUSH_ID: return "DUPLICATE_PUSH_ID"; + case Http3FrameType::X_RESERVED_1: +return "X_RESERVED_1"; + case Http3FrameType::X_RESERVED_2: +return "X_RESERVED_2"; + case Http3FrameType::X_RESERVED_3: +return "X_RESERVED_3"; case Http3FrameType::UNKNOWN: default: return "UNKNOWN"; diff --git a/proxy/http3/Http3ProtocolEnforcer.cc b/proxy/http3/Http3ProtocolEnforcer.cc index 9a90cda451..b2b64daad6 100644 --- a/proxy/http3/Http3ProtocolEnforcer.cc +++ b/proxy/http3/Http3ProtocolEnforcer.cc @@ -46,11 +46,20 @@ Http3ProtocolEnforcer::handle_frame(std::shared_ptr frame, int } else if (frame_seq != 0 && f_type == Http3FrameType::SETTINGS) { error = std::make_unique(Http3ErrorCode::H3_FRAME_UNEXPECTED, "only one SETTINGS frame is allowed per the control stream"); -} else if (f_type == Http3FrameType::DATA || f_type == Http3FrameType::HEADERS) { +} else if (f_type == Http3FrameType::DATA || f_type == Http3FrameType::HEADERS || f_type == Http3FrameType::X_RESERVED_1 || + f_type == Http3FrameType::X_RESERVED_2 || f_type == Http3FrameType::X_RESERVED_3) { std::string error_msg = Http3DebugNames::frame_type(f_type); error_msg.append(" frame is not allowed on control stream"); error = std::make_unique(Http3ErrorCode::H3_FRAME_UNEXPECTED, error_msg.c_str()); } + } else { +if (f_type == Http3FrameType::X_RESERVED_1 || f_type == Http3FrameType::X_RESERVED_2 || +f_type == Http3FrameType::X_RESERVED_3) { + std::string error_msg = Http3DebugNames::frame_type(f_type); + error_msg.append(" frame is not allowed on any stream"); + error = std::make_unique(Http3ErrorCode::H3_FRAME_UNEXPECTED, error_msg.c_str()); +} } + return error; } diff --git a/proxy/http3/test/test_Http3FrameDispatcher.cc b/proxy/http3/test/test_Http3FrameDispatcher.cc index 8ba980e202..0987e4e8dd 100644 --- a/proxy/http3/test/test_Http3FrameDispatcher.cc +++ b/proxy/http3/test/test_Http3FrameDispatcher.cc @@ -29,32 +29,37 @@ TEST_CASE("Http3FrameHandler dispatch", "[http3]") { - uint8_t input[] = {// 1st frame (HEADERS) - 0x01, 0x04, 0x11, 0x22, 0x33, 0x44, - // 2nd frame (DATA) - 0x00, 0x04, 0xaa, 0xbb, 0xcc, 0xdd, - // 3rd frame (incomplete) - 0xff}; - - Http3FrameDispatcher http3FrameDispatcher; - Http3MockFrameHandler handler; - http3FrameDispatcher.add_handler(); - - MIOBuffer *buf = new_MIOBuffer(BUFFER_SIZE_INDEX_512); - IOBufferReader *reader = buf->alloc_reader(); - uint64_t nread = 0; - Http3ErrorUPtr error = Http3ErrorUPtr(new Http3NoError()); - - buf->write(input, sizeof(input)); - - // Initial state - CHECK(handler.total_frame_received == 0); - CHECK(nread == 0); - - error = http3FrameDispatcher.on_read_ready(0, Http3StreamType::UNKNOWN, *reader, nread); - CHECK(error->app_error_code == Http3ErrorCode::H3_NO_ERROR); - CHECK(handler.total_frame_received == 1); - CHECK(nread == 12); + SECTION("Test good case") + { +uint8_t input[] = {// 1st frame (HEADERS) + 0x01, 0x04, 0x11, 0x22, 0x33, 0x44, + // 2nd frame (DATA) + 0x00, 0x04, 0xaa, 0xbb, 0xcc, 0xdd, + // 3rd frame (incomplete) + 0xff}; + +Http3FrameDispatcher http3FrameDispatcher; +Http3MockFrameHandler handler; +Http3ProtocolEnforcer enforcer; +http3FrameDispatcher.add_handler(); +http3FrameDispatcher.add_handler(); + +MIOBuffer *buf = new_MIOBuffer(BUFFER_SIZE_INDEX_512); +IOBufferReader *reader = buf->alloc_reader
[trafficserver] branch master updated (a996152017 -> 488d0d1d7b)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from a996152017 libswoc: Remove legacy BufferWriter. (#10069) add 488d0d1d7b Add quiche openssl lib to LDFLAGS (#10102) No new revisions were added by this update. Summary of changes: tools/build_h3_tools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver] branch master updated: Adding host URL to NextHop Strategies debug message during host mark down. (#9960)
This is an automated email from the ASF dual-hosted git repository. eze 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 930236bef9 Adding host URL to NextHop Strategies debug message during host mark down. (#9960) 930236bef9 is described below commit 930236bef942b73520eacd0f2a9b9b9038ec643f Author: Tyler Morgan AuthorDate: Mon Jul 24 15:42:10 2023 -0400 Adding host URL to NextHop Strategies debug message during host mark down. (#9960) * adds feature to close #8050 closes #8050 --- proxy/http/remap/NextHopHealthStatus.cc | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/proxy/http/remap/NextHopHealthStatus.cc b/proxy/http/remap/NextHopHealthStatus.cc index b553b95104..7cff756187 100644 --- a/proxy/http/remap/NextHopHealthStatus.cc +++ b/proxy/http/remap/NextHopHealthStatus.cc @@ -76,6 +76,7 @@ NextHopHealthStatus::markNextHop(TSHttpTxn txn, const char *hostname, const int int64_t fail_threshold = sm->t_state.txn_conf->parent_fail_threshold; int64_t retry_time = sm->t_state.txn_conf->parent_retry_time; uint32_t new_fail_count = 0; + const char *host= sm->t_state.request_data.get_host(); // make sure we're called back with a result structure for a parent // that is being retried. @@ -123,7 +124,9 @@ NextHopHealthStatus::markNextHop(TSHttpTxn txn, const char *hostname, const int new_fail_count = h->failCount += 1; } } // end lock guard - NH_Note("[%" PRId64 "] NextHop %s marked as down %s", sm_id, (result.retry) ? "retry" : "initially", h->hostname.c_str()); + + NH_Note("[%" PRId64 "] NextHop %s marked as down %s", sm_id, (result.retry) ? "retry" : "initially", host ? host : "(null)"); + } else { // if the last failure was outside the retry window, set the failcount to 1 and failedAt to now. { // lock guard
[trafficserver] branch master updated: Add host_override NH option (#9984)
This is an automated email from the ASF dual-hosted git repository. eze 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 04f0ef346f Add host_override NH option (#9984) 04f0ef346f is described below commit 04f0ef346f1b849556868392ccda4b3a32b673f8 Author: Evan Zelkowitz AuthorDate: Wed Jul 12 09:04:57 2023 -0600 Add host_override NH option (#9984) sets the host header to the upstream parent instead of the original request --- doc/admin-guide/files/strategies.yaml.en.rst | 3 +++ proxy/http/remap/NextHopConsistentHash.cc| 2 ++ proxy/http/remap/NextHopRoundRobin.cc| 1 + proxy/http/remap/NextHopSelectionStrategy.cc | 14 ++ proxy/http/remap/NextHopSelectionStrategy.h | 3 +++ 5 files changed, 23 insertions(+) diff --git a/doc/admin-guide/files/strategies.yaml.en.rst b/doc/admin-guide/files/strategies.yaml.en.rst index f5b8443c17..19353d0d48 100644 --- a/doc/admin-guide/files/strategies.yaml.en.rst +++ b/doc/admin-guide/files/strategies.yaml.en.rst @@ -230,6 +230,8 @@ Each **strategy** in the list may using the following parameters: (**self** should only be necessary when the local hostname can only be translated to an IP address with a DNS lookup.) +- **host_override**: A boolean value that will set the host header to the selected parent rather than the original host. **true** sets host header to selected parent. **false** (default) leaves the host header untouched. + Example: :: @@ -254,6 +256,7 @@ Example: - passive - strategy: 'strategy-2' policy: rr_strict + host_override: true hash_url: cache hash_key: path+query go_direct: true diff --git a/proxy/http/remap/NextHopConsistentHash.cc b/proxy/http/remap/NextHopConsistentHash.cc index fe23dbe854..51a14edc1e 100644 --- a/proxy/http/remap/NextHopConsistentHash.cc +++ b/proxy/http/remap/NextHopConsistentHash.cc @@ -496,5 +496,7 @@ NextHopConsistentHash::findNextHop(TSHttpTxn txnp, void *ih, time_t now) ParentResultStr[result.result]); } + setHostHeader(txnp, result.hostname); + return; } diff --git a/proxy/http/remap/NextHopRoundRobin.cc b/proxy/http/remap/NextHopRoundRobin.cc index f2e872553e..508228e00b 100644 --- a/proxy/http/remap/NextHopRoundRobin.cc +++ b/proxy/http/remap/NextHopRoundRobin.cc @@ -171,6 +171,7 @@ NextHopRoundRobin::findNextHop(TSHttpTxn txnp, void *ih, time_t now) result->last_parent = cur_hst_index; result->last_group = cur_grp_index; result->retry = parentRetry; + setHostHeader(txnp, result->hostname); ink_assert(result->hostname != nullptr); ink_assert(result->port != 0); NH_Debug(NH_DEBUG_TAG, "[%" PRIu64 "] Chosen parent = %s.%d", sm_id, result->hostname, result->port); diff --git a/proxy/http/remap/NextHopSelectionStrategy.cc b/proxy/http/remap/NextHopSelectionStrategy.cc index a924c8793e..bb8482a4bc 100644 --- a/proxy/http/remap/NextHopSelectionStrategy.cc +++ b/proxy/http/remap/NextHopSelectionStrategy.cc @@ -82,6 +82,10 @@ NextHopSelectionStrategy::NextHopSelectionStrategy(const std::string_view , cache_peer_result = n["cache_peer_result"].as(); } +if (n["host_override"]) { + host_override = n["host_override"].as(); +} + // failover node. YAML::Node failover_node_n = n["failover"]; if (failover_node_n) { @@ -255,6 +259,16 @@ NextHopSelectionStrategy::markNextHop(TSHttpTxn txnp, const char *hostname, cons return passive_health.markNextHop(txnp, hostname, port, status, ih, now); } +void +NextHopSelectionStrategy::setHostHeader(TSHttpTxn txnp, const char *hostname) +{ + if (host_override && nullptr != hostname) { +HttpSM *sm = reinterpret_cast(txnp); +sm->t_state.hdr_info.client_request.value_set(MIME_FIELD_HOST, MIME_LEN_HOST, hostname, strlen(hostname)); +NH_Debug(NH_DEBUG_TAG, "[%" PRIu64 "] overriding host header with parent %s", sm->sm_id, hostname); + } +} + bool NextHopSelectionStrategy::nextHopExists(TSHttpTxn txnp, void *ih) { diff --git a/proxy/http/remap/NextHopSelectionStrategy.h b/proxy/http/remap/NextHopSelectionStrategy.h index 1fe49cb701..d327acddef 100644 --- a/proxy/http/remap/NextHopSelectionStrategy.h +++ b/proxy/http/remap/NextHopSelectionStrategy.h @@ -202,6 +202,8 @@ public: const time_t now = 0); bool nextHopExists(TSHttpTxn txnp, void *ih = nullptr); + void setHostHeader(TSHttpTxn txnp, const char *hostname); + virtual ParentRetry_t responseIsRetryable(int64_t sm_id, HttpTransact::CurrentInfo _info, HTTPStatus response_code); void retryComplete(TSHttpTxn txn, const char *hostname, const int port); @@ -211,6 +213,7 @@ public: bool parent_is_proxy
[trafficserver] branch master updated (652e084593 -> fee8107f98)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from 652e084593 fix: memory leak when using modsecurity (#9798) add fee8107f98 Fix spelling and add context around changelog (#9790) No new revisions were added by this update. Summary of changes: doc/release-notes/release-procedures.en.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver] tag 8.1.6 created (now 5a73a6472c)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to tag 8.1.6 in repository https://gitbox.apache.org/repos/asf/trafficserver.git at 5a73a6472c (commit) No new revisions were added by this update.
[trafficserver] tag 8.1.7 created (now 005a6ce785)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to tag 8.1.7 in repository https://gitbox.apache.org/repos/asf/trafficserver.git at 005a6ce785 (commit) No new revisions were added by this update.
[trafficserver-site] branch asf-site updated: Add 9.2.1 and 8.1.7 Releases
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/trafficserver-site.git The following commit(s) were added to refs/heads/asf-site by this push: new b5fe52a Add 9.2.1 and 8.1.7 Releases b5fe52a is described below commit b5fe52a57beff49953677dd48706ce6771c0abb8 Author: Evan Zelkowitz AuthorDate: Mon Jun 12 10:31:30 2023 -0600 Add 9.2.1 and 8.1.7 Releases --- source/markdown/downloads.mdtext | 34 +- source/markdown/index.html | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/source/markdown/downloads.mdtext b/source/markdown/downloads.mdtext index 179afaa..aeefd0d 100644 --- a/source/markdown/downloads.mdtext +++ b/source/markdown/downloads.mdtext @@ -32,36 +32,36 @@ will be needed. You can also [browse through all releases](https://archive.apache.org/dist/trafficserver/) and hash signatures. -# Current v9.x Release -- 9.2.0 # {#9.2.0} +# Current v9.x Release -- 9.2.1 # {#9.2.1} - Apache Traffic Server v9.2.0 was released on January 23rd, 2023. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.0.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.0.tar.bz2.sha512)] + Apache Traffic Server v9.2.1 was released on June 12th, 2023. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.1.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.2.1.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-9.2.0.tar.bz2; - class="download_ts">Traffic Server 9.2.0 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-9.2.1.tar.bz2; + class="download_ts">Traffic Server 9.2.1 -v9.2.0 is our latest stable release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.0) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:9.2.0). +v9.2.1 is our latest stable release. Additional details for this release are in the +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.1) +and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:9.2.1). For details on the v9.x release, please see [9.2.x News](https://docs.trafficserver.apache.org/en/9.2.x/release-notes/whats-new.en.html) (there's a new section specific to v9.2.x). There are also details about [upgrading to 9.x](https://docs.trafficserver.apache.org/en/9.2.x/release-notes/upgrading.en.html). -# Current v8.x Release -- 8.1.6 # {#8.1.6} +# Current v8.x Release -- 8.1.7 # {#8.1.7} - Apache Traffic Server v8.1.6 was released on December 15th, 2022. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.6.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.6.tar.bz2.sha512)] + Apache Traffic Server v8.1.7 was released on June 12th, 2023. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.7.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.7.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.6.tar.bz2; - class="download_ts">Traffic Server 8.1.6 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.7.tar.bz2; + class="download_ts">Traffic Server 8.1.7 v8.1.6 is our latest stable release for the 8.x release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.6) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.6). +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.7) +and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.7). # Archived Releases diff --git a/source/markdown/index.html b/source/markdown/index.html index f48e1b3..321afdb 100644 --- a/source/markdown/index.html +++ b/source/markdown/index.html @@ -287,6 +287,7 @@ + June 12, 2024: We are releasing both v9.2.1 and v8.1.7 which include security fixes. We recommend everyone to upgrade to one of these versions of ATS. January 23, 2023:The first version of the stable v9.2.x ATS branch is now available for download. This version, \ v9.2.0, is a feature and bug fix release over previous v9.1.x releases. December 15, 2022: We are releasing both v9.1.4 and v8.1.6 which include security fixes. We recommend everyone to upgrade to one of these versions of ATS.
svn commit: r62382 - in /release/trafficserver: trafficserver-8.1.7.tar.bz2 trafficserver-8.1.7.tar.bz2.asc trafficserver-8.1.7.tar.bz2.sha512
Author: eze Date: Mon Jun 12 16:23:53 2023 New Revision: 62382 Log: Release 8.1.7 Added: release/trafficserver/trafficserver-8.1.7.tar.bz2 (with props) release/trafficserver/trafficserver-8.1.7.tar.bz2.asc release/trafficserver/trafficserver-8.1.7.tar.bz2.sha512 Added: release/trafficserver/trafficserver-8.1.7.tar.bz2 == Binary file - no diff available. Propchange: release/trafficserver/trafficserver-8.1.7.tar.bz2 -- svn:mime-type = application/octet-stream Added: release/trafficserver/trafficserver-8.1.7.tar.bz2.asc == --- release/trafficserver/trafficserver-8.1.7.tar.bz2.asc (added) +++ release/trafficserver/trafficserver-8.1.7.tar.bz2.asc Mon Jun 12 16:23:53 2023 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEcxRKqDsQqXsEwemDFa1i6UAQTpYFAmR/uH8ACgkQFa1i6UAQ +TpbkTQf/S7co3fZekgkQY/FS5Q9cQfJ+fljmIdwUn6CzdFLkTnOWIMjLHUIMwAgz +uuCZE+ivmdtBYx31SDcjHz3buGbvQX+pBmBTk1cTS8LOawnVwhXppky8hF+izkqG +7NRB9G4+w61NzrbWPlmQjPHko15074O+C1IgSm5dor90Q2dr3k6A4sFGAJAg+I3z +BkE6uJqYDt7CELWhRgKkKQ/s58Pdw+ml7L4cylDRqfKu9dfyPrT7M+wHmeNV+oCn +4rrjKl+5a8NlghNjGGRWVrcofCopdXI2mvQgoN5E008LFFUwDOS12yLabCWn+dga +YLOpee8qTgxrObxXHSrUdb8FQuoqSw== +=bexJ +-END PGP SIGNATURE- Added: release/trafficserver/trafficserver-8.1.7.tar.bz2.sha512 == --- release/trafficserver/trafficserver-8.1.7.tar.bz2.sha512 (added) +++ release/trafficserver/trafficserver-8.1.7.tar.bz2.sha512 Mon Jun 12 16:23:53 2023 @@ -0,0 +1 @@ +75dd9ccc2b45443ff57eaff62f70dc6659eec544bd66ab4d90d040a4275b629114dea6f7f957859e3c8c43af3206bb87e1616fdab70291c334dda4041ae6a9e0 trafficserver-8.1.7.tar.bz2
[trafficserver] annotated tag 8.1.7-rc0 updated (005a6ce785 -> b51416d234)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.7-rc0 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.7-rc0 was modified! *** from 005a6ce785 (commit) to b51416d234 (tag) tagging 005a6ce785df717b2bf565dc07b66b4f918c024c (commit) replaces 8.1.6-rc0 by Evan Zelkowitz on Tue Jun 6 16:51:57 2023 -0600 - Log - Release Candidate 8.1.7-rc0 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmR/uI0ZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk4/xCEACzKk0LaSdadVW4CWWr6I8U d9PEGR5bsNVNzYvlpJj493fdBT5xwvG6VChpYW/ylgw16kPeM5wxH6MhGazFi2Zt bEGZ56+yY5NfYua9G03jcyasnvEmBPwSn4nkKQJKnvQdWn+JLuJHHk02Fy7Z79W6 wcyafKu3WCQ3+QMWxRDBa3rwUYqzH/uAKT3nLKJS/ZfitzpSUDdCeqCJ/ib6FqKk k+Pu6vOhr/hRMHhP5S68pnAqHPDhDy9GyeI8Zce8Qua7OjXAleSCUFaHOtGtaBJt 8+zg5C8UbqLwOxvAp29X4ejc9UFL5zJxugVQbB1dxFZqcHIws/eYeSxzS0OdAUyZ dFAPvKoFZy1/nFyK0fEg5uxTxq12yM3eyXfj17N0SiKGUsfAlydP2UTFyn+uyS7b WvL1N49xC+AMc37hLPVnXQzK4yIVfJsNmZ1SrAoib+FuWY3K+PDETNz6qE+Wv0P+ rHdXfRVOAo3VNnV/unMM2rTwtpIEX/PZ/wKuPNFiqg/JDftFw2J9BBd20JK6POHs sELMiJJvniqVT+k+3ZSCn06PSWgW4QhQieGUQAYiNuLW6cbV0SMiYSv2BPv8DP7c P4bco2ZmgY35XRXb12fpE0y8YQemyb1kAFamMHXcB2lfyLrimyUkxr/ZbkdgEDvL cwimjXdWQ5Zdie5CT0t/0Q== =oSf2 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] branch 8.1.x updated: Create new changelog and bump version to 8.1.7
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 005a6ce785 Create new changelog and bump version to 8.1.7 005a6ce785 is described below commit 005a6ce785df717b2bf565dc07b66b4f918c024c Author: Evan Zelkowitz AuthorDate: Tue Jun 6 16:50:45 2023 -0600 Create new changelog and bump version to 8.1.7 --- CHANGELOG-8.1.7 | 4 configure.ac | 4 ++-- tools/package/trafficserver.spec | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG-8.1.7 b/CHANGELOG-8.1.7 new file mode 100644 index 00..26cb38c93c --- /dev/null +++ b/CHANGELOG-8.1.7 @@ -0,0 +1,4 @@ +Changes with Apache Traffic Server 8.1.7 + #9780 - s3_auth: Fix hash calculation + #9787 - 8.1.x: Add back push_method_enabled enforcement + #9789 - 8.1.x: Deny the TRACE method by default diff --git a/configure.ac b/configure.ac index b40664ff7b..6985d3ae00 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # -m4_define([TS_VERSION_S],[8.1.6]) -m4_define([TS_VERSION_N],[8001006]) +m4_define([TS_VERSION_S],[8.1.7]) +m4_define([TS_VERSION_N],[8001007]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [d...@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) AC_PREREQ([2.59]) diff --git a/tools/package/trafficserver.spec b/tools/package/trafficserver.spec index 6131bf96f7..08340a0c87 100755 --- a/tools/package/trafficserver.spec +++ b/tools/package/trafficserver.spec @@ -26,7 +26,7 @@ Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache Name: trafficserver -Version: 8.1.6 +Version: 8.1.7 Release: %{release}%{?dist} License: Apache Software License 2.0 (AL2) Group: System Environment/Daemons
[trafficserver] branch 8.1.x updated: Deny the TRACE method by default (#9789)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new b49ae06363 Deny the TRACE method by default (#9789) b49ae06363 is described below commit b49ae063632b1f40b9bd45aa66524924e2c26600 Author: Bryan Call AuthorDate: Tue Jun 6 15:08:08 2023 -0700 Deny the TRACE method by default (#9789) --- configs/ip_allow.config.default | 4 ++-- doc/admin-guide/files/ip_allow.config.en.rst | 12 ++-- tests/gold_tests/autest-site/min_cfg/ip_allow.config | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/ip_allow.config.default b/configs/ip_allow.config.default index 264d0786d3..0bf3b6e446 100644 --- a/configs/ip_allow.config.default +++ b/configs/ip_allow.config.default @@ -23,5 +23,5 @@ src_ip=127.0.0.1 action=ip_allow method=ALL src_ip=::1action=ip_allow method=ALL # Deny PURGE, DELETE, and PUSH for all (this implies allow other methods for all) -src_ip=0.0.0.0-255.255.255.255action=ip_deny method=PUSH|PURGE|DELETE -src_ip=::-::::::: action=ip_deny method=PUSH|PURGE|DELETE +src_ip=0.0.0.0-255.255.255.255action=ip_deny method=PUSH|PURGE|DELETE|TRACE +src_ip=::-::::::: action=ip_deny method=PUSH|PURGE|DELETE|TRACE diff --git a/doc/admin-guide/files/ip_allow.config.en.rst b/doc/admin-guide/files/ip_allow.config.en.rst index 537afcb6ea..2917c12663 100644 --- a/doc/admin-guide/files/ip_allow.config.en.rst +++ b/doc/admin-guide/files/ip_allow.config.en.rst @@ -70,20 +70,20 @@ deny, one explicit and the other implicit. The ``src_ip`` rules are checked when to |TS|. The ``dst_ip`` rules are checked when |TS| connects to another host. By default the :file:`ip_allow.config` file contains the following lines, which allows all methods -to connections from localhost and denies the ``PUSH``, ``PURGE`` and ``DELETE`` methods to all other -IP addresses (note this allows all other methods to all IP addresses):: +to connections from localhost and denies the ``PUSH``, ``PURGE``, ``DELETE`` and ``TRACE`` methods +to all other IP addresses (note this allows all other methods to all IP addresses):: src_ip=127.0.0.1 action=ip_allow method=ALL src_ip=::1action=ip_allow method=ALL -src_ip=0.0.0.0-255.255.255.255action=ip_deny method=PUSH|PURGE|DELETE -src_ip=::-::::::: action=ip_deny method=PUSH|PURGE|DELETE +src_ip=0.0.0.0-255.255.255.255action=ip_deny method=PUSH|PURGE|DELETE|TRACE +src_ip=::-::::::: action=ip_deny method=PUSH|PURGE|DELETE|TRACE This could also be specified as:: src_ip=127.0.0.1 action=ip_allow method=ALL src_ip=::1 action=ip_allow method=ALL -src_ip=0/0 action=ip_deny method=PUSH|PURGE|DELETE -src_ip=::/0action=ip_deny method=PUSH|PURGE|DELETE +src_ip=0/0 action=ip_deny method=PUSH|PURGE|DELETE|TRACE +src_ip=::/0action=ip_deny method=PUSH|PURGE|DELETE|TRACE Examples diff --git a/tests/gold_tests/autest-site/min_cfg/ip_allow.config b/tests/gold_tests/autest-site/min_cfg/ip_allow.config index 061bbe5c0b..b795a59cad 100644 --- a/tests/gold_tests/autest-site/min_cfg/ip_allow.config +++ b/tests/gold_tests/autest-site/min_cfg/ip_allow.config @@ -1,4 +1,4 @@ src_ip=127.0.0.1 action=ip_allow method=ALL src_ip=::1 action=ip_allow method=ALL -src_ip=0.0.0.0-255.255.255.255 action=ip_deny method=PUSH|PURGE|DELETE -src_ip=::-::::::: action=ip_deny method=PUSH|PURGE|DELETE \ No newline at end of file +src_ip=0.0.0.0-255.255.255.255 action=ip_deny method=PUSH|PURGE|DELETE|TRACE +src_ip=::-::::::: action=ip_deny method=PUSH|PURGE|DELETE|TRACE
[trafficserver] branch 8.1.x updated: Add back push_method_enabled enforcement (#9787)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 35dd3efde7 Add back push_method_enabled enforcement (#9787) 35dd3efde7 is described below commit 35dd3efde78a73aefa257e12b8fe78d6cd646ba0 Author: Brian Neradt AuthorDate: Tue Jun 6 16:51:22 2023 -0500 Add back push_method_enabled enforcement (#9787) proxy.config.http.push_method_enabled. This adds back the enforcemenent of this configuration so that hosts can only PUSH when proxy.config.http.push_method_enabled is 1. Conflicts: proxy/http/HttpSM.cc tests/gold_tests/bigobj/bigobj.test.py tests/gold_tests/ip_allow/ip_allow.test.py tests/gold_tests/proxy_protocol/proxy_serve_stale.test.py tests/gold_tests/proxy_protocol/proxy_serve_stale_dns_fail.test.py --- proxy/http/HttpSM.cc | 7 +++ 1 file changed, 7 insertions(+) diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index e51d51710e..1080c66c3f 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -773,6 +773,13 @@ HttpSM::state_read_client_request_header(int event, void *data) } } +if (t_state.hdr_info.client_request.method_get_wksidx() == HTTP_WKSIDX_PUSH && +t_state.http_config_param->push_method_enabled == 0) { + SMDebug("http", "Rejecting PUSH request because push_method_enabled is 0."); + call_transact_and_set_next_state(HttpTransact::Forbidden); + return 0; +} + if (t_state.hdr_info.client_request.method_get_wksidx() == HTTP_WKSIDX_TRACE || (t_state.hdr_info.client_request.get_content_length() == 0 && t_state.client_info.transfer_encoding != HttpTransact::CHUNKED_ENCODING)) {
[trafficserver] branch 8.1.x updated: s3_auth: Fix hash calculation (#9780)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 496fa2c4cb s3_auth: Fix hash calculation (#9780) 496fa2c4cb is described below commit 496fa2c4cbdf2b3d6c61760a3fb6675b74b549f0 Author: Masakazu Kitajo AuthorDate: Wed Jun 7 04:40:19 2023 +0900 s3_auth: Fix hash calculation (#9780) (cherry picked from commit c54be207815c88431b8448c187e6163fa413e790) --- plugins/s3_auth/aws_auth_v4.cc | 5 + plugins/s3_auth/aws_auth_v4.h | 1 + plugins/s3_auth/aws_auth_v4_wrap.h | 5 + plugins/s3_auth/unit_tests/test_aws_auth_v4.cc | 14 ++ plugins/s3_auth/unit_tests/test_aws_auth_v4.h | 7 +++ 5 files changed, 32 insertions(+) diff --git a/plugins/s3_auth/aws_auth_v4.cc b/plugins/s3_auth/aws_auth_v4.cc index b252d92677..5df57151c6 100644 --- a/plugins/s3_auth/aws_auth_v4.cc +++ b/plugins/s3_auth/aws_auth_v4.cc @@ -303,6 +303,11 @@ getCanonicalRequestSha256Hash(TsInterface , bool signPayload, const StringSe str = api.getPath(); String path("/"); path.append(str, length); + str = api.getParams(); + if (length > 0) { +path.append(";", 1); +path.append(str, length); + } String canonicalUri = canonicalEncode(path, /* isObjectName */ true); sha256Update(, canonicalUri); sha256Update(, "\n"); diff --git a/plugins/s3_auth/aws_auth_v4.h b/plugins/s3_auth/aws_auth_v4.h index ff72ccfcbc..095cc036e9 100644 --- a/plugins/s3_auth/aws_auth_v4.h +++ b/plugins/s3_auth/aws_auth_v4.h @@ -47,6 +47,7 @@ public: virtual const char *getMethod(int *length) = 0; virtual const char *getHost(int *length) = 0; virtual const char *getPath(int *length) = 0; + virtual const char *getParams(int *length) = 0; virtual const char *getQuery(int *length) = 0; virtual HeaderIterator headerBegin() = 0; virtual HeaderIterator headerEnd() = 0; diff --git a/plugins/s3_auth/aws_auth_v4_wrap.h b/plugins/s3_auth/aws_auth_v4_wrap.h index a4351478c6..8097c2b9af 100644 --- a/plugins/s3_auth/aws_auth_v4_wrap.h +++ b/plugins/s3_auth/aws_auth_v4_wrap.h @@ -108,6 +108,11 @@ public: return TSUrlPathGet(_bufp, _url, len); } const char * + getParams(int *len) override + { +return TSUrlHttpParamsGet(_bufp, _url, len); + } + const char * getQuery(int *len) override { return TSUrlHttpQueryGet(_bufp, _url, len); diff --git a/plugins/s3_auth/unit_tests/test_aws_auth_v4.cc b/plugins/s3_auth/unit_tests/test_aws_auth_v4.cc index d803ead047..8cf9b2948e 100644 --- a/plugins/s3_auth/unit_tests/test_aws_auth_v4.cc +++ b/plugins/s3_auth/unit_tests/test_aws_auth_v4.cc @@ -404,6 +404,7 @@ TEST_CASE("AWSAuthSpecByExample: GET Object", "[AWS][auth][SpecByExample]") api._method.assign("GET"); api._host.assign("examplebucket.s3.amazonaws.com"); api._path.assign("test.txt"); + api._params.assign(""); api._query.assign(""); api._headers.insert(std::make_pair("Host", "examplebucket.s3.amazonaws.com")); api._headers.insert(std::make_pair("Range", "bytes=0-9")); @@ -449,6 +450,7 @@ TEST_CASE("AWSAuthSpecByExample: GET Bucket Lifecycle", "[AWS][auth][SpecByExamp api._method.assign("GET"); api._host.assign("examplebucket.s3.amazonaws.com"); api._path.assign(""); + api._params.assign(""); api._query.assign("lifecycle"); api._headers.insert(std::make_pair("Host", "examplebucket.s3.amazonaws.com")); api._headers.insert(std::make_pair("x-amz-content-sha256", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")); @@ -493,6 +495,7 @@ TEST_CASE("AWSAuthSpecByExample: Get Bucket List Objects", "[AWS][auth][SpecByEx api._method.assign("GET"); api._host.assign("examplebucket.s3.amazonaws.com"); api._path.assign(""); + api._params.assign(""); api._query.assign("max-keys=2=J"); api._headers.insert(std::make_pair("Host", "examplebucket.s3.amazonaws.com")); api._headers.insert(std::make_pair("x-amz-content-sha256", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")); @@ -584,6 +587,7 @@ TEST_CASE("AWSAuthSpecByExample: GET Bucket List Objects, unsigned pay-load, exc api._method.assign("GET"); api._host.assign("examplebucket.s3.amazonaws.com"); api._path.assign(""); + api._params.assign(""); api._query.assign("max-keys=2=J"); api._headers.insert(std::make_pair("Host", "examplebucket.s3.amaz
[trafficserver-ci] 01/01: Merge pull request #152 from apache/expensive-tests
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git commit fc855914a20f69d587c2332a5e0650a86d5b7352 Merge: be7b920 fc24181 Author: Evan Zelkowitz AuthorDate: Wed Apr 26 14:54:45 2023 -0600 Merge pull request #152 from apache/expensive-tests Enable expensive tests on ubuntu build jenkins/github/ubuntu.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver-ci] branch main updated (be7b920 -> fc85591)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git from be7b920 Add boring to fedora:38 image (#151) add fc24181 Enable expensive tests on ubuntu build new fc85591 Merge pull request #152 from apache/expensive-tests The 1 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: jenkins/github/ubuntu.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver-ci] branch expensive-tests created (now be7b920)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch expensive-tests in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git at be7b920 Add boring to fedora:38 image (#151) No new revisions were added by this update.
[trafficserver-ci] branch expensive-tests updated: Enable expensive tests on ubuntu build
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch expensive-tests in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/expensive-tests by this push: new fc24181 Enable expensive tests on ubuntu build fc24181 is described below commit fc24181de04615cc68659abd00c39648bfb1cb06 Author: Evan Zelkowitz AuthorDate: Wed Apr 26 14:52:02 2023 -0600 Enable expensive tests on ubuntu build --- jenkins/github/ubuntu.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/github/ubuntu.pipeline b/jenkins/github/ubuntu.pipeline index 1b806d4..dae5e41 100644 --- a/jenkins/github/ubuntu.pipeline +++ b/jenkins/github/ubuntu.pipeline @@ -51,7 +51,7 @@ pipeline { autoreconf -fiv mkdir out_of_source_build_dir cd out_of_source_build_dir -CC="clang" CXX="clang++" ../configure --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-ccache || exit 1 +CC="clang" CXX="clang++" ../configure --enable-experimental-plugins --enable-example-plugins --enable-expensive-tests --prefix=/tmp/ats/ --enable-werror --enable-ccache || exit 1 make -j4 V=1 Q= || exit 1 make -j 2 check VERBOSE=Y V=1 || exit 1 make install || exit 1
[trafficserver-ci] branch coverity created (now f9dfc59)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch coverity in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git at f9dfc59 Add autest runs to quiche branch builds (#147) No new revisions were added by this update.
[trafficserver] branch master updated (dcb0c8e2c -> 0dc15471e)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from dcb0c8e2c Add a hyphen between PACKAGE_VERSION and BUILD_NUMBER (#9577) add 0dc15471e Move system stats to be a c++ plugin to be able to use time functions (#9578) No new revisions were added by this update. Summary of changes: plugins/experimental/system_stats/Makefile.inc | 4 +- .../{system_stats.c => system_stats.cc}| 49 +++--- 2 files changed, 36 insertions(+), 17 deletions(-) rename plugins/experimental/system_stats/{system_stats.c => system_stats.cc} (92%)
[trafficserver] branch master updated: Add `current_time_epoch_ms` stat to be appended before the server version. This allows computation of stats externally based on the cache time frame. This can he
This is an automated email from the ASF dual-hosted git repository. eze 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 3c4c5fc59 Add `current_time_epoch_ms` stat to be appended before the server version. This allows computation of stats externally based on the cache time frame. This can help alleviate issues with sliding windows between various stats programs that generate discrepencies (#9567) 3c4c5fc59 is described below commit 3c4c5fc59cc0318b17899450cc7bb7a021245288 Author: Evan Zelkowitz AuthorDate: Thu Mar 30 13:21:27 2023 -0600 Add `current_time_epoch_ms` stat to be appended before the server version. This allows computation of stats externally based on the cache time frame. This can help alleviate issues with sliding windows between various stats programs that generate discrepencies (#9567) --- plugins/stats_over_http/stats_over_http.cc | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/stats_over_http/stats_over_http.cc b/plugins/stats_over_http/stats_over_http.cc index 4a36c1525..7a86a3242 100644 --- a/plugins/stats_over_http/stats_over_http.cc +++ b/plugins/stats_over_http/stats_over_http.cc @@ -51,6 +51,8 @@ #include #endif +#include "tscore/ink_hrtime.h" + #define PLUGIN_NAME "stats_over_http" #define FREE_TMOUT 30 #define STR_BUFFER_SIZE 1024 @@ -411,12 +413,13 @@ json_out_stats(stats_state *my_state) { const char *version; APPEND("{ \"global\": {\n"); - TSRecordDump((TSRecordType)(TS_RECORDTYPE_PLUGIN | TS_RECORDTYPE_NODE | TS_RECORDTYPE_PROCESS), json_out_stat, my_state); version = TSTrafficServerVersionGet(); + APPEND_STAT_JSON_NUMERIC("current_time_epoch_ms", "%" PRIu64, ink_hrtime_to_msec(ink_get_hrtime_internal())); APPEND("\"server\": \""); APPEND(version); APPEND("\"\n"); + APPEND(" }\n}\n"); } @@ -491,6 +494,7 @@ csv_out_stats(stats_state *my_state) { TSRecordDump((TSRecordType)(TS_RECORDTYPE_PLUGIN | TS_RECORDTYPE_NODE | TS_RECORDTYPE_PROCESS), csv_out_stat, my_state); const char *version = TSTrafficServerVersionGet(); + APPEND_STAT_CSV_NUMERIC("current_time_epoch_ms", "%" PRIu64, ink_hrtime_to_msec(ink_get_hrtime_internal())); APPEND_STAT_CSV("version", "%s", version); }
[trafficserver] branch master updated: Update codeql.yml (#9560)
This is an automated email from the ASF dual-hosted git repository. eze 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 7b63f806e Update codeql.yml (#9560) 7b63f806e is described below commit 7b63f806ef837f1f6a3603637b1a6b0e555825bb Author: Evan Zelkowitz AuthorDate: Wed Mar 29 13:12:24 2023 -0600 Update codeql.yml (#9560) --- .github/workflows/codeql.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 697c2e1c6..7fc3b1f44 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,6 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Install dependencies run: | +sudo apt update sudo apt install libmagick++-dev libncurses-dev libpcre2-dev libbrotli-dev libluajit-5.1-dev luajit libjansson-dev libcjose-dev libmaxminddb-dev libgeoip-dev # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL
[trafficserver] branch master updated: Make header prefix matching case-insensitive in authProxy (#9465)
This is an automated email from the ASF dual-hosted git repository. eze 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 d034aa3af Make header prefix matching case-insensitive in authProxy (#9465) d034aa3af is described below commit d034aa3af7bcbab299f1c0a5cc0346b150321304 Author: Fu Tianyuan AuthorDate: Tue Feb 28 00:12:21 2023 +0800 Make header prefix matching case-insensitive in authProxy (#9465) --- plugins/authproxy/tests/authproxy_test.cc | 4 +++- plugins/authproxy/utils.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/authproxy/tests/authproxy_test.cc b/plugins/authproxy/tests/authproxy_test.cc index c9026cb32..ad527e902 100644 --- a/plugins/authproxy/tests/authproxy_test.cc +++ b/plugins/authproxy/tests/authproxy_test.cc @@ -34,6 +34,8 @@ TEST_CASE("Util methods", "[authproxy][utility]") CHECK(ContainsPrefix(string_view{"abc"}, "") == true); CHECK(ContainsPrefix(string_view{""}, "abc") == false); CHECK(ContainsPrefix(string_view{"abcdef"}, "abc\0") == true); -CHECK(ContainsPrefix(string_view{"abcdef\0"}, "abc\0") == true); +CHECK(ContainsPrefix(string_view{"AbCdef\0"}, "abc\0") == true); +CHECK(ContainsPrefix(string_view{"abcdef\0"}, "aBc\0") == true); +CHECK(ContainsPrefix(string_view{"abc\0"}, "aBcdEf\0") == false); } } diff --git a/plugins/authproxy/utils.h b/plugins/authproxy/utils.h index a7224a180..1249a3eb9 100644 --- a/plugins/authproxy/utils.h +++ b/plugins/authproxy/utils.h @@ -113,6 +113,6 @@ void HttpDebugHeader(TSMBuffer mbuf, TSMLoc mhdr); inline bool ContainsPrefix(const std::string_view str, const std::string ) { - return str.size() < prefix.size() ? false : (strncmp(str.data(), prefix.data(), prefix.size()) == 0); + return str.size() < prefix.size() ? false : (strncasecmp(str.data(), prefix.data(), prefix.size()) == 0); } // vim: set ts=4 sw=4 et :
[trafficserver-ci] branch main updated: remove expensive tests, broken right now
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/main by this push: new a70c309 remove expensive tests, broken right now a70c309 is described below commit a70c30928aaedfe7e41ff4913a3bc1bcc42ea4bb Author: Evan Zelkowitz AuthorDate: Thu Feb 23 12:34:22 2023 -0700 remove expensive tests, broken right now --- jenkins/github/rocky.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/github/rocky.pipeline b/jenkins/github/rocky.pipeline index 93eb637..cd3f58f 100644 --- a/jenkins/github/rocky.pipeline +++ b/jenkins/github/rocky.pipeline @@ -49,7 +49,7 @@ pipeline { set -e source /opt/rh/gcc-toolset-11/enable autoreconf -fiv -./configure --with-openssl=/opt/openssl-quic --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-debug --enable-ccache --enable-expensive-tests +./configure --with-openssl=/opt/openssl-quic --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-debug --enable-ccache make -j4 V=1 Q= make -j 2 check VERBOSE=Y V=1 make install
[trafficserver-ci] branch main updated: This time with the right option for expensive tests
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/main by this push: new 05251cd This time with the right option for expensive tests 05251cd is described below commit 05251cdf2b8c096dae378c19b415fd0001ad4b08 Author: Evan Zelkowitz AuthorDate: Thu Feb 23 12:24:36 2023 -0700 This time with the right option for expensive tests --- jenkins/github/rocky.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/github/rocky.pipeline b/jenkins/github/rocky.pipeline index 5ff1664..93eb637 100644 --- a/jenkins/github/rocky.pipeline +++ b/jenkins/github/rocky.pipeline @@ -49,7 +49,7 @@ pipeline { set -e source /opt/rh/gcc-toolset-11/enable autoreconf -fiv -./configure --with-openssl=/opt/openssl-quic --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-debug --enable-ccache --with-expensive-tests +./configure --with-openssl=/opt/openssl-quic --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-debug --enable-ccache --enable-expensive-tests make -j4 V=1 Q= make -j 2 check VERBOSE=Y V=1 make install
[trafficserver-ci] branch main updated (f2e7b65 -> 5d06a7e)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git from f2e7b65 Removing call to --enable-luajit in jenkins jobs (#127) add f16e900 Add --with-expensive-tests to rocky build alone new 5d06a7e Merge pull request #128 from apache/add-expensive The 1 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: jenkins/github/rocky.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver-ci] 01/01: Merge pull request #128 from apache/add-expensive
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git commit 5d06a7e7b69e1b520b199d3a30c28529f4ec0ea3 Merge: f2e7b65 f16e900 Author: Evan Zelkowitz AuthorDate: Thu Feb 23 11:57:40 2023 -0700 Merge pull request #128 from apache/add-expensive Add --with-expensive-tests to rocky build alone jenkins/github/rocky.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafficserver-ci] branch add-expensive updated: Add --with-expensive-tests to rocky build alone
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch add-expensive in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/add-expensive by this push: new f16e900 Add --with-expensive-tests to rocky build alone f16e900 is described below commit f16e9005af7543ef9f4ac99c751b05279645f1bf Author: Evan Zelkowitz AuthorDate: Thu Feb 23 11:56:45 2023 -0700 Add --with-expensive-tests to rocky build alone --- jenkins/github/rocky.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/github/rocky.pipeline b/jenkins/github/rocky.pipeline index cd3f58f..5ff1664 100644 --- a/jenkins/github/rocky.pipeline +++ b/jenkins/github/rocky.pipeline @@ -49,7 +49,7 @@ pipeline { set -e source /opt/rh/gcc-toolset-11/enable autoreconf -fiv -./configure --with-openssl=/opt/openssl-quic --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-debug --enable-ccache +./configure --with-openssl=/opt/openssl-quic --enable-experimental-plugins --enable-example-plugins --prefix=/tmp/ats/ --enable-werror --enable-debug --enable-ccache --with-expensive-tests make -j4 V=1 Q= make -j 2 check VERBOSE=Y V=1 make install
[trafficserver-ci] branch add-expensive created (now f2e7b65)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch add-expensive in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git at f2e7b65 Removing call to --enable-luajit in jenkins jobs (#127) No new revisions were added by this update.
[trafficserver] branch master updated: Added memory info to system_stats plugin (#9379)
This is an automated email from the ASF dual-hosted git repository. eze 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 0e9ff82718 Added memory info to system_stats plugin (#9379) 0e9ff82718 is described below commit 0e9ff8271811a46b46825fe22a272347b64df078 Author: Joshua Zenn AuthorDate: Fri Feb 3 13:23:56 2023 -0500 Added memory info to system_stats plugin (#9379) --- doc/admin-guide/plugins/system_stats.en.rst | 6 ++ plugins/experimental/system_stats/system_stats.c | 14 ++ 2 files changed, 20 insertions(+) diff --git a/doc/admin-guide/plugins/system_stats.en.rst b/doc/admin-guide/plugins/system_stats.en.rst index d71460f2bb..3c62140257 100644 --- a/doc/admin-guide/plugins/system_stats.en.rst +++ b/doc/admin-guide/plugins/system_stats.en.rst @@ -55,6 +55,12 @@ Some example output is: "plugin.system_stats.loadavg.five": 132032, "plugin.system_stats.loadavg.ten": 88864, "plugin.system_stats.current_processes": 503, + "plugin.system_stats.total_ram": 4127707136, + "plugin.system_stats.free_ram": 93474816, + "plugin.system_stats.shared_ram": 430710784, + "plugin.system_stats.buffer_ram": 399872000, + "plugin.system_stats.total_swap": 0, + "plugin.system_stats.free_swap": 0, "plugin.system_stats.net.enp0s3.speed": 1000, "plugin.system_stats.net.enp0s3.collisions": 0, "plugin.system_stats.net.enp0s3.multicast": 0, diff --git a/plugins/experimental/system_stats/system_stats.c b/plugins/experimental/system_stats/system_stats.c index 347e75e866..e0442ec444 100644 --- a/plugins/experimental/system_stats/system_stats.c +++ b/plugins/experimental/system_stats/system_stats.c @@ -54,6 +54,14 @@ // Process Strings #define CURRENT_PROCESSES "plugin." PLUGIN_NAME ".current_processes" +// Memory/Swap Strings +#define TOTAL_RAM "plugin." PLUGIN_NAME ".total_ram" +#define FREE_RAM "plugin." PLUGIN_NAME ".free_ram" +#define SHARED_RAM "plugin." PLUGIN_NAME ".shared_ram" +#define BUFFER_RAM "plugin." PLUGIN_NAME ".buffer_ram" +#define TOTAL_SWAP "plugin." PLUGIN_NAME ".total_swap" +#define FREE_SWAP "plugin." PLUGIN_NAME ".free_swap" + // Base net stats name, full name needs to populated // with NET_STATS.infname.RX/TX.standard_net_stats field #define NET_STATS "plugin." PLUGIN_NAME ".net." @@ -256,6 +264,12 @@ getStats(TSMutex stat_creation_mutex) statSet(LOAD_AVG_FIVE_MIN, info.loads[1], stat_creation_mutex); statSet(LOAD_AVG_FIFTEEN_MIN, info.loads[2], stat_creation_mutex); statSet(CURRENT_PROCESSES, info.procs, stat_creation_mutex); + statSet(TOTAL_RAM, info.totalram, stat_creation_mutex); + statSet(FREE_RAM, info.freeram, stat_creation_mutex); + statSet(SHARED_RAM, info.sharedram, stat_creation_mutex); + statSet(BUFFER_RAM, info.bufferram, stat_creation_mutex); + statSet(TOTAL_SWAP, info.totalswap, stat_creation_mutex); + statSet(FREE_SWAP, info.freeswap, stat_creation_mutex); #endif // #ifdef HAVE_SYS_SYSINFO_H netStatsInfo(stat_creation_mutex);
[trafficserver-site] branch asf-site updated: Update downloads and index for 9.1.4 and 8.1.6
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/trafficserver-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 950bc38 Update downloads and index for 9.1.4 and 8.1.6 950bc38 is described below commit 950bc38a8a1d2fbf2c0cf19d3d7cf0b4a082ada4 Author: Evan Zelkowitz AuthorDate: Thu Dec 15 12:54:02 2022 -0700 Update downloads and index for 9.1.4 and 8.1.6 --- source/markdown/downloads.mdtext | 42 source/markdown/index.html | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/source/markdown/downloads.mdtext b/source/markdown/downloads.mdtext index f64e001..129f83d 100644 --- a/source/markdown/downloads.mdtext +++ b/source/markdown/downloads.mdtext @@ -19,9 +19,9 @@ RSS: /rss/releases.rss -The latest stable release of Apache Traffic Server is v9.1.3, released on 2022-08-09. -In addition, we continue to support the v8.1.x LTS release train, currently v8.1.5, -which was released on 2022-08-09. We follow the [Semantic Versioning](http://semver.org) +The latest stable release of Apache Traffic Server is v9.1.4, released on 2022-12-15. +In addition, we continue to support the v8.1.x LTS release train, currently v8.1.6, +which was released on 2022-12-15. We follow the [Semantic Versioning](http://semver.org) scheme. The goal is to release patch releases frequently, and minor releases as needed. Within the major versions, all such patch and minor releases are all compatible. @@ -32,35 +32,35 @@ will be needed. You can also [browse through all releases](https://archive.apache.org/dist/trafficserver/) and hash signatures. -# Current v9.x Release -- 9.1.3 # {#9.1.3} +# Current v9.x Release -- 9.1.4 # {#9.1.4} - Apache Traffic Server v9.1.3 was released on August 9th, 2022. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.1.3.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.1.3.tar.bz2.sha512)] + Apache Traffic Server v9.1.4 was released on December 15th, 2022. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-9.1.4.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-9.1.4.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-9.1.3.tar.bz2; - class="download_ts">Traffic Server 9.1.3 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-9.1.4.tar.bz2; + class="download_ts">Traffic Server 9.1.4 -v9.1.3 is our latest stable release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/9.1.x/CHANGELOG-9.1.3) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:9.1.3). +v9.1.4 is our latest stable release. Additional details for this release are in the +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/9.1.x/CHANGELOG-9.1.4) +and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:9.1.4). For details on the v9.x release, please see [9.1.x News](https://docs.trafficserver.apache.org/en/9.1.x/release-notes/whats-new.en.html). There are also details about [upgrading to 9.x](https://docs.trafficserver.apache.org/en/9.1.x/release-notes/upgrading.en.html). -# Current v8.x Release -- 8.1.5 # {#8.1.5} +# Current v8.x Release -- 8.1.6 # {#8.1.6} - Apache Traffic Server v8.1.5 was released on August 9th, 2022. - [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.5.tar.bz2.asc)] - [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.5.tar.bz2.sha512)] + Apache Traffic Server v8.1.6 was released on December 15th, 2022. + [[`PGP`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.6.tar.bz2.asc)] + [[`SHA512`](https://www.apache.org/dist/trafficserver/trafficserver-8.1.6.tar.bz2.sha512)] - https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.5.tar.bz2; - class="download_ts">Traffic Server 8.1.5 + https://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-8.1.6.tar.bz2; + class="download_ts">Traffic Server 8.1.6 -v8.1.5 is our latest stable release for the 8.x release. Additional details for this release are in the -[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.5) -and the the related [Github Issues and PRs](https://github.com/apache/trafficserver/pulls?q=is:closed+is:pr+milestone:8.1.5). +v8.1.6 is our latest stable release for the 8.x release. Additional details for this release are in the +[CHANGELOG](https://raw.githubusercontent.com/apache/trafficserver/8.1.x/CHANGELOG-8.1.6) +and the the related [Github Issues and PRs](https://git
svn commit: r58749 - in /release/trafficserver: trafficserver-8.1.6.tar.bz2 trafficserver-8.1.6.tar.bz2.asc trafficserver-8.1.6.tar.bz2.sha512
Author: eze Date: Thu Dec 15 19:46:20 2022 New Revision: 58749 Log: Release 8.1.6 Added: release/trafficserver/trafficserver-8.1.6.tar.bz2 (with props) release/trafficserver/trafficserver-8.1.6.tar.bz2.asc release/trafficserver/trafficserver-8.1.6.tar.bz2.sha512 Added: release/trafficserver/trafficserver-8.1.6.tar.bz2 == Binary file - no diff available. Propchange: release/trafficserver/trafficserver-8.1.6.tar.bz2 -- svn:mime-type = application/octet-stream Added: release/trafficserver/trafficserver-8.1.6.tar.bz2.asc == --- release/trafficserver/trafficserver-8.1.6.tar.bz2.asc (added) +++ release/trafficserver/trafficserver-8.1.6.tar.bz2.asc Thu Dec 15 19:46:20 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEcxRKqDsQqXsEwemDFa1i6UAQTpYFAmOaBSIACgkQFa1i6UAQ +TpYY4wf/R8JYNNUAXgsLIUsEEFo1SKmbtu9AaD71jwb7bkM9buJwBakAszSFSbwh +zUeDMf8hd2vakym9dtTaI8G4uzEDsvzADHDivViUlXwFQPB2TrmOtXTBM0Weigdl +jtB26+TNoRWfGEUcA4LPlp66SJw8D/1ffFhfRc1VUrwEIpioVF/4H32h0APZo5wF +HKdxHjxNosH8ZycbuSk7+MaxQu7oRHn3/5F2x/Lo+00v3wIq1By4ph5gCxZJjhCE +1yWvN446PXjBWMxcnXfZ1MwXyfotwFswbTGqjpXKiuP1hZWKhjzM+anDitj5G3jf +e0GjpXw7SkWLZVVGdKrZ8mHIuv4pcg== +=Wlif +-END PGP SIGNATURE- Added: release/trafficserver/trafficserver-8.1.6.tar.bz2.sha512 == --- release/trafficserver/trafficserver-8.1.6.tar.bz2.sha512 (added) +++ release/trafficserver/trafficserver-8.1.6.tar.bz2.sha512 Thu Dec 15 19:46:20 2022 @@ -0,0 +1 @@ +0fa2a6f689b255bb1f4bc3d990700f247b1e2b7472fe795539d3f55dac67e5989eb5644052f7b074b219b9957a7c96189c79b233108829f7b5f2d84bfabbcd03 *trafficserver-8.1.6.tar.bz2
[trafficserver] branch master updated (eb5efe19e -> 9d2cf1867)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git from eb5efe19e Change Content-Type to text/plain if xdebug modifies response body (#9246) add 9d2cf1867 Add release procedures doc (#9253) No new revisions were added by this update. Summary of changes: doc/release-notes/index.en.rst | 1 + doc/release-notes/release-procedures.en.rst | 48 + doc/release-notes/roadmap.en.rst| 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/release-procedures.en.rst
[trafficserver] annotated tag 8.1.6-rc0 updated (5a73a6472 -> a1d9a0ab7)
This is an automated email from the ASF dual-hosted git repository. eze pushed a change to annotated tag 8.1.6-rc0 in repository https://gitbox.apache.org/repos/asf/trafficserver.git *** WARNING: tag 8.1.6-rc0 was modified! *** from 5a73a6472 (commit) to a1d9a0ab7 (tag) tagging 5a73a6472c2a9cfbbd1021a8ee859b646587dd01 (commit) replaces 8.1.5 by Evan Zelkowitz on Wed Dec 14 10:17:38 2022 -0700 - Log - Release Candidate 8.1.6-rc0 -BEGIN PGP SIGNATURE- iQJNBAABCgA3FiEElnZxNIL5Jn4xrNGdRmN2b7bo5OMFAmOaBTIZHGV2YW4uemVs a293aXR6QGdtYWlsLmNvbQAKCRBGY3Zvtujk41i8EADSQDBJsb1JREdsK/hfL1a9 B6pgwzQw2czkVAaI2npr8Pc3ngHNCY3g1BN4AXTsV2D/fJYEI6wdCaYaVtjITeOb Xo1LcN1iDiax0GWDVshWJGE8U9DAkxqVPza4v4sumkQSm0bxJAZM6T581EDbPKoK 6xBhL7Evbly5vya/x4pws8mAt5zQdSVybwQbnZrlBcKmz7Iq7RgNSQgvxIdq36s2 0ZcuqfZFwCvllOYC9ubiWysXXSE4Lx5TCGeVbO1E+a4lo3nMaexwt8LAKlcGar4g OYPagQ9jjt33qDUkLdeuCaotG/KbEPzNJriZKtlx6kzamYrW2YRsa4f5wuc2w3My e7mGmmvvLVV5lz424mDl54tStDZ8hwaCDsI7KCZqA59us/DiOAVNLVySD76Xh1m9 zGjXc3kqNX5wN3oMy7mmLsPQjHTcJlFSsGOA9DRIpABtPxpDz9gICwWgqfExPq23 N2oAJZqqXeMVo8mFfpy6pKhbyjU7DP+xbL6+lBdpYD2lqHIC5sYUiQQjGiqKQlCx 9rogqmVrNVshadXHQ0g4jU+QLb040777CWOck+56X6t2TThQYLoG6Ocgz2SN2uSr g4ZV4HkHMF8sN3FT82Jud+UY+WizjWsK9gVHk7I8CleK0Hp5qBbeF/ErIp+z/Qdc i5tPv/Xky1mqQonYKljVpA== =cJue -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[trafficserver] branch 8.1.x updated: Update changelog and bump version to 8.1.6
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new 5a73a6472 Update changelog and bump version to 8.1.6 5a73a6472 is described below commit 5a73a6472c2a9cfbbd1021a8ee859b646587dd01 Author: Evan Zelkowitz AuthorDate: Wed Dec 14 10:06:27 2022 -0700 Update changelog and bump version to 8.1.6 --- CHANGELOG-8.1.6 | 3 +++ configure.ac | 4 ++-- tools/package/trafficserver.spec | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG-8.1.6 b/CHANGELOG-8.1.6 new file mode 100644 index 0..5136051d3 --- /dev/null +++ b/CHANGELOG-8.1.6 @@ -0,0 +1,3 @@ +Changes with Apache Traffic Server 8.1.6 + #9241 - drain request body on cache noop action + #9247 - [8.1.x] authproxy: Handle WRITE_READY event diff --git a/configure.ac b/configure.ac index 11b0d0528..b40664ff7 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ # Version number is calculated as MAJOR * 100 + MINOR * 1000 + MICRO # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # -m4_define([TS_VERSION_S],[8.1.5]) -m4_define([TS_VERSION_N],[8001005]) +m4_define([TS_VERSION_S],[8.1.6]) +m4_define([TS_VERSION_N],[8001006]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [d...@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) AC_PREREQ([2.59]) diff --git a/tools/package/trafficserver.spec b/tools/package/trafficserver.spec index 22e01345e..6131bf96f 100755 --- a/tools/package/trafficserver.spec +++ b/tools/package/trafficserver.spec @@ -26,7 +26,7 @@ Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache Name: trafficserver -Version: 8.1.5 +Version: 8.1.6 Release: %{release}%{?dist} License: Apache Software License 2.0 (AL2) Group: System Environment/Daemons
[trafficserver] branch 8.1.x updated: authproxy: Handle WRITE_READY event (#9247)
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/8.1.x by this push: new f37d60345 authproxy: Handle WRITE_READY event (#9247) f37d60345 is described below commit f37d603452b1156cd5d197a768f89d9bec605d11 Author: Masakazu Kitajo AuthorDate: Tue Dec 13 17:03:41 2022 -0700 authproxy: Handle WRITE_READY event (#9247) (cherry picked from commit 679e93fc3b271fd354a3f616fa48fb6d9746e163) --- plugins/authproxy/authproxy.cc | 9 + 1 file changed, 9 insertions(+) diff --git a/plugins/authproxy/authproxy.cc b/plugins/authproxy/authproxy.cc index dd1390c39..791d1000b 100644 --- a/plugins/authproxy/authproxy.cc +++ b/plugins/authproxy/authproxy.cc @@ -82,6 +82,7 @@ struct StateTransition { }; static TSEvent StateAuthProxyConnect(AuthRequestContext *, void *); +static TSEvent StateAuthProxyWriteReady(AuthRequestContext *, void *); static TSEvent StateAuthProxyWriteComplete(AuthRequestContext *, void *); static TSEvent StateUnauthorized(AuthRequestContext *, void *); static TSEvent StateAuthorized(AuthRequestContext *, void *); @@ -129,6 +130,7 @@ static const StateTransition StateTableProxyReadHeader[] = { // State table for sending the request to the auth proxy. static const StateTransition StateTableProxyRequest[] = { + {TS_EVENT_VCONN_WRITE_READY, StateAuthProxyWriteReady, StateTableProxyRequest}, {TS_EVENT_VCONN_WRITE_COMPLETE, StateAuthProxyWriteComplete, StateTableProxyReadHeader}, {TS_EVENT_ERROR, StateUnauthorized, nullptr}, {TS_EVENT_NONE, nullptr, nullptr}}; @@ -543,6 +545,13 @@ StateAuthProxyReadHeaders(AuthRequestContext *auth, void * /* edata ATS_UNUSED * return complete ? TS_EVENT_HTTP_READ_REQUEST_HDR : TS_EVENT_CONTINUE; } +static TSEvent +StateAuthProxyWriteReady(AuthRequestContext *auth, void * /* edata ATS_UNUSED */) +{ + TSVConnWrite(auth->vconn, auth->cont, auth->iobuf.reader, TSIOBufferReaderAvail(auth->iobuf.reader)); + return TS_EVENT_CONTINUE; +} + static TSEvent StateAuthProxyWriteComplete(AuthRequestContext *auth, void * /* edata ATS_UNUSED */) {
[trafficserver-ci] branch main updated: Update branch_build.pipeline
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/main by this push: new 8255b1b Update branch_build.pipeline 8255b1b is described below commit 8255b1bd3ae4a4ec32f164a0bca89afb59df9a07 Author: Evan Zelkowitz AuthorDate: Mon Dec 12 12:59:30 2022 -0700 Update branch_build.pipeline --- jenkins/branch/branch_build.pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/branch/branch_build.pipeline b/jenkins/branch/branch_build.pipeline index 267a1fb..ac51264 100644 --- a/jenkins/branch/branch_build.pipeline +++ b/jenkins/branch/branch_build.pipeline @@ -43,7 +43,7 @@ def doParallelBuilds() { } } - String jobstr = "osx freebsd" + String jobstr = "osx freebsd osx-m1" def extrajobs = jobstr.split(" ") for (job in extrajobs) {
[trafficserver-ci] branch main updated: Update osx-m1.pipeline
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/main by this push: new 0908733 Update osx-m1.pipeline 0908733 is described below commit 0908733b4c07884e58cde29b6ad2f6dddbb14935 Author: Evan Zelkowitz AuthorDate: Mon Dec 12 12:22:22 2022 -0700 Update osx-m1.pipeline --- jenkins/branch/osx-m1.pipeline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/branch/osx-m1.pipeline b/jenkins/branch/osx-m1.pipeline index 767fd79..20c3ceb 100644 --- a/jenkins/branch/osx-m1.pipeline +++ b/jenkins/branch/osx-m1.pipeline @@ -32,8 +32,8 @@ pipeline { WITH_LIBCPLUSPLUS="yes" \ ./configure \ --enable-experimental-plugins \ - --with-openssl=/usr/local/opt/openssl - make -j3 + --with-openssl=/opt/homebrew/opt/openssl + make -j8 ''' } }
[trafficserver-ci] branch main updated: Create osx-m1.pipeline
This is an automated email from the ASF dual-hosted git repository. eze pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git The following commit(s) were added to refs/heads/main by this push: new 906b54f Create osx-m1.pipeline 906b54f is described below commit 906b54fd0dd793ccc2113862c23587d5ed6a3619 Author: Evan Zelkowitz AuthorDate: Mon Dec 12 11:55:46 2022 -0700 Create osx-m1.pipeline --- jenkins/branch/osx-m1.pipeline | 48 ++ 1 file changed, 48 insertions(+) diff --git a/jenkins/branch/osx-m1.pipeline b/jenkins/branch/osx-m1.pipeline new file mode 100644 index 000..767fd79 --- /dev/null +++ b/jenkins/branch/osx-m1.pipeline @@ -0,0 +1,48 @@ +pipeline { + agent {label 'osx-m1'} + stages { + stage('Clone') { + steps { + dir('src') { + script { + String branch = env.SHA1 + if (! branch) { + branch = '*/' + env.GITHUB_BRANCH + } + + checkout([$class: 'GitSCM', + branches: [[name: branch]], + userRemoteConfigs: [[url: env.GITHUB_URL]], + extensions: [[$class: 'CloneOption', timeout: 10]], + ]) + } + } + echo 'Finished Cloning' + } + } + stage('Build') { + steps { + echo 'Starting build' + dir('src') { + sh ''' + autoreconf -fiv + CC="clang" \ + CXX="clang++" \ + CXXFLAGS="-Qunused-arguments" \ + WITH_LIBCPLUSPLUS="yes" \ + ./configure \ + --enable-experimental-plugins \ + --with-openssl=/usr/local/opt/openssl + make -j3 + ''' + } + } + } + } + + post { + cleanup { + cleanWs() + } + } +}
[trafficserver] branch master updated: Header rewrite doc fix (#9234)
This is an automated email from the ASF dual-hosted git repository. eze 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 20c445c74 Header rewrite doc fix (#9234) 20c445c74 is described below commit 20c445c742ce6e3f8a4b852459407d31862ad8f5 Author: Evan Zelkowitz AuthorDate: Wed Dec 7 16:37:31 2022 -0700 Header rewrite doc fix (#9234) Add information about set-body --- doc/admin-guide/plugins/header_rewrite.en.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/admin-guide/plugins/header_rewrite.en.rst b/doc/admin-guide/plugins/header_rewrite.en.rst index 4d331cf35..c251cb6e0 100644 --- a/doc/admin-guide/plugins/header_rewrite.en.rst +++ b/doc/admin-guide/plugins/header_rewrite.en.rst @@ -671,7 +671,8 @@ set-body set-body -Sets the body to . Can also be used to delete a body with ``""`` +Sets the body to . Can also be used to delete a body with ``""``. This is only useful when overriding the origin status, i.e. +intercepting/pre-empting a request so that you can override the body from the body-factory with your own. set-config ~~
[trafficserver] branch master updated: fix a type mistake (#9231)
This is an automated email from the ASF dual-hosted git repository. eze 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 959669684 fix a type mistake (#9231) 959669684 is described below commit 959669684c26659463220dfbd481ad362a04e1c0 Author: TidyBear AuthorDate: Wed Dec 7 01:34:11 2022 +0800 fix a type mistake (#9231) $ cat plugin.config cache_range_requests.so --- doc/admin-guide/plugins/cache_range_requests.en.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/admin-guide/plugins/cache_range_requests.en.rst b/doc/admin-guide/plugins/cache_range_requests.en.rst index a20b77141..59f62f941 100644 --- a/doc/admin-guide/plugins/cache_range_requests.en.rst +++ b/doc/admin-guide/plugins/cache_range_requests.en.rst @@ -75,7 +75,7 @@ Global instance .. code:: $ cat plugin.config - cache_range_request.so + cache_range_requests.so Per-remap instance
[trafficserver] branch master updated: Update codeql.yml (#9202)
This is an automated email from the ASF dual-hosted git repository. eze 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 d3b271951 Update codeql.yml (#9202) d3b271951 is described below commit d3b27195175db3e961cdb7d897fe9feebc75d14e Author: Evan Zelkowitz AuthorDate: Wed Nov 16 14:51:11 2022 -0700 Update codeql.yml (#9202) Add dependencies to build plugins and enable experimental --- .github/workflows/codeql.yml | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fe72d00d1..697c2e1c6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -37,7 +37,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - +- name: Install dependencies + run: | +sudo apt install libmagick++-dev libncurses-dev libpcre2-dev libbrotli-dev libluajit-5.1-dev luajit libjansson-dev libcjose-dev libmaxminddb-dev libgeoip-dev # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 @@ -65,9 +67,8 @@ jobs: - run: | echo "Run, Build Application using script" autoreconf -fiv - ./configure - make -j - + ./configure --enable-experimental-plugins + make - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 with:
[trafficserver] branch master updated: Create codeql.yml (#9197)
This is an automated email from the ASF dual-hosted git repository. eze 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 fecec5c44 Create codeql.yml (#9197) fecec5c44 is described below commit fecec5c44420ddca27c35c0df465edb163fd79d0 Author: Evan Zelkowitz AuthorDate: Tue Nov 15 13:21:37 2022 -0700 Create codeql.yml (#9197) --- .github/workflows/codeql.yml | 74 1 file changed, 74 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0..fe72d00d1 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,74 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# NOTE +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: +paths: + - .github/workflows/codeql.yml + schedule: +- cron: '30 1 * * *' + +jobs: + analyze: +name: Analyze +runs-on: ubuntu-latest +permissions: + actions: read + contents: read + security-events: write + +strategy: + fail-fast: false + matrix: +language: [ 'cpp' ] +# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] +# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + +steps: +- name: Checkout repository + uses: actions/checkout@v3 + +# Initializes the CodeQL tools for scanning. +- name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: +languages: ${{ matrix.language }} +# If you wish to specify custom queries, you can do so here or in a config file. +# By default, queries listed here will override any specified in a config file. +# Prefix the list here with "+" to use these queries and those in the config file. + +# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs +# queries: security-extended,security-and-quality + + +# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). +# If this step fails, then you should remove it and run the build manually (see below) +#- name: Autobuild +# uses: github/codeql-action/autobuild@v2 + +# ℹ️ Command-line programs to run using the OS shell. +# See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + +# If the Autobuild fails above, remove it and uncomment the following three lines. +# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + +- run: | + echo "Run, Build Application using script" + autoreconf -fiv + ./configure + make -j + +- name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: +category: "/language:${{matrix.language}}"
[trafficserver] branch master updated: Delete .lgtm.yml (#9196)
This is an automated email from the ASF dual-hosted git repository. eze 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 776e5f943 Delete .lgtm.yml (#9196) 776e5f943 is described below commit 776e5f943ade98b78b28377148b3a1180363a9f7 Author: Evan Zelkowitz AuthorDate: Tue Nov 15 10:53:28 2022 -0700 Delete .lgtm.yml (#9196) lgtm is going EOL end of the year so removing our settings Have also removed the watch on the ATS repo. Will investigate using codeQL instead --- .lgtm.yml | 41 - 1 file changed, 41 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml deleted file mode 100644 index 476197929..0 --- a/.lgtm.yml +++ /dev/null @@ -1,41 +0,0 @@ -# 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. - -path_classifiers: - 3rd-party: -- "lib/fastlz" -- "lib/yamlcpp" -- "tests/include/catch.hpp" -- "plugins/experimental/wasm/lib" -queries: - - exclude: - tags: -- "3rd-party" -extraction: - cpp: -prepare: - packages: - - "libcjose-dev" - - "libcjose0" - - "libjansson-dev" - - "libluajit-5.1-dev" - - "libpcre3-dev" - - "zlib1g-dev" -after_prepare: "autoreconf -fiv" -configure: - command: "./configure --enable-experimental-plugins" -index: - build_command: "make"
[trafficserver] branch master updated: MaxMind change regex to operate on the full pristine URL and not just the path (#9138)
This is an automated email from the ASF dual-hosted git repository. eze 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 bc4bf2ca9 MaxMind change regex to operate on the full pristine URL and not just the path (#9138) bc4bf2ca9 is described below commit bc4bf2ca908907bf78a31c3d158004a6e0b80ec1 Author: Evan Zelkowitz AuthorDate: Sat Oct 15 16:27:48 2022 -0600 MaxMind change regex to operate on the full pristine URL and not just the path (#9138) * Change regex to operate on the full pristine URL and not just the path --- doc/admin-guide/plugins/maxmind_acl.en.rst | 3 ++- plugins/experimental/maxmind_acl/mmdb.cc | 29 + plugins/experimental/maxmind_acl/mmdb.h| 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/doc/admin-guide/plugins/maxmind_acl.en.rst b/doc/admin-guide/plugins/maxmind_acl.en.rst index bf56a86d9..ab1d9d867 100644 --- a/doc/admin-guide/plugins/maxmind_acl.en.rst +++ b/doc/admin-guide/plugins/maxmind_acl.en.rst @@ -62,7 +62,8 @@ Rules You can mix and match the allow rules and deny rules, however deny rules will always take precedence so in the above case ``127.0.0.1`` would be denied. The IP rules can take either single IPs or cidr formatted rules. It will also accept IPv6 IP and ranges. -The regex portion can be added to both the allow and deny sections for creating allowable or deniable regexes. Each regex takes a country code first and a regex second. +The regex portion can be added to both the allow and deny sections for creating allowable or deniable regexes. Each regex takes a country code first and a regex second. The regex +operates on the entire original request URL, the pre-remapped fqdn and path. In the above example all requests from the US would be allowed except for those on ``txt`` and ``mp3`` files. More rules should be added as pairs, not as additions to existing lists. Currently the only rules available are ``country``, ``ip``, and ``regex``, though more can easily be added if needed. Each config file does require a top level diff --git a/plugins/experimental/maxmind_acl/mmdb.cc b/plugins/experimental/maxmind_acl/mmdb.cc index 1f80e0d74..0fd1bb08f 100644 --- a/plugins/experimental/maxmind_acl/mmdb.cc +++ b/plugins/experimental/maxmind_acl/mmdb.cc @@ -517,10 +517,22 @@ Acl::eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) #endif MMDB_entry_data_s entry_data; - int path_len = 0; - const char *path = nullptr; + std::string url; if (!allow_regex.empty() || !deny_regex.empty()) { -path = TSUrlPathGet(rri->requestBufp, rri->requestUrl, _len); +TSMBuffer mbuf; +TSMLoc ul; +TSReturnCode rc = TSHttpTxnPristineUrlGet(txnp, , ); +if (rc != TS_SUCCESS) { + TSDebug(PLUGIN_NAME, "Failed call to TSHttpTxnPristineUrlGet()"); + return false; +} +int host_len = 0, path_len = 0; +auto host = TSUrlHostGet(mbuf, ul, _len); +auto path = TSUrlPathGet(mbuf, ul, _len); +url.assign(host, host_len); +url.append("/"); +url.append(path, path_len); +TSHandleMLocRelease(mbuf, TS_NULL_MLOC, ul); } // Test for country code if (!allow_country.empty() || !allow_regex.empty() || !deny_regex.empty()) { @@ -530,7 +542,7 @@ Acl::eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) return false; } if (entry_data.has_data) { - ret = eval_country(_data, path, path_len); + ret = eval_country(_data, url); } } else { // Country map is empty as well as regexes, use our default rejection @@ -670,7 +682,7 @@ Acl::eval_anonymous(MMDB_entry_s *entry) // allowable country code from our map. // False otherwise bool -Acl::eval_country(MMDB_entry_data_s *entry_data, const char *path, int path_len) +Acl::eval_country(MMDB_entry_data_s *entry_data, const std::string ) { bool ret = false; bool allow = default_allow; @@ -694,10 +706,11 @@ Acl::eval_country(MMDB_entry_data_s *entry_data, const char *path, int path_len) ret = true; } - if (nullptr != path && 0 != path_len) { + if (!url.empty()) { +TSDebug(PLUGIN_NAME, "saw url not empty: %s, %ld", url.c_str(), url.length()); if (!allow_regex[output].empty()) { for (auto : allow_regex[output]) { -if (PCRE_ERROR_NOMATCH != pcre_exec(i._rex, i._extra, path, path_len, 0, PCRE_NOTEMPTY, nullptr, 0)) { +if (PCRE_ERROR_NOMATCH != pcre_exec(i._rex, i._extra, url.c_str(), url.length(), 0, PCRE_NOTEMPTY, nullptr, 0)) { TSDebug(PLUGIN_NAME, "Got a regex allow hit on regex: %s, country: %s", i._regex_s.c_str(), output); ret = true; } @@ -705,7 +718,7 @@ Acl::eval_country(MMDB_ent
[trafficserver] branch master updated: Move plugin_init for verify cmd (#9102)
This is an automated email from the ASF dual-hosted git repository. eze 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 7c6d19c0b Move plugin_init for verify cmd (#9102) 7c6d19c0b is described below commit 7c6d19c0bb13c07695c80bb16a90aa4228809706 Author: Evan Zelkowitz AuthorDate: Fri Sep 23 11:59:35 2022 -0600 Move plugin_init for verify cmd (#9102) plugin_init calls api_init which will intialize all the global hooks needed for lifecycle and other plugins. Without doing this those hook objects are empty so if a plugin (such as lua) makes a call to add a lifecycle hook on remapinit, this will crash since they haven't been initialized --- src/traffic_server/traffic_server.cc | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/traffic_server/traffic_server.cc b/src/traffic_server/traffic_server.cc index ebbc7e956..1866a7c81 100644 --- a/src/traffic_server/traffic_server.cc +++ b/src/traffic_server/traffic_server.cc @@ -895,6 +895,13 @@ cmd_verify(char * /* cmd ATS_UNUSED */) Layout::get()->update_sysconfdir(conf_dir); } + if (!plugin_init(true)) { +exitStatus |= (1 << 2); +fprintf(stderr, "ERROR: Failed to load %s, exitStatus %d\n\n", ts::filename::PLUGIN, exitStatus); + } else { +fprintf(stderr, "INFO: Successfully loaded %s\n\n", ts::filename::PLUGIN); + } + if (!urlRewriteVerify()) { exitStatus |= (1 << 0); fprintf(stderr, "ERROR: Failed to load %s, exitStatus %d\n\n", ts::filename::REMAP, exitStatus); @@ -909,13 +916,6 @@ cmd_verify(char * /* cmd ATS_UNUSED */) fprintf(stderr, "INFO: Successfully loaded %s\n\n", ts::filename::RECORDS); } - if (!plugin_init(true)) { -exitStatus |= (1 << 2); -fprintf(stderr, "ERROR: Failed to load %s, exitStatus %d\n\n", ts::filename::PLUGIN, exitStatus); - } else { -fprintf(stderr, "INFO: Successfully loaded %s\n\n", ts::filename::PLUGIN); - } - SSLInitializeLibrary(); SSLConfig::startup(); if (!SSLCertificateConfig::startup()) {