This is an automated email from the ASF dual-hosted git repository. bneradt pushed a commit to branch 11-Dev in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit cb456189ab8bee104c9e46029f8106e619abaa05 Merge: ea81f8971a 714aa15d54 Author: bneradt <[email protected]> AuthorDate: Mon Sep 16 11:06:27 2024 -0500 Merge latest master into 11-Dev Conflicts: doc/admin-guide/files/records.yaml.en.rst .gitignore | 2 +- CMakeLists.txt | 67 + cmake/AutoOptionHelpers.cmake | 31 +- cmake/ExperimentalPlugins.cmake | 9 + doc/.tx/config | 6 +- doc/admin-guide/files/records.yaml.en.rst | 28 +- doc/admin-guide/files/sni.yaml.en.rst | 38 +- doc/admin-guide/interaction/index.en.rst | 3 - doc/admin-guide/performance/index.en.rst | 2 +- doc/admin-guide/plugins/index.en.rst | 8 +- doc/admin-guide/plugins/maxmind_acl.en.rst | 6 + .../{s3_auth.en.rst => origin_server_auth.en.rst} | 72 +- doc/admin-guide/plugins/slice.en.rst | 65 + doc/admin-guide/storage/index.en.rst | 37 - doc/appendices/command-line/traffic_ctl.en.rst | 51 + .../api/functions/TSSslSession.en.rst | 2 +- .../cache-architecture/consistency.en.rst | 7 - .../cache-architecture/data-structures.en.rst | 2 +- doc/developer-guide/cripts/cripts-bundles.en.rst | 50 +- .../cripts/cripts-connections.en.rst | 24 +- doc/developer-guide/cripts/cripts-crypto.en.rst | 16 +- doc/developer-guide/cripts/cripts-headers.en.rst | 62 +- doc/developer-guide/cripts/cripts-matcher.en.rst | 24 +- doc/developer-guide/cripts/cripts-misc.en.rst | 99 +- doc/developer-guide/cripts/cripts-overview.en.rst | 4 +- doc/developer-guide/cripts/cripts-urls.en.rst | 32 +- doc/developer-guide/cripts/cripts-variables.en.rst | 8 +- .../hooks-and-transactions/ssl-session-api.en.rst | 2 +- doc/developer-guide/release-process/index.en.rst | 66 +- .../ja/LC_MESSAGES/admin-guide/plugins/index.en.po | 4 +- .../{s3_auth.en.po => origin_server_auth.en.po} | 48 +- .../developer-guide/architecture/consistency.en.po | 4 - doc/release-notes/upgrading.en.rst | 232 ++- doc/release-notes/whats-new.en.rst | 78 +- example/cripts/example1.cc | 76 +- include/cripts/Bundle.hpp | 38 +- include/cripts/Bundles/Caching.hpp | 30 +- include/cripts/Bundles/Common.hpp | 36 +- include/cripts/Bundles/Headers.hpp | 44 +- include/cripts/Bundles/LogsMetrics.hpp | 38 +- include/cripts/Configs.hpp | 259 +-- include/cripts/ConfigsBase.hpp | 42 +- include/cripts/Connections.hpp | 161 +- include/cripts/Context.hpp | 39 +- include/cripts/Crypto.hpp | 64 +- include/cripts/Epilogue.hpp | 88 +- include/cripts/Error.hpp | 43 +- include/cripts/Files.hpp | 12 +- include/cripts/Headers.hpp | 237 +-- include/cripts/Instance.hpp | 28 +- include/cripts/Lulu.hpp | 91 +- include/cripts/Matcher.hpp | 56 +- include/cripts/Metrics.hpp | 103 +- include/cripts/Plugins.hpp | 12 +- include/cripts/Preamble.hpp | 44 +- include/cripts/Time.hpp | 8 +- include/cripts/Transaction.hpp | 4 +- include/cripts/UUID.hpp | 77 +- include/cripts/Urls.hpp | 450 ++--- include/iocore/cache/Cache.h | 11 +- include/iocore/eventsystem/EventSystem.h | 2 +- include/iocore/eventsystem/SocketManager.h | 103 -- include/iocore/eventsystem/UnixSocket.h | 25 +- include/iocore/net/NetHandler.h | 2 +- include/mgmt/rpc/jsonrpc/Defs.h | 5 +- include/proxy/http/HttpSM.h | 1 - include/proxy/http2/Http2ConnectionState.h | 5 + include/records/RecYAMLDecoder.h | 4 +- include/shared/rpc/IPCSocketClient.h | 2 +- include/tsutil/Histogram.h | 2 +- include/tsutil/Regex.h | 6 +- include/tsutil/StringConvert.h | 2 +- plugins/CMakeLists.txt | 2 +- .../cache_range_requests/cache_range_requests.cc | 34 +- plugins/esi/test/vars_test.cc | 15 +- plugins/experimental/CMakeLists.txt | 3 + .../ja4_fingerprint}/CMakeLists.txt | 28 +- plugins/experimental/ja4_fingerprint/README.md | 26 + plugins/experimental/ja4_fingerprint/ja4.cc | 176 ++ plugins/experimental/ja4_fingerprint/ja4.h | 173 ++ plugins/experimental/ja4_fingerprint/plugin.cc | 382 ++++ plugins/experimental/ja4_fingerprint/test_ja4.cc | 425 +++++ .../ja4_fingerprint/tls_client_hello_summary.cc | 112 ++ plugins/experimental/magick/magick.cc | 3 +- plugins/experimental/maxmind_acl/mmdb.cc | 75 + plugins/experimental/maxmind_acl/mmdb.h | 6 + plugins/experimental/stek_share/log_store.cc | 5 +- plugins/experimental/stek_share/state_machine.h | 5 +- plugins/experimental/stek_share/stek_share.cc | 5 +- plugins/header_rewrite/header_rewrite.cc | 11 +- plugins/header_rewrite/operator.h | 26 +- plugins/header_rewrite/operators.cc | 91 +- plugins/header_rewrite/operators.h | 50 +- plugins/header_rewrite/ruleset.h | 8 +- plugins/multiplexer/fetcher.h | 2 + .../{s3_auth => origin_server_auth}/CMakeLists.txt | 19 +- .../{s3_auth => origin_server_auth}/aws_auth_v4.cc | 3 +- .../{s3_auth => origin_server_auth}/aws_auth_v4.h | 0 .../aws_auth_v4_wrap.h | 0 .../origin_server_auth.cc} | 97 +- .../unit_tests/CMakeLists.txt | 8 +- .../unit_tests/test_aws_auth_v4.cc | 2 +- .../unit_tests/test_aws_auth_v4.h | 0 plugins/slice/CMakeLists.txt | 1 + plugins/slice/Config.cc | 86 +- plugins/slice/Config.h | 26 +- plugins/slice/ObjectSizeCache.cc | 116 ++ plugins/slice/ObjectSizeCache.h | 78 + plugins/slice/server.cc | 29 + plugins/slice/slice.cc | 187 +- plugins/slice/unit-tests/CMakeLists.txt | 7 +- plugins/slice/unit-tests/test_cache.cc | 173 ++ plugins/statichit/statichit.cc | 6 +- src/api/CMakeLists.txt | 3 + src/api/InkAPITest.cc | 58 +- src/cripts/Bundles/Caching.cc | 12 +- src/cripts/Bundles/Common.cc | 26 +- src/cripts/Bundles/HRWBridge.cc | 82 +- src/cripts/Bundles/Headers.cc | 44 +- src/cripts/Bundles/LogsMetrics.cc | 36 +- src/cripts/Configs.cc | 20 +- src/cripts/Connections.cc | 138 +- src/cripts/Context.cc | 8 +- src/cripts/Crypto.cc | 51 +- src/cripts/Error.cc | 23 +- src/cripts/Files.cc | 5 + src/cripts/Geo.cc | 30 +- src/cripts/Headers.cc | 74 +- src/cripts/Instance.cc | 16 +- src/cripts/Lulu.cc | 69 +- src/cripts/Matcher.cc | 9 +- src/cripts/Plugins.cc | 11 +- src/cripts/UUID.cc | 21 +- src/cripts/Urls.cc | 141 +- src/iocore/cache/AggregateWriteBuffer.cc | 2 +- src/iocore/cache/CMakeLists.txt | 2 +- src/iocore/cache/Cache.cc | 1817 ++++--------------- src/iocore/cache/CacheDir.cc | 67 +- src/iocore/cache/CacheDisk.cc | 4 +- src/iocore/cache/CacheEvacuateDocVC.cc | 151 +- src/iocore/cache/CacheHosting.cc | 2 +- src/iocore/cache/CacheHttp.cc | 2 +- src/iocore/cache/{Cache.cc => CacheProcessor.cc} | 1916 ++++++++------------ src/iocore/cache/CacheRead.cc | 195 +- src/iocore/cache/CacheTest.cc | 3 +- src/iocore/cache/CacheVC.cc | 26 +- src/iocore/cache/CacheVol.cc | 56 - src/iocore/cache/CacheWrite.cc | 219 +-- src/iocore/cache/P_Cache.h | 2 +- src/iocore/cache/P_CacheDir.h | 16 +- src/iocore/cache/P_CacheHosting.h | 5 +- src/iocore/cache/P_CacheInternal.h | 150 +- src/iocore/cache/P_CacheTest.h | 3 +- src/iocore/cache/PreservationTable.cc | 64 +- src/iocore/cache/PreservationTable.h | 61 +- src/iocore/cache/RamCacheCLFUS.cc | 2 +- src/iocore/cache/Store.cc | 2 +- src/iocore/cache/Stripe.cc | 33 +- src/iocore/cache/Stripe.h | 55 +- src/iocore/cache/StripeSM.cc | 180 +- src/iocore/cache/{P_CacheVol.h => StripeSM.h} | 65 +- src/iocore/cache/unit_tests/test_CacheDir.cc | 4 +- src/iocore/cache/unit_tests/test_CacheVol.cc | 2 +- src/iocore/cache/unit_tests/test_Stripe.cc | 8 +- src/iocore/eventsystem/CMakeLists.txt | 1 - src/iocore/eventsystem/P_EventSystem.h | 1 - src/iocore/eventsystem/P_IOBuffer.h | 1 + src/iocore/eventsystem/P_UnixSocketManager.h | 198 -- .../eventsystem/unit_tests/test_EventSystem.cc | 4 +- src/iocore/hostdb/CMakeLists.txt | 23 + src/iocore/hostdb/P_HostDBProcessor.h | 7 +- src/iocore/hostdb/P_RefCountCache.h | 7 +- src/iocore/hostdb/benchmark_HostDB.cc | 308 ++++ src/iocore/hostdb/test_HostFile.cc | 22 + src/iocore/hostdb/test_I_HostDB.cc | 50 - src/iocore/hostdb/test_P_HostDB.cc | 82 - src/iocore/hostdb/test_RefCountCache.cc | 4 +- src/iocore/net/BIO_fastopen.cc | 20 +- src/iocore/net/CMakeLists.txt | 1 + src/iocore/net/Connection.cc | 333 +--- src/iocore/net/NetAcceptEventIO.cc | 2 +- src/iocore/net/NetHandler.cc | 19 +- src/iocore/net/P_Connection.h | 32 +- src/iocore/net/P_NetAccept.h | 3 +- src/iocore/net/P_SSLCertLookup.h | 3 +- src/iocore/net/P_UDPConnection.h | 9 +- src/iocore/net/P_UnixNetVConnection.h | 10 +- src/iocore/net/P_UnixUDPConnection.h | 4 +- src/iocore/net/QUICNetProcessor.cc | 6 +- src/iocore/net/SSLClientCoordinator.cc | 6 + src/iocore/net/SSLNetVConnection.cc | 12 +- src/iocore/net/SSLSNIConfig.cc | 3 +- src/iocore/net/SSLSessionCache.cc | 7 +- src/iocore/net/SSLSessionCache.h | 6 +- src/iocore/net/SSLUtils.cc | 15 +- src/iocore/net/{Connection.cc => Server.cc} | 268 ++- .../{eventsystem/SocketManager.cc => net/Server.h} | 67 +- src/iocore/net/UDPEventIO.cc | 2 +- src/iocore/net/UnixConnection.cc | 46 +- src/iocore/net/UnixNetAccept.cc | 29 +- src/iocore/net/UnixNetProcessor.cc | 4 +- src/iocore/net/UnixNetVConnection.cc | 42 +- src/iocore/net/UnixUDPConnection.cc | 5 +- src/iocore/net/UnixUDPNet.cc | 118 +- src/iocore/net/YamlSNIConfig.cc | 4 +- src/mgmt/rpc/handlers/common/RecordsUtils.cc | 3 +- src/mgmt/rpc/jsonrpc/JsonRPCManager.cc | 9 +- src/mgmt/rpc/server/IPCSocketServer.cc | 1 - src/proxy/ControlBase.cc | 3 +- src/proxy/HostStatus.cc | 6 +- src/proxy/hdrs/HdrToken.cc | 90 +- src/proxy/hdrs/XPACK.cc | 22 +- src/proxy/hdrs/unit_tests/test_XPACK.cc | 9 + src/proxy/http/HttpSM.cc | 27 - src/proxy/http/HttpSessionManager.cc | 2 +- src/proxy/http/PreWarmManager.cc | 3 +- src/proxy/http/remap/PluginDso.cc | 3 +- src/proxy/http2/Http2ConnectionState.cc | 12 +- src/proxy/http2/unit_tests/test_Http2Frame.cc | 1 + src/proxy/logging/LogStandalone.cc | 8 +- src/records/RecHttp.cc | 5 +- src/records/RecordsConfig.cc | 26 +- src/shared/rpc/IPCSocketClient.cc | 8 +- src/traffic_ctl/CMakeLists.txt | 2 +- src/traffic_ctl/CtrlCommands.cc | 31 + src/traffic_ctl/CtrlCommands.h | 7 + src/traffic_ctl/CtrlPrinters.cc | 21 +- src/traffic_ctl/PrintUtils.cc | 206 +++ src/traffic_ctl/PrintUtils.h | 45 +- src/traffic_ctl/jsonrpc/CtrlRPCRequests.h | 20 +- src/traffic_ctl/traffic_ctl.cc | 17 +- src/traffic_layout/engine.cc | 10 +- src/traffic_server/traffic_server.cc | 8 +- src/tscore/unit_tests/test_Histogram.cc | 2 +- src/tsutil/Regex.cc | 6 +- tests/fuzzing/fuzz_http3frame.cc | 4 + .../ja3_fingerprint/ja3_fingerprint.test.py | 6 +- .../ja4_fingerprint/ja4_fingerprint.replay.yaml | 47 + .../ja4_fingerprint/ja4_fingerprint.test.py | 152 ++ .../gold/origin_server_auth_parsing_ts.gold | 5 + .../origin_server_auth/origin_server_auth.test.py | 131 ++ .../rules/gcp-parse-test.test_input} | 7 +- .../rules/v4-parse-test.test_input | 4 +- .../s3_auth/gold/s3_auth_parsing_ts.gold | 5 - .../pluginTest/s3_auth/s3_auth_config.test.py | 65 - .../pluginTest/slice/slice_conditional.test.py | 156 ++ tools/cripts/genconfig.py | 18 +- tools/yapf.sh | 27 +- 248 files changed, 7955 insertions(+), 7000 deletions(-)
