This is an automated email from the ASF dual-hosted git repository.
ckozak pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 4a4b753 [LOG4J2-3242] Rename JNDI enablement property from
'log4j2.enableJndi' to 'log4j2.enableJndiLookup', 'log4j2.enableJndiJms', and
'log4j2.enableJndiContextSelector'.
new 8060232 Fix string substitution recursion
new ff844c0 [DOC] add CVE-2021-45105 for 2.17.0 and 2.12.3
new 0b980ab Prep for releaes
new 7eccaa4 Fix bug in template
new 5476a16 [DOC] fix typos and rephrase mitigation for CVE-2021-45105
new f9c4cf7 [DOC] fix missing newline before bullet points
new 5fa35e1 [DOC] fix typo: this is not a velocity template page
new 43131f4 [DOC] update JMS Appender docs; only java: protocol supported
from 2.17
new 49de894 [DOC] update JNDI Lookup docs; property should be
`enableJndiLookup`
new 8b0fff5 [DOC] update JndiContextSelector javadoc; mention property
`enableJndiContextSelector`
new d35b5e5 [DOC] update JndiContextSelector section; mention property
`enableJndiContextSelector`
new 4294992 Update pages
new c8c4242 [DOC] mention property `enableJndiLookup` is required for
JNDI lookup
new 8868bac [DOC] fix property name, should be `enableJndiContextSelector`
new 80eaa5c [DOC] replace old `allowedLdap*` properties with
`enableJndiContextSelector`
new 8e18c13 Remove non-applicable JNDI stuff
The 16 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:
.../org/apache/log4j/builders/AbstractBuilder.java | 5 +-
.../apache/log4j/config/Log4j1Configuration.java | 1 +
.../log4j/config/Log4j1ConfigurationParser.java | 5 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 16 +--
.../log4j/core/config/AbstractConfiguration.java | 19 ++-
.../logging/log4j/core/config/AppenderControl.java | 4 +-
.../logging/log4j/core/config/Configuration.java | 9 ++
.../log4j/core/config/ConfigurationFactory.java | 3 +-
.../config/composite/CompositeConfiguration.java | 2 +-
.../log4j/core/config/json/JsonConfiguration.java | 2 +-
.../core/config/plugins/util/PluginBuilder.java | 16 ++-
.../log4j/core/config/xml/XmlConfiguration.java | 2 +-
.../core/lookup/ConfigurationStrSubstitutor.java | 47 +++++++
.../log4j/core/lookup/ContextMapLookup.java | 2 +-
.../logging/log4j/core/lookup/DateLookup.java | 2 +-
.../logging/log4j/core/lookup/EventLookup.java | 3 +
.../log4j/core/lookup/RuntimeStrSubstitutor.java | 45 +++++++
.../logging/log4j/core/lookup/StrSubstitutor.java | 143 +++++++++++++++++----
.../log4j/core/selector/JndiContextSelector.java | 1 +
...rnResolverDoesNotEvaluateThreadContextTest.java | 116 +++++++++++++++++
.../appender/rolling/RollingFileManagerTest.java | 2 +-
.../RoutingAppenderKeyLookupEvaluationTest.java | 94 ++++++++++++++
.../log4j/core/lookup/StrSubstitutorTest.java | 133 +++++++++++++++++++
.../src/test/resources/log4j-routing-2767.xml | 6 +-
...yBlockingQueue.xml => log4j-routing-lookup.xml} | 21 ++-
.../src/test/resources/log4j-routing-purge.xml | 8 +-
log4j-core/src/test/resources/log4j-routing.json | 5 +-
.../src/test/resources/log4j-routing.properties | 4 +-
log4j-core/src/test/resources/log4j-routing.xml | 5 +-
log4j-core/src/test/resources/log4j-routing2.json | 5 +-
....xml => log4j2-pattern-layout-with-context.xml} | 4 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 3 +-
.../apache/logging/log4j/lookup/CustomLookup.java | 3 +
.../logging/log4j/lookup/MapMessageLookup.java | 3 +
.../logging/log4j/web/Log4jWebInitializerImpl.java | 3 +-
pom.xml | 6 +-
src/changes/changes.xml | 7 +
src/site/markdown/index.md.vm | 46 +++++--
src/site/markdown/security.md | 57 ++++++++
src/site/xdoc/manual/appenders.xml | 30 +----
src/site/xdoc/manual/configuration.xml.vm | 28 +---
src/site/xdoc/manual/extending.xml | 9 +-
src/site/xdoc/manual/logsep.xml | 4 +-
src/site/xdoc/manual/lookups.xml | 12 +-
src/site/xdoc/manual/webapp.xml | 1 +
45 files changed, 759 insertions(+), 183 deletions(-)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ConfigurationStrSubstitutor.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/RuntimeStrSubstitutor.java
create mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/PatternResolverDoesNotEvaluateThreadContextTest.java
create mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderKeyLookupEvaluationTest.java
copy
log4j-core/src/test/resources/{BlockingQueueFactory-ArrayBlockingQueue.xml =>
log4j-routing-lookup.xml} (68%)
copy log4j-core/src/test/resources/{log4j2-pattern-layout.xml =>
log4j2-pattern-layout-with-context.xml} (86%)
