You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mi...@apache.org on 2019/09/18 08:24:30 UTC
[tomcat] branch BZ-63681/8.5.x updated (8a23438 -> 6be96eb)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch BZ-63681/8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
discard 8a23438 Frist draft
add e8121dc Simplify service usage note by substituting in current major version
add d8c2354 Fix BZ 62140 Document catalina.[sh|bat] commands
add 03f8774 Add 8.5.45 release date
add 4fc4825 Fix trivial typo in changelog.
add 8b7e6f0 BZ 63684: Wrapper never passed to RealmBase#hasRole() for given security constraints
add 2f33f55 fix JSSE_OPTS quoting
add 88ae81a Fix JSSE_OPTS quoting in catalina.bat
add df41189 63706: Avoid NPE accessing https port with plaintext
add 3cf8893 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63689 display name
add 720b8c6 Describe how Tomcat inherits its cryptographic support from the available libraries.
add 781a67f Fix various typos in threshold
add 4cb34dd Remove duplicate definition of initial window size
add 0e87d92 Add setting direction to debug logging.
add 068cc31 Improve debug logging
add 7e344a6 Keep connection flow control window consistent with initial window size.
add fbbbfc0 Workaround https://bz.apache.org/bugzilla/show_bug.cgi?id=63690
add b297676 Fix NPEs in tests. Align with 9.0.x.
add 73f94fd Remove link to unused external Javadoc
add 2bc58a9 Fix Javadoc issues preventing release builds with newer Java versions
add cfa3cbf Revert unnecessary change
add 13f4296 back-port svn->git updates
add 66286b4 Polish. Align with 9.0.x.
add e080954 Polish. Remove space.
add 4bce6f1 Polish. Align with 9.0.x.
add 5153065 Align with 9.0.x. Javadoc and spacing.
add f42e1bb Simplify
add 096bb8d Simplify
add 13dff65 Deprecated method needs same simplification.
add 2a322e4 Correct registry entry locations for silent installs with 64-bit JVMs
add 29b82db Update Commons Daemon to 1.2.1 (BZ 63625)
add 2099e4d Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737
add 45b3f9b Polish. Spacing.
add 3dabb92 fix typo
add a877a97 fix typo
add 0ab842e fix typo
add 87e7de4 fix typo
add f809fb9 add JASPIC 1.1 Javadoc
add 31cb355 Remove unused i18n messages (re3moval of translations to follow)
add 91fece3 Fix typo
add 402cbb3 fix typo
add ae9741a fix typo
add 89d573a Fix typo
add 0263a83 fix typo (an ssl)
add ad7563b fix typo
add 3795213 fix typo(an sql)
add 50b4075 Fix typo
add 11fec6f Fix typo
add 2b8f0b6 Add link to newly added JASPIC docs
add c8ecb01 Update changelog for PR from KangZhiDong
add d5a6da8 Remove translated entries for keys that have been removed
add d379740 Add missing Javadoc
add 2f02d53 Remove translated values for keys that have been removed
add 58e1d3f Fix potential NPE in some embedding scenarios.
add 37b19e3 Polish. Add spaces
add ac1121e spelling and formatting corrections for cluster-howto
add 2338d6d Changelog entry for previous commit.
add 6cb6feb Fix trailing spaces
add 3818f95 Fix typo in StringManager class javadoc
add a8233ca ByteBufferUtils.cleanDirectBuffer invocation failures are logged
add 9b07371 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63710
add cc10604 eTags vary. Force HTTP/2 tests to use a constant value.
add d57e1ca Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63682 HTTP/2 hang
add 5ee1614 Clean-up. Remove unused code. Align with 9.0.x.
add b58f02a PropertySource: Add an environment variable based source
add c76bfc2 Additional changes required to enable EnvironmentPropertySource
add 6f36dd2 Polish. Spacing. Back-port clean-up from 9.0.x. Add Javadoc.
add ece94b7 Exclude build.properties for jdbc-pool Align with 7.0.x
add 5debbdf Fix test failure on Windows
add b99c16d Fix typo
add cddf523 Increment version number for next development cycle
add c8fcc65 Revert "Only decode in standard mode."
add 709b45b Fix HTTP/2 related TCK failures
new 6be96eb Frist draft
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8a23438)
\
N -- N -- N refs/heads/BZ-63681/8.5.x (6be96eb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
BUILDING.txt | 17 ++-
bin/catalina.bat | 10 +-
bin/catalina.sh | 3 +
bin/service.bat | 2 +-
build.properties.default | 25 +++--
build.xml | 60 +++++++++--
conf/server.xml | 4 +-
java/javax/servlet/http/HttpServletRequest.java | 7 +-
.../servlet/http/LocalStrings_zh_CN.properties | 3 +-
java/javax/servlet/jsp/JspWriter.java | 4 +-
.../javax/servlet/jsp/tagext/SimpleTagSupport.java | 4 +-
java/javax/servlet/jsp/tagext/TagExtraInfo.java | 2 +-
java/javax/servlet/jsp/tagext/VariableInfo.java | 56 +++++-----
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/javax/servlet/resources/web-common_3_0.xsd | 2 +-
java/javax/servlet/resources/web-common_3_1.xsd | 2 +-
java/org/apache/catalina/Executor.java | 2 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 2 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 2 +-
.../ant/jmx/JMXAccessorUnregisterTask.java | 2 +-
java/org/apache/catalina/ant/jmx/package.html | 4 +-
.../authenticator/LocalStrings_zh_CN.properties | 1 +
.../catalina/connector/LocalStrings.properties | 1 -
.../catalina/connector/LocalStrings_de.properties | 1 -
.../catalina/connector/LocalStrings_es.properties | 1 -
.../catalina/connector/LocalStrings_fr.properties | 1 -
.../catalina/connector/LocalStrings_ja.properties | 1 -
.../catalina/connector/LocalStrings_ko.properties | 1 -
.../catalina/connector/LocalStrings_ru.properties | 1 -
.../connector/LocalStrings_zh_CN.properties | 4 +-
java/org/apache/catalina/connector/Request.java | 2 +-
java/org/apache/catalina/core/ContainerBase.java | 24 ++---
.../apache/catalina/core/LocalStrings.properties | 2 -
.../catalina/core/LocalStrings_es.properties | 3 -
.../catalina/core/LocalStrings_fr.properties | 2 -
.../catalina/core/LocalStrings_ja.properties | 2 -
.../catalina/core/LocalStrings_ko.properties | 2 -
.../catalina/core/LocalStrings_zh_CN.properties | 10 +-
.../catalina/core/NamingContextListener.java | 6 +-
.../catalina/deploy/LocalStrings_zh_CN.properties | 1 +
.../catalina/filters/AddDefaultCharsetFilter.java | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 30 +++---
.../catalina/filters/LocalStrings.properties | 4 +-
.../catalina/filters/LocalStrings_fr.properties | 2 +
.../catalina/filters/LocalStrings_ko.properties | 2 +
.../catalina/filters/LocalStrings_zh_CN.properties | 1 +
.../ha/deploy/LocalStrings_zh_CN.properties | 2 +
.../apache/catalina/ha/session/BackupManager.java | 2 +-
.../ha/session/LocalStrings_zh_CN.properties | 3 +
.../catalina/ha/tcp/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 1 -
.../apache/catalina/loader/LocalStrings.properties | 9 --
.../catalina/loader/LocalStrings_de.properties | 1 -
.../catalina/loader/LocalStrings_es.properties | 8 --
.../catalina/loader/LocalStrings_fr.properties | 9 --
.../catalina/loader/LocalStrings_ja.properties | 9 --
.../catalina/loader/LocalStrings_ko.properties | 9 --
.../catalina/loader/LocalStrings_zh_CN.properties | 6 +-
.../catalina/loader/WebappClassLoaderBase.java | 2 +-
.../catalina/manager/LocalStrings.properties | 1 -
.../catalina/manager/LocalStrings_fr.properties | 1 -
.../catalina/manager/LocalStrings_ja.properties | 1 -
.../catalina/manager/LocalStrings_ko.properties | 1 -
.../catalina/manager/LocalStrings_ru.properties | 3 -
.../catalina/manager/LocalStrings_zh_CN.properties | 1 -
.../catalina/manager/host/HostManagerServlet.java | 4 -
.../catalina/manager/host/LocalStrings.properties | 1 -
.../manager/host/LocalStrings_fr.properties | 1 -
.../manager/host/LocalStrings_ja.properties | 1 -
.../manager/host/LocalStrings_ko.properties | 1 -
.../manager/host/LocalStrings_ru.properties | 1 -
.../manager/host/LocalStrings_zh_CN.properties | 1 -
.../LocalStrings_zh_CN.properties | 2 +-
.../apache/catalina/realm/GenericPrincipal.java | 2 +-
java/org/apache/catalina/realm/JDBCRealm.java | 6 +-
java/org/apache/catalina/realm/JNDIRealm.java | 3 -
.../apache/catalina/realm/LocalStrings.properties | 4 +-
.../catalina/realm/LocalStrings_de.properties | 1 -
.../catalina/realm/LocalStrings_es.properties | 1 -
.../catalina/realm/LocalStrings_fr.properties | 3 +-
.../catalina/realm/LocalStrings_ja.properties | 2 -
.../catalina/realm/LocalStrings_ko.properties | 3 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
.../apache/catalina/realm/UserDatabaseRealm.java | 2 +
.../catalina/servlet4preview/http/PushBuilder.java | 4 +-
.../catalina/session/LocalStrings_zh_CN.properties | 1 +
.../catalina/ssi/ResponseIncludeWrapper.java | 2 +-
.../catalina/startup/CertificateCreateRule.java | 2 +-
.../catalina/startup/LocalStrings.properties | 6 --
.../catalina/startup/LocalStrings_es.properties | 4 -
.../catalina/startup/LocalStrings_fr.properties | 6 --
.../catalina/startup/LocalStrings_ja.properties | 6 --
.../catalina/startup/LocalStrings_ko.properties | 6 --
.../catalina/startup/LocalStrings_zh_CN.properties | 29 ++++-
java/org/apache/catalina/startup/Tomcat.java | 1 -
.../apache/catalina/tribes/group/GroupChannel.java | 1 +
.../tribes/group/LocalStrings_zh_CN.properties | 1 +
.../interceptors/LocalStrings_zh_CN.properties | 1 +
.../membership/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/tribes/package.html | 4 +-
.../tribes/transport/LocalStrings_es.properties | 9 --
.../tribes/transport/LocalStrings_zh_CN.properties | 1 +
.../transport/bio/LocalStrings_zh_CN.properties | 2 +
.../transport/nio/LocalStrings_zh_CN.properties | 3 +-
.../apache/catalina/util/LifecycleMBeanBase.java | 2 -
.../catalina/util/LocalStrings_zh_CN.properties | 2 +
java/org/apache/catalina/util/MIME2Java.java | 2 +-
.../catalina/util/SessionIdGeneratorBase.java | 2 +-
.../catalina/valves/LocalStrings_fr.properties | 2 +
.../catalina/valves/LocalStrings_ja.properties | 2 +-
.../catalina/valves/LocalStrings_ko.properties | 2 +
.../catalina/valves/LocalStrings_zh_CN.properties | 19 ++++
.../catalina/valves/rewrite/RewriteRule.java | 4 +-
.../catalina/webresources/LocalStrings.properties | 2 -
.../webresources/LocalStrings_es.properties | 2 -
.../webresources/LocalStrings_fr.properties | 2 -
.../webresources/LocalStrings_ja.properties | 2 -
.../webresources/LocalStrings_ko.properties | 2 -
.../webresources/LocalStrings_zh_CN.properties | 4 +-
java/org/apache/coyote/AbstractProcessor.java | 1 +
java/org/apache/coyote/CompressionConfig.java | 30 +++++-
.../apache/coyote/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/ProtocolHandler.java | 12 ++-
java/org/apache/coyote/Request.java | 4 +-
java/org/apache/coyote/ajp/Constants.java | 2 +-
java/org/apache/coyote/ajp/LocalStrings.properties | 2 -
.../apache/coyote/ajp/LocalStrings_es.properties | 3 -
.../apache/coyote/ajp/LocalStrings_fr.properties | 2 -
.../apache/coyote/ajp/LocalStrings_ja.properties | 2 -
.../apache/coyote/ajp/LocalStrings_ko.properties | 2 -
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 -
.../apache/coyote/http11/LocalStrings.properties | 3 -
.../coyote/http11/LocalStrings_de.properties | 1 -
.../coyote/http11/LocalStrings_es.properties | 3 -
.../coyote/http11/LocalStrings_fr.properties | 5 +-
.../coyote/http11/LocalStrings_ja.properties | 3 -
.../coyote/http11/LocalStrings_ko.properties | 5 +-
.../coyote/http11/LocalStrings_zh_CN.properties | 3 +-
.../coyote/http11/filters/ChunkedOutputFilter.java | 11 +-
.../coyote/http2/ConnectionSettingsBase.java | 6 +-
.../coyote/http2/ConnectionSettingsLocal.java | 8 ++
.../coyote/http2/ConnectionSettingsRemote.java | 8 ++
java/org/apache/coyote/http2/Http2Protocol.java | 32 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 88 ++++++++++++---
.../apache/coyote/http2/LocalStrings.properties | 9 +-
.../apache/coyote/http2/LocalStrings_es.properties | 1 -
.../apache/coyote/http2/LocalStrings_fr.properties | 8 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 7 --
.../apache/coyote/http2/LocalStrings_ko.properties | 8 +-
.../coyote/http2/LocalStrings_zh_CN.properties | 19 +++-
java/org/apache/coyote/http2/Stream.java | 22 ++--
java/org/apache/coyote/http2/StreamProcessor.java | 23 ++--
.../coyote/http2/WindowAllocationManager.java | 17 +++
java/org/apache/jasper/compiler/AntCompiler.java | 1 -
.../apache/jasper/compiler/ELFunctionMapper.java | 2 +-
java/org/apache/jasper/compiler/JspConfig.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 1 -
java/org/apache/jasper/compiler/JspUtil.java | 9 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 2 +-
java/org/apache/jasper/compiler/SmapGenerator.java | 10 +-
java/org/apache/jasper/compiler/SmapStratum.java | 14 +--
.../compiler/tagplugin/TagPluginContext.java | 4 +-
.../jasper/resources/LocalStrings.properties | 2 -
.../jasper/resources/LocalStrings_de.properties | 1 -
.../jasper/resources/LocalStrings_es.properties | 2 -
.../jasper/resources/LocalStrings_fr.properties | 2 -
.../jasper/resources/LocalStrings_ja.properties | 2 -
.../jasper/resources/LocalStrings_ko.properties | 2 -
.../jasper/resources/LocalStrings_zh_CN.properties | 21 +++-
.../org/apache/jasper/runtime/BodyContentImpl.java | 4 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 4 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 8 +-
java/org/apache/jasper/xmlparser/ASCIIReader.java | 2 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 2 +-
java/org/apache/jasper/xmlparser/UCSReader.java | 2 +-
java/org/apache/jasper/xmlparser/UTF8Reader.java | 2 +-
java/org/apache/juli/FileHandler.java | 16 ++-
java/org/apache/juli/logging/package.html | 2 +-
.../naming/factory/LocalStrings_zh_CN.properties | 2 +
java/org/apache/tomcat/buildutil/SignCode.java | 2 +-
.../buildutil/translate/BackportTranslations.java | 10 ++
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +-
.../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 2 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 6 +-
java/org/apache/tomcat/jni/SSL.java | 6 +-
java/org/apache/tomcat/jni/SSLConf.java | 2 +-
java/org/apache/tomcat/jni/SSLContext.java | 6 +-
java/org/apache/tomcat/jni/SSLSocket.java | 6 +-
.../org/apache/tomcat/util/IntrospectionUtils.java | 88 +++++++++++----
.../apache/tomcat/util/buf/ByteBufferUtils.java | 9 +-
.../apache/tomcat/util/buf/LocalStrings.properties | 1 -
.../tomcat/util/buf/LocalStrings_es.properties | 2 -
.../tomcat/util/buf/LocalStrings_fr.properties | 1 -
.../tomcat/util/buf/LocalStrings_ja.properties | 1 -
.../tomcat/util/buf/LocalStrings_ko.properties | 1 -
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 1 -
java/org/apache/tomcat/util/buf/package.html | 2 +-
.../apache/tomcat/util/codec/binary/Base64.java | 39 +++++--
.../util/compat/LocalStrings_zh_CN.properties | 2 +
.../util/descriptor/tagplugin/TagPluginParser.java | 2 +-
.../tomcat/util/descriptor/tld/TldParser.java | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 3 +
java/org/apache/tomcat/util/digester/Digester.java | 48 ++++++---
java/org/apache/tomcat/util/digester/package.html | 83 ++++++--------
.../tomcat/util/http/FastHttpDateFormat.java | 4 +-
.../tomcat/util/http/LocalStrings_zh_CN.properties | 3 +-
.../{AcceptLanguage.java => AcceptEncoding.java} | 30 +++---
java/org/apache/tomcat/util/http/parser/Host.java | 4 +-
.../util/http/parser/LocalStrings.properties | 1 -
.../util/http/parser/LocalStrings_fr.properties | 1 -
.../util/http/parser/LocalStrings_ja.properties | 1 -
.../util/http/parser/LocalStrings_ko.properties | 1 -
.../apache/tomcat/util/http/parser/MediaType.java | 2 +-
java/org/apache/tomcat/util/modeler/Registry.java | 2 +-
.../apache/tomcat/util/modeler/RegistryMBean.java | 2 +-
java/org/apache/tomcat/util/modeler/package.html | 10 +-
.../apache/tomcat/util/net/LocalStrings.properties | 3 -
.../tomcat/util/net/LocalStrings_es.properties | 2 -
.../tomcat/util/net/LocalStrings_fr.properties | 3 -
.../tomcat/util/net/LocalStrings_ja.properties | 3 -
.../tomcat/util/net/LocalStrings_ko.properties | 3 -
.../tomcat/util/net/LocalStrings_zh_CN.properties | 4 +
java/org/apache/tomcat/util/net/Nio2Channel.java | 4 +-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 10 +-
java/org/apache/tomcat/util/net/NioChannel.java | 8 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 10 +-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
.../apache/tomcat/util/net/SecureNio2Channel.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 55 +++++++---
.../tomcat/util/net/jsse/LocalStrings.properties | 5 -
.../util/net/jsse/LocalStrings_de.properties | 2 -
.../util/net/jsse/LocalStrings_es.properties | 2 -
.../util/net/jsse/LocalStrings_fr.properties | 5 -
.../util/net/jsse/LocalStrings_ja.properties | 5 -
.../util/net/jsse/LocalStrings_ko.properties | 5 -
.../util/net/jsse/LocalStrings_zh_CN.properties | 6 +-
.../util/net/openssl/LocalStrings.properties | 5 -
.../util/net/openssl/LocalStrings_de.properties | 3 -
.../util/net/openssl/LocalStrings_es.properties | 2 -
.../util/net/openssl/LocalStrings_fr.properties | 5 -
.../util/net/openssl/LocalStrings_ja.properties | 5 -
.../util/net/openssl/LocalStrings_ko.properties | 5 -
.../util/net/openssl/LocalStrings_zh_CN.properties | 3 -
java/org/apache/tomcat/util/res/StringManager.java | 2 +-
.../org/apache/tomcat/util/threads/LimitLatch.java | 2 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 2 +-
.../tomcat/websocket/LocalStrings.properties | 1 -
.../tomcat/websocket/LocalStrings_fr.properties | 1 -
.../tomcat/websocket/LocalStrings_ja.properties | 1 -
.../tomcat/websocket/LocalStrings_ko.properties | 1 -
.../tomcat/websocket/LocalStrings_zh_CN.properties | 4 +
.../websocket/pojo/LocalStrings_zh_CN.properties | 3 +
.../websocket/server/LocalStrings.properties | 3 -
.../websocket/server/LocalStrings_de.properties | 1 -
.../websocket/server/LocalStrings_es.properties | 1 -
.../websocket/server/LocalStrings_fr.properties | 3 -
.../websocket/server/LocalStrings_ja.properties | 3 -
.../websocket/server/LocalStrings_ko.properties | 3 -
.../websocket/server/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/websocket/server/UpgradeUtil.java | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 26 ++---
.../org/apache/tomcat/jdbc/pool/TrapException.java | 2 +-
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 4 +-
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 10 +-
.../apache/catalina/core/TestStandardWrapper.java | 31 ++++--
.../catalina/valves/rewrite/TestRewriteValve.java | 2 +-
test/org/apache/coyote/TestCompressionConfig.java | 67 ++++++++++++
test/org/apache/coyote/http2/Http2TestBase.java | 12 ++-
.../apache/coyote/http2/TestAbstractStream.java | 16 +--
.../apache/coyote/http2/TestHttp2Section_5_2.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_5_3.java | 2 +-
.../apache/coyote/http2/TestStreamProcessor.java | 56 ++++++++++
.../TestWsWebSocketContainerWithProxy.java | 2 +-
.../docs/architecture/startup/serverStartup.txt | 2 +-
webapps/docs/changelog.xml | 119 ++++++++++++++++++++-
webapps/docs/cluster-howto.xml | 51 +++++----
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/config/http.xml | 2 +-
webapps/docs/config/http2.xml | 33 +++---
webapps/docs/config/systemprops.xml | 9 +-
webapps/docs/connectors.xml | 2 +-
webapps/docs/funcspecs/index.xml | 2 +-
webapps/docs/{elapi => jaspicapi}/index.html | 6 +-
webapps/docs/mbeans-descriptors-howto.xml | 2 +-
webapps/docs/project.xml | 1 +
webapps/docs/rewrite.xml | 6 +-
webapps/docs/ssl-howto.xml | 30 ++++--
291 files changed, 1272 insertions(+), 877 deletions(-)
copy java/org/apache/catalina/{ha/authenticator => mbeans}/LocalStrings_zh_CN.properties (89%)
copy java/org/apache/tomcat/util/http/parser/{AcceptLanguage.java => AcceptEncoding.java} (67%)
create mode 100644 test/org/apache/coyote/TestCompressionConfig.java
copy webapps/docs/{elapi => jaspicapi}/index.html (90%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/01: Frist draft
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch BZ-63681/8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6be96ebba4e7056d5c9621bada2c496f8c0a82d0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Aug 21 23:23:19 2019 +0200
Frist draft
changelog.xml pending
---
java/org/apache/catalina/Realm.java | 13 +++++
java/org/apache/catalina/realm/CombinedRealm.java | 34 ++++++++++++
java/org/apache/catalina/realm/LockOutRealm.java | 12 ++++
java/org/apache/catalina/realm/RealmBase.java | 67 +++++++++++++++++++----
4 files changed, 116 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/Realm.java b/java/org/apache/catalina/Realm.java
index a6360cc..412e845 100644
--- a/java/org/apache/catalina/Realm.java
+++ b/java/org/apache/catalina/Realm.java
@@ -25,6 +25,8 @@ import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSName;
/**
* A <b>Realm</b> is a read-only facade for an underlying security realm
@@ -135,6 +137,17 @@ public interface Realm {
/**
+ * Try to authenticate using a {@link GSSName}
+ *
+ * @param gssName The {@link GSSName} of the principal to look up
+ * @param gssCredential The {@link GSSCredential} of the principal, may be
+ * {@code null}
+ * @return the associated principal, or {@code null} if there is none
+ */
+ public Principal authenticate(GSSName gssName, GSSCredential gssCredential);
+
+
+ /**
* Try to authenticate using {@link X509Certificate}s
*
* @param certs Array of client certificates, with the first one in
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java
index 59511fa..5645457 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -32,6 +32,7 @@ import org.apache.catalina.Realm;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSName;
@@ -393,6 +394,39 @@ public class CombinedRealm extends RealmBase {
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Principal authenticate(GSSName gssName, GSSCredential gssCredentail) {
+ Principal authenticatedUser = null;
+
+ String username = String.valueOf(gssName);
+
+ for (Realm realm : realms) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("combinedRealm.authStart",
+ username, realm.getClass().getName()));
+ }
+
+ authenticatedUser = realm.authenticate(gssName, gssCredentail);
+
+ if (authenticatedUser == null) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("combinedRealm.authFail",
+ username, realm.getClass().getName()));
+ }
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("combinedRealm.authSuccess",
+ username, realm.getClass().getName()));
+ }
+ break;
+ }
+ }
+ return authenticatedUser;
+ }
+
@Override
@Deprecated
protected String getName() {
diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java
index b2dc29e..46e6a97 100644
--- a/java/org/apache/catalina/realm/LockOutRealm.java
+++ b/java/org/apache/catalina/realm/LockOutRealm.java
@@ -27,6 +27,7 @@ import org.apache.catalina.LifecycleException;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSName;
@@ -205,6 +206,17 @@ public class LockOutRealm extends CombinedRealm {
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Principal authenticate(GSSName gssName, GSSCredential gssCredential) {
+ String username = String.valueOf(gssName);
+
+ Principal authenticatedUser = super.authenticate(gssName, gssCredential);
+ return filterLockedAccounts(username, authenticatedUser);
+ }
+
/*
* Filters authenticated principals to ensure that <code>null</code> is
diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index d321c56..f300810 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -499,16 +499,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
}
}
- String name = gssName.toString();
-
- if (isStripRealmForGss()) {
- int i = name.indexOf('@');
- if (i > 0) {
- // Zero so we don't leave a zero length name
- name = name.substring(0, i);
- }
- }
- return getPrincipal(name, gssCredential);
+ return getPrincipal(gssName, gssCredential);
}
} else {
log.error(sm.getString("realmBase.gssContextNotEstablished"));
@@ -520,6 +511,19 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public Principal authenticate(GSSName gssName, GSSCredential gssCredential) {
+ if (gssName == null) {
+ return null;
+ }
+
+ return getPrincipal(gssName, gssCredential);
+ }
+
+
+ /**
* Execute a periodic task, such as reloading, etc. This method will be
* invoked inside the classloading context of this container. Unexpected
* throwables will be caught and logged.
@@ -1253,6 +1257,49 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
return p;
}
+
+ /**
+ * Get the principal associated with the specified {@link GSSName}.
+ *
+ * This is a convenience method you can override to obtain a GSS credential
+ * via S4U2self.
+ *
+ * @param gssName The GSS name
+ * @return the principal associated with the given user name.
+ */
+ protected Principal getPrincipal(GSSName gssName) {
+ return getPrincipal(gssName, null);
+ }
+
+
+ /**
+ * Get the principal associated with the specified {@link GSSName}.
+ *
+ * @param gssName The GSS name
+ * @param gssCredential the GSS credential of the principal
+ * @return the principal associated with the given user name.
+ */
+ protected Principal getPrincipal(GSSName gssName, GSSCredential gssCredential) {
+ String name = String.valueOf(gssName);
+
+ if (isStripRealmForGss()) {
+ int i = name.indexOf('@');
+ if (i > 0) {
+ // Zero so we don't leave a zero length name
+ name = name.substring(0, i);
+ }
+ }
+
+ Principal p = getPrincipal(name);
+
+ if (p instanceof GenericPrincipal) {
+ ((GenericPrincipal) p).setGssCredential(gssCredential);
+ }
+
+ return p;
+ }
+
+
/**
* Return the Server object that is the ultimate parent for the container
* with which this Realm is associated. If the server cannot be found (eg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org