This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch fuzzing
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from dc84cd2c5b Decrease JSON length to avoid false positives
new 44308e6681 More troubleshooting aid
add 646c3d4fd5 Update review kit reference
add 043dfee7c3 Update `co.elastic.clients:elasticsearch-java` to version
`8.15.1` (#2925)
add 053620321d Update `org.mongodb:bson` to version `4.11.4` (#2926)
add 51e34a3b05 Fix the reload of key and trust stores on reconfiguration
(#2767)
add 88338a5b19 Release notes for version `2.24.0`
add 0805368745 Update the `project.build.outputTimestamp` property
add 5250a47cb2 Fix the documentation of the `2.24.0` release
add 0e223589c2 Disable FQDN test on misconfigured hosts
add 749b57754a Fix typo in `build.yaml`
add aec61f47da Improve `generate-email.sh` script
add 6de281d5b6 Fix token type
add 48e562a048 Update the `project.build.outputTimestamp` property
add c79ae325f6 Release changelog for version `2.24.0`
add 27deaaf99f Merge tag 'rel/2.24.0' into 2.x
add 92a8bb6166 Prepare for new development cycle
add 6bf30903ae Add Matomo script to website
add 2a99119515 Fix broken internal links
add 1b9621439b Test custom 404 page
add a18bdce643 Replace `sha256` with `sha512` on download page
add 07a87c58d4 Update moved links
add 9659af1677 Update getting-started.adoc by removing repeated words
add 4ad6d7194d Minor version bump
add 45ce728710 Fix `download.adoc` links and stuff
new 5e0e4badd4 Merge remote-tracking branch 'origin/2.x' into fuzzing
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:
.github/generate-email.sh | 19 +-
.github/workflows/build.yaml | 2 +-
antora-playbook.yaml | 16 +
.../logging/log4j/core/test/package-info.java | 4 +-
.../core/appender/BufferingErrorHandler.java} | 52 ++-
.../log4j/core/appender/FixedHostResolver.java | 47 +++
.../log4j/core/appender/HttpAppenderTest.java | 220 +++++------
.../log4j/core/appender/LineReadingTcpServer.java | 227 +++++++++++
.../SecureSocketAppenderSocketOptionsTest.java | 140 -------
.../core/appender/SocketAppenderReconnectTest.java | 397 +++++++++++++++++++
.../SocketAppenderSslSocketOptionsTest.java | 203 ++++++++++
.../logging/log4j/core/appender/SslContexts.java | 64 +++
.../log4j/core/appender/TlsSyslogAppenderTest.java | 12 +-
.../core/net/SocketAppenderReconnectTest.java | 437 ---------------------
.../core/net/ssl/KeyStoreConfigurationTest.java | 65 +--
.../core/net/ssl/SslConfigurationFactoryTest.java | 10 +-
.../log4j/core/net/ssl/SslConfigurationTest.java | 45 ++-
.../log4j/core/net/ssl/SslKeyStoreConstants.java | 86 ++++
.../logging/log4j/core/net/ssl/TestConstants.java | 71 ----
.../core/net/ssl/TrustStoreConfigurationTest.java | 28 +-
.../src/test/resources/HttpAppenderTest.xml | 29 --
.../test/resources/log4j-ssl-socket-options.xml | 40 --
.../apache/logging/log4j/core/net/ssl/.gitignore | 1 +
.../org/apache/logging/log4j/core/net/ssl/README | 13 -
.../logging/log4j/core/net/ssl/build/gencerts.sh | 28 --
.../logging/log4j/core/net/ssl/build/rootca.conf | 9 -
.../logging/log4j/core/net/ssl/build/server.conf | 9 -
.../core/net/ssl/client.log4j2-keystore-nopass.p12 | Bin 3813 -> 0 bytes
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 3520 -> 0 bytes
.../log4j/core/net/ssl/client.log4j2-keystore.p12 | Bin 4023 -> 0 bytes
.../logging/log4j/core/net/ssl/generate-stores.sh | 129 ++++++
.../logging/log4j/core/net/ssl/keyStore-nopass.p12 | Bin 0 -> 3907 bytes
.../apache/logging/log4j/core/net/ssl/keyStore.jks | Bin 0 -> 3473 bytes
.../apache/logging/log4j/core/net/ssl/keyStore.p12 | Bin 0 -> 4132 bytes
.../logging/log4j/core/net/ssl/keyStore2.jks | Bin 0 -> 3474 bytes
.../log4j/core/net/ssl/server.log4j2-crt.pem | 17 -
.../logging/log4j/core/net/ssl/server.log4j2.pem | 23 --
.../logging/log4j/core/net/ssl/trustStore.jks | Bin 0 -> 754 bytes
.../logging/log4j/core/net/ssl/trustStore2.jks | Bin 0 -> 754 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 776 -> 0 bytes
.../log4j/core/appender/AbstractAppender.java | 6 +-
.../core/appender/HttpURLConnectionManager.java | 3 +-
.../apache/logging/log4j/core/net/SmtpManager.java | 3 +-
.../logging/log4j/core/net/SslSocketManager.java | 62 ++-
.../log4j/core/net/UrlConnectionFactory.java | 3 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 9 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 6 +-
.../log4j/core/net/ssl/PasswordProvider.java | 1 +
.../log4j/core/net/ssl/SslConfiguration.java | 240 +++++------
.../core/net/ssl/SslConfigurationFactory.java | 3 +-
.../log4j/core/net/ssl/StoreConfiguration.java | 2 +-
.../core/net/ssl/TrustStoreConfiguration.java | 6 +-
.../logging/log4j/core/net/ssl/package-info.java | 2 +-
.../org/apache/logging/log4j/smtp/SmtpManager.java | 3 +-
.../org/apache/logging/log4j/web/package-info.java | 4 +-
log4j-mongodb4/pom.xml | 2 +-
log4j-parent/pom.xml | 2 +-
.../org/apache/logging/log4j/web/package-info.java | 2 +-
oss-fuzz-build.sh | 13 +-
pom.xml | 31 +-
src/changelog/.2.x.x/2767_reload_key_stores.xml | 9 +
.../2767_simplify_SSL_config_logic.xml} | 5 +-
...date_co_elastic_clients_elasticsearch_java.xml} | 4 +-
src/changelog/2.24.0/.release-notes.adoc.ftl | 63 +++
src/changelog/{2.23.0 => 2.24.0}/.release.xml | 2 +-
.../{.2.x.x => 2.24.0}/1539_graalvm_friendly.xml | 0
.../{.2.x.x => 2.24.0}/1740_rfc5424_use_fqdn.xml | 4 +-
.../1799_ignore_propertysource_errors.xml | 0
.../1963_add_logging_to_properties_util.xml | 0
.../2330_add_faster_web_app_context_map.xml | 0
.../2331_custom_context_data_in_lookup.xml | 0
.../{.2.x.x => 2.24.0}/2353_set_level_no-op.xml | 0
...3_add_logback_throwable_consuming_semantics.xml | 0
.../2374_refactor_initialization.xml | 0
.../2379_fix_message_factory_properties.xml | 0
.../2412_remove_log4j_kubernetes.xml | 0
.../2414_fix_blank_keys_in_PropertiesUtil.xml | 0
.../2462_disable_jmx_by_default.xml | 0
.../2515_datetimeformatter_formatto.xml | 0
.../{.2.x.x => 2.24.0}/2703_log4j_debug.xml | 0
.../{.2.x.x => 2.24.0}/2778_configurator_no_op.xml | 0
...tion_pattern_converter_location_requirement.xml | 0
.../{.2.x.x => 2.24.0}/2814_open_json_layout.xml | 0
.../2835_improve_plugin_descriptor_warnings.xml | 0
.../2849-remove-token-based-matching.xml | 0
.../LOG4J2-3618_propertysource_comparator.xml | 2 +-
.../add_GcpLayout_tracing_support.xml | 0
.../{.2.x.x => 2.24.0}/add_log4j_mongodb.xml | 0
.../{.2.x.x => 2.24.0}/add_plugin_reference.xml | 0
.../{.2.x.x => 2.24.0}/auto_site_deployment.xml | 0
.../{.2.x.x => 2.24.0}/change-is-webapp.xml | 0
.../change_JsonReader_dup_key.xml | 0
.../deprecate-Message-getFormat.xml | 0
.../{.2.x.x => 2.24.0}/deprecate_EventLogger.xml | 0
.../{.2.x.x => 2.24.0}/deprecate_duration.xml | 0
.../deprecate_log4j2_default_status_level.xml | 0
.../deprecate_log4j_mongodb4.xml | 0
...uncatingBufferedWriter-empty-input-handling.xml | 0
...380_insufficient_args_in_ParameterFormatter.xml | 0
.../{.2.x.x => 2.24.0}/fix_disruptor3_cce.xml | 0
.../{.2.x.x => 2.24.0}/fix_jmx_module_dep.xml | 0
.../{.2.x.x => 2.24.0}/migrate_to_antora.xml | 0
.../{.2.x.x => 2.24.0}/move_flume_appender.xml | 0
.../{.2.x.x => 2.24.0}/remove_log4j_mongodb3.xml | 0
.../update_com_fasterxml_jackson_jackson_bom.xml | 0
.../update_com_github_luben_zstd_jni.xml | 0
.../update_commons_codec_commons_codec.xml | 0
.../update_commons_logging_commons_logging.xml | 0
.../update_github_codeql_action.xml | 0
.../update_io_fabric8_docker_maven_plugin.xml | 0
.../update_org_apache_cassandra_cassandra_all.xml | 0
.../update_org_apache_commons_commons_compress.xml | 0
.../update_org_apache_commons_commons_csv.xml | 0
.../update_org_apache_commons_commons_lang3.xml | 0
.../update_org_apache_kafka_kafka_clients.xml | 0
.../update_org_apache_logging_logging_parent.xml | 0
.../update_org_eclipse_jetty_jetty_bom.xml | 0
.../update_org_jctools_jctools_core.xml | 0
.../update_org_mongodb_4.11.2.xml | 0
.../{.2.x.x => 2.24.0}/update_org_mongodb_bson.xml | 4 +-
.../update_org_slf4j_slf4j_api.xml | 0
...te_org_springframework_spring_framework_bom.xml | 0
src/site/antora/modules/ROOT/pages/download.adoc | 84 +++-
src/site/antora/modules/ROOT/pages/javadoc.adoc | 3 -
src/site/antora/modules/ROOT/pages/manual/api.adoc | 8 -
.../ROOT/pages/manual/appenders/delegating.adoc | 2 +-
.../ROOT/pages/manual/appenders/message-queue.adoc | 5 +-
.../modules/ROOT/pages/manual/getting-started.adoc | 2 +-
.../antora/modules/ROOT/partials/log4j1-eol.adoc | 2 +-
src/site/resources/.htaccess | 5 +
130 files changed, 1778 insertions(+), 1272 deletions(-)
rename
log4j-core-test/src/{main/java/org/apache/logging/log4j/core/test/ListErrorHandler.java
=>
test/java/org/apache/logging/log4j/core/appender/BufferingErrorHandler.java}
(50%)
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/FixedHostResolver.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/LineReadingTcpServer.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderReconnectTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSslSocketOptionsTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SslContexts.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslKeyStoreConstants.java
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/TestConstants.java
delete mode 100644 log4j-core-test/src/test/resources/HttpAppenderTest.xml
delete mode 100644
log4j-core-test/src/test/resources/log4j-ssl-socket-options.xml
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/.gitignore
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/README
delete mode 100755
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/gencerts.sh
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/rootca.conf
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/build/server.conf
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore-nopass.p12
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore.jks
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/client.log4j2-keystore.p12
create mode 100755
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/generate-stores.sh
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore-nopass.p12
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore.jks
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore.p12
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/keyStore2.jks
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/server.log4j2-crt.pem
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/server.log4j2.pem
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/trustStore.jks
create mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/trustStore2.jks
delete mode 100644
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/net/ssl/truststore.jks
create mode 100644 src/changelog/.2.x.x/2767_reload_key_stores.xml
copy
src/changelog/{2.0-beta8/LOG4J2-289_Upgrade_javadoc_plugin_to_2_9_1_to_fix_javadoc_security_issu.xml
=> .2.x.x/2767_simplify_SSL_config_logic.xml} (52%)
copy src/changelog/.2.x.x/{update_commons_logging_commons_logging.xml =>
update_co_elastic_clients_elasticsearch_java.xml} (60%)
create mode 100644 src/changelog/2.24.0/.release-notes.adoc.ftl
copy src/changelog/{2.23.0 => 2.24.0}/.release.xml (95%)
rename src/changelog/{.2.x.x => 2.24.0}/1539_graalvm_friendly.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/1740_rfc5424_use_fqdn.xml (74%)
rename src/changelog/{.2.x.x => 2.24.0}/1799_ignore_propertysource_errors.xml
(100%)
rename src/changelog/{.2.x.x =>
2.24.0}/1963_add_logging_to_properties_util.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/2330_add_faster_web_app_context_map.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2331_custom_context_data_in_lookup.xml
(100%)
rename src/changelog/{.2.x.x => 2.24.0}/2353_set_level_no-op.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/2363_add_logback_throwable_consuming_semantics.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2374_refactor_initialization.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/2379_fix_message_factory_properties.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2412_remove_log4j_kubernetes.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/2414_fix_blank_keys_in_PropertiesUtil.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2462_disable_jmx_by_default.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2515_datetimeformatter_formatto.xml
(100%)
rename src/changelog/{.2.x.x => 2.24.0}/2703_log4j_debug.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2778_configurator_no_op.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/2781_fix_file_location_pattern_converter_location_requirement.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2814_open_json_layout.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/2835_improve_plugin_descriptor_warnings.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/2849-remove-token-based-matching.xml
(100%)
rename src/changelog/{.2.x.x =>
2.24.0}/LOG4J2-3618_propertysource_comparator.xml (86%)
rename src/changelog/{.2.x.x => 2.24.0}/add_GcpLayout_tracing_support.xml
(100%)
rename src/changelog/{.2.x.x => 2.24.0}/add_log4j_mongodb.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/add_plugin_reference.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/auto_site_deployment.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/change-is-webapp.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/change_JsonReader_dup_key.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/deprecate-Message-getFormat.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/deprecate_EventLogger.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/deprecate_duration.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/deprecate_log4j2_default_status_level.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/deprecate_log4j_mongodb4.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/fix-TruncatingBufferedWriter-empty-input-handling.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/fix_2380_insufficient_args_in_ParameterFormatter.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/fix_disruptor3_cce.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/fix_jmx_module_dep.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/migrate_to_antora.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/move_flume_appender.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/remove_log4j_mongodb3.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_com_fasterxml_jackson_jackson_bom.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_com_github_luben_zstd_jni.xml
(100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_commons_codec_commons_codec.xml
(100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_commons_logging_commons_logging.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_github_codeql_action.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_io_fabric8_docker_maven_plugin.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_apache_cassandra_cassandra_all.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_apache_commons_commons_compress.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_apache_commons_commons_csv.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_apache_commons_commons_lang3.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_apache_kafka_kafka_clients.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_apache_logging_logging_parent.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_org_eclipse_jetty_jetty_bom.xml
(100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_org_jctools_jctools_core.xml
(100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_org_mongodb_4.11.2.xml (100%)
rename src/changelog/{.2.x.x => 2.24.0}/update_org_mongodb_bson.xml (77%)
rename src/changelog/{.2.x.x => 2.24.0}/update_org_slf4j_slf4j_api.xml (100%)
rename src/changelog/{.2.x.x =>
2.24.0}/update_org_springframework_spring_framework_bom.xml (100%)
