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/11/27 10:28:48 UTC
[tomcat] branch BZ-63681/8.5.x updated (6be96eb -> a0e8d49)
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 6be96eb Frist draft
add ca38cf1 Fix indent
add 5c1699a Deprecate org.apache.tomcat.util.compat.TLS and move its functionality to its only using lass org.apache.tomcat.util.net.TesterSupport.
add 831c6e1 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63753 WS host header
add 07f3c37 Fix test failures caused by APR crash during shutdown
add b7ae3eb Add release date for 8.5.46
add 6dae407 Revert "Fix test failures caused by APR crash during shutdown"
add 99e5ea8 Add Javadoc for the Common Annotation API
add 8b7ade1 Correct version number
add da37f36 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC
add 4e984dc Polish. Align spacing, remove svn (and cvs!) references
add c24a6ae Align Java version references
add c8ddc6f Update link to point to Java 7 javadoc
add ce4f6b7 Parameterise minimum Java version
add c9f3362 Fix xml source file that wasn't using expected version replacement
add 39bcbd0 Fix xml source file that wasn't using expected version replacement
add 993e80e BZ63765: Try to unwrap first after handshake
add 3aba970 Fix test failures with APR/native.
add 5dda8bf Fix incorrect default value of maxThreads in cluster receiver docs.
add 8c2f067 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63766
add d817d1e Align with 9.0.x. Spacing, Javadoc
add 2a26382 Add throwOnFailure to LifecycleBase.
add 8fc21ef Fix indent
add 0378b4b Align Javadoc with 9.0.x
add 30f7e93 Align with 9.0.x. Mostly Javadoc with a little refactoring.
add 1b0c02c Align with 9.0.x. Spacing.
add d9f4dd4 Align with 9.0.x - spacing
add 71deb4b Align with 9.0.x - spacing, i18n
add f3c4438 Align with 9.0.x- spacing, l10n
add c9fda66 Align with 9.0.x
add 02bbd57 Align with 9.0.x spacing
add 845d972 Align with 9.0.x - spacing
add 8dbabe3 Fix alignment of start-up messages
add 74cd321 Fix open transaction after validation
add 98943df Add logging
add a7e6a5d Add logging
add 0bcf094 Try and detect bugs like BZ 63778
add 7c15360 Try and detect bugs like BZ 63778
add fa8de32 Fix typos
add cc85b6c Fixes having an issue number are sorted by their number, ascending.
add 7637860 Remove unnecessary @SuppressWarnings
add 260133b Remove unused code
add b5d2660 Prep fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
add c110bf8 Update to Commons Daemon 1.2.2
add 1de02b6 Correct bug number
add 90e55a9 More prep for https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
add 837eb2e Remove unnecessary code.
add 7c4361e Use generics and remove a couple of casts
add 79f5924 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63781 reported issue
add 4c12d98 Follow up to BZ 63781 fix. Restore explicit isPublic check.
add eecce7a Additional fix releated to BZ 63781
add bc9f590 Ensure correct exception type for defineFunction with Java 9+
add aaf50d0 Ensure correct exception with ImportHandler and Java 9+
add ec7a606 Ensure correct exception with StaticFieldELResolver and Java 9+
add e8b7ec6 Catch <jsp:useBean> module export issues at compile time if configured to do so
add 62a387a Polish. Formatting.
add 2ae5c4b Polish. Align with 9.0.x. i18n improvements.
add cc78a85 Also skip interfaces reported via onStartup()
add 39e22eb Add a module check when processing the scan for server endpoints
add fd7de63 Update changelog
add 37782c6 Fix NPEs when looking for static methods
add 434b5dd Increment version ready for next development cycle
add 9d6e09f Fix typo
add 4a9f854 Update URL for code signing service.
add 20c39e9 Use consistent format
add 7c31429 Expand debugging for async processing
add 7839aab Add debug logging of read/write interest registration
add 8db9014 Expand async tests
add 570e2c8 Fix instance where pipelined data may be missed after an async request
add ee83aed Don't trigger an additional dispatch with async I/O and complete
add 050fb80 Improve debug logging
add c9a87ee Further align complete()/dispatch() if called during async I/O
add d91f848 asyncStarted should be false once complete/dispatch in onTimeout
add 476c7f7 asyncStarted should be false once complete/dispatch in onError
add a7da104 63765: Properly mark container as FAILED when a JVM error occurs on stop # Conflicts: # webapps/docs/changelog.xml
add b57c622 Add test case for bug 63816
add bf24a92 Add debug log messages for the triggering of async listener events
add 0495f66 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63816 async errors
add 7c0a689 Expand test for https://bz.apache.org/bugzilla/show_bug.cgi?id=63816
add eb9ca41 Refactor
add 29bf1c5 Refactor
add a6b3d5b Remove an illegal state transition
add 6e1b6a9 Hack to fix failing test
add 333ece2 Refactor the unit test to avoid race conditions
add 57c6917 Fix BZ number
add 8b2d892 Refactor Vary parser to the more generic TokenList parser
add 30d46a4 Add a case sensitive / insensitive option to the token list parser
add 8c789b3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63824
add 9ec7f00 Simplify on the grounds all tokens of interest are case-insensitive
add dcb77df Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63825
add 6313c29 Remove unused String
add 0d71dd5 Fix possible NPE with excessive header size
add 9c7aff6 Update state definitions and associated diagram (now a lot simpler)
add 801fc70 Minor optimisation - add new line to access log message outside the sync
add c77c089 Additional fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63825
add 1ec84d4 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63826
add d713e8e Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
add 9054e10 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63829
add 94682c0 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63830
add 117f44c Refactor Processor creation
add 425e0da Complete the fix for 63829. Align CompressionConfig usage with 9.0.x
add 321b2db Align with 9.0.x
add 6c398f3 Remove unnecessary code.
add c1c2161 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63865
add b2a589a Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63831
add 05664f3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63836
add 6fac0e0 Update guidance for Eclipse 4.13
add 08018d3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63838
add ab256a5 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63864
add cf53f8a Remove unnecessary code
add 80aaff5 Add missing i18n
add d97f33b Log tweaks
add 88f097b Correct description of default value of server attribute
add ce6a3c9 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63872 symlinked war
add 6b2bb06 Polish. Improve alignment with 9.0.x/7.0.x
add c5e531a Remove unused code
add 31f324a Refactor to align better with 9.0.x
add f7c8b94 Refactor to (slightly) reduce native calls when using OpenSSL
add 0a986a1 OpenSSLEngine to differentiate between optional and optionalNoCA
add 2d3a570 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63897 JSP timestamps
add 2ab75fb Fix a possible race condition
add 7961a4a Fix credit
add 7a35c15 Correct entry so it makes sense
add 7cb3e16 Fix typos
add ff139be Expand coverage of French translations
add a327dd7 Remove unnecessary blank line
add 9cbd837 Back-port Korean updates
add d4d9942 Expand coverage and quality of Simplified Chinese translations
add 7b841fa Fix PR #211 via POEditor
add b5e740e Fix typo
add 7890094 Remove unnecessary code
add 846ff9a Improve clean-up after an OOME during request processing
add 2b0aaed Fix JSP compilation showing old content reported on users@ list
add 82cf2d0 Follow on to 2b0aaedd
add 420c883 Fix logic that meant AJP was not always non-blocking between requests
add a12a166 Polish
add 98b021b BZ 63905: Clean up Tomcat CSS
add c0e8462 Fix test fallout of BZ 63905
add 7a5163b Polish (aligning with 9.0.x/7.0.x)
add 0ae3dde Convert TestExpireFilter to use the built-in getUrl() methods
add 2522b5a0 Refactor response header handling in unit tests
add 28c60f1 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63909
add b0ca786 Use servlet4preview package to access mapping info
add c351145 Tab police
add 6c03319 Update the Servlet 4 preview API to reflect the final release.
add 064cca1 Remove unused code
add cf4f6da Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63913 Wrap NPEs
add f13511f Polish. Align with 7.0.x/9.0.x. Use i18n.
add 5479b5b Polish. Align with 9.0.x/7.0.x
add 83bae8a Add more charsets to CharsetCache for the HPE JVM on HP-UX
add 8475c0f Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63916 speed up test
add 9df8cae Additional fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63916
add f056ef1 Properly calculate dynamic parts of ErrorReportValve response for TestHttp2InitialConnection
add f001c56 Align with 9.0.x, improve i18n
add 3fe5742 Back-port FindBugs fixes from 9.0.x
add b46f44c Fix SpotBugs warnings in o.a.catalina
add fce6e65 Fix SportBugs warnings for Coyote and EL
add 36291e6 SpotBugs fixes (incomplete) for Jasper
add 665a6da Fix SpotBug failures in Jasper
add ee6ad62 Align with 9.0.x
add 4467e6d Fix SpotBugs failures in JULI and naming
add 9a95146 Jasper
add 547f25c Fix some of the SpotBugs warnings in o.a.tomcat
add 5c4b290 Add 8.5.47 release date
add 2b2ed21 More SpotBugs fixes
add a91d7db Refactor JMX remote RMI registry creation
add 1786045 Remove failonwarning due to internal API use causing a javadoc warning
add 49de92f Fix IDE warnings. Get build working with Java 8 through 14
add 876fe18 Use -XDignore.symbol.file to avoid the proprietary API warning
add 443f5ee Fix SpotBugs warnings. Align with 9.0.x/7.0.x.
add 065f64c Fix remaining SpotBugs warnings in main code tree
add 1412fc5 BZ 63835: Add support for Keep-Alive header
add 56fb7dc Improve changelog entry for BZ 63835
add b57136d Fix IDE auto-box warnings
add a86f15c Restore compile.release where it can be done without breaking the build
add b1674e5 Implement feedback on BZ 63835
add 96cc274 Improve unit test robustness
add 8c143ab Improve CSRF prevention filter by exposing the request's current nonce to the request.
add 5c56cb7 Increment version number for next dev cycle
add 27adc25 Fix NPE regression in 6c03319
add f9d0fb0 Update changelog
add a3cc1b7 Increment version for next dev cycle
add 4508e70 Refactor APR Poller to remove use of multiple pollsets
add 8120030 Remove extra space
add 16d6a19 Fix broken link.
add e92da8e Additional debug logging to investigate bug 63859
add 52c6412 Fix SpotBugs warnings in JDBC pool module
add 065c5d1 Fix SpotBugs warnings for unit tests
add c4c1420 Fix SpotBugs issues in JDBC pool tests
add 85ba8b6 One missed false positive
add cc2e388 Fix MBean description of keepAliveTimeout
add 402acdb Correct the docs for maxConnections
add 6c9bb69 Add logging to CSRF prevention listener.
add 24edf31 Post-review from kkolonko: fix typo in constant name, push initialization down into subclass.
add 7b55938 Add missing changelog for CSRF prevention filter changes.
add 856a2e2 Allow customization of the CSRF prevention filter's request parameter name.
add 11ad208 Move initialization of CSRF REST nonce header name context attribute into the RestCsrfPreventionFilter where it belongs.
add 7c9a50c Adjust changelog to reflect which releases actually contain which improvements to the CSRF prevention filter.
add b97eadb Fix test
add 2c5664d Fix typpo
add 31ea629 Fix typos
add f627f8e Port current version of the async API
add fdf0ba0 Add RFC references.
add 40aa617 Add release date for 8.5.49
add dd7019b Fix javadoc @see reference.
add 55dd280 .gitignore - Add .ant-targets-build.xml file to gitignore.
add 2fedebf Fix potential test failure / hang if timing isn't as expected
add d946928 Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
add aeec08f Pull down APR specific lock structure
add 752f17b Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
add 2072077 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63964 Cached URLs
new a0e8d49 BZ 63681: Introduce RealmBase#authenticate(GSSName, GSSCredential) and friends
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 (6be96eb)
\
N -- N -- N refs/heads/BZ-63681/8.5.x (a0e8d49)
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:
.gitignore | 1 +
RELEASE-NOTES | 2 +-
RUNNING.txt | 2 +-
bin/catalina.sh | 16 +-
bin/daemon.sh | 66 +-
bin/tool-wrapper.sh | 8 +-
build.properties.default | 10 +-
build.xml | 86 ++-
java/javax/annotation/Resource.java | 4 +
java/javax/el/BeanELResolver.java | 36 +-
java/javax/el/ELProcessor.java | 11 +-
java/javax/el/ImportHandler.java | 6 +-
java/javax/el/Jre9Compat.java | 83 +++
java/javax/el/JreCompat.java | 73 ++
java/javax/el/LocalStrings.properties | 4 +-
java/javax/el/LocalStrings_zh_CN.properties | 4 +-
java/javax/el/StaticFieldELResolver.java | 18 +-
java/javax/el/Util.java | 95 ++-
java/javax/servlet/AsyncContext.java | 2 +-
.../servlet/http/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/Cluster.java | 3 +-
java/org/apache/catalina/ContainerEvent.java | 5 +-
java/org/apache/catalina/Context.java | 6 +-
.../catalina/{ant/ListTask.java => GSSRealm.java} | 38 +-
java/org/apache/catalina/Host.java | 4 +-
java/org/apache/catalina/Pipeline.java | 10 +-
java/org/apache/catalina/Realm.java | 13 -
java/org/apache/catalina/Service.java | 2 -
java/org/apache/catalina/UserDatabase.java | 32 +-
.../authenticator/LocalStrings_zh_CN.properties | 7 +
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../connector/LocalStrings_zh_CN.properties | 9 +
java/org/apache/catalina/connector/Request.java | 6 +-
.../apache/catalina/connector/RequestFacade.java | 6 +-
.../catalina/connector/mbeans-descriptors.xml | 2 +-
.../apache/catalina/core/ApplicationContext.java | 4 +-
.../catalina/core/ApplicationDispatcher.java | 18 +-
.../catalina/core/ApplicationFilterConfig.java | 2 +-
.../catalina/core/ApplicationHttpRequest.java | 12 +-
.../apache/catalina/core/ApplicationMapping.java | 75 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 12 +
.../apache/catalina/core/LocalStrings.properties | 16 +
.../catalina/core/LocalStrings_fr.properties | 12 +
.../catalina/core/LocalStrings_ja.properties | 12 +
.../catalina/core/LocalStrings_ko.properties | 12 +
.../catalina/core/LocalStrings_zh_CN.properties | 32 +
java/org/apache/catalina/core/StandardHost.java | 54 +-
.../org/apache/catalina/core/StandardPipeline.java | 22 +-
java/org/apache/catalina/core/StandardServer.java | 21 +-
.../apache/catalina/core/StandardWrapperValve.java | 78 +-
.../catalina/deploy/NamingResourcesImpl.java | 9 +-
java/org/apache/catalina/filters/Constants.java | 33 +
.../catalina/filters/CsrfPreventionFilter.java | 89 ++-
.../org/apache/catalina/filters/ExpiresFilter.java | 60 +-
.../catalina/filters/LocalStrings_zh_CN.properties | 20 +-
.../catalina/filters/RestCsrfPreventionFilter.java | 12 +
java/org/apache/catalina/ha/ClusterListener.java | 10 -
.../catalina/ha/deploy/FileMessageFactory.java | 50 +-
.../catalina/ha/deploy/LocalStrings.properties | 6 +
.../catalina/ha/deploy/LocalStrings_de.properties | 2 +
.../catalina/ha/deploy/LocalStrings_es.properties | 2 +
.../catalina/ha/deploy/LocalStrings_fr.properties | 6 +
.../catalina/ha/deploy/LocalStrings_ja.properties | 6 +
.../catalina/ha/deploy/LocalStrings_ko.properties | 6 +
.../ha/deploy/LocalStrings_zh_CN.properties | 5 +
.../ha/session/LocalStrings_zh_CN.properties | 10 +
.../apache/catalina/ha/tcp/ReplicationValve.java | 46 +-
.../catalina/loader/LocalStrings_zh_CN.properties | 5 +
.../catalina/loader/WebappClassLoaderBase.java | 10 +-
.../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 | 1 +
.../catalina/manager/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/manager/ManagerServlet.java | 8 +-
.../catalina/manager/StatusManagerServlet.java | 7 -
.../manager/host/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mapper/LocalStrings_zh_CN.properties | 2 +
java/org/apache/catalina/mapper/MappingData.java | 4 +-
.../org/apache/catalina/mbeans/ContainerMBean.java | 4 +-
.../mbeans/JmxRemoteLifecycleListener.java | 102 ++-
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 +
java/org/apache/catalina/mbeans/MBeanFactory.java | 16 +-
java/org/apache/catalina/realm/CombinedRealm.java | 17 +-
java/org/apache/catalina/realm/JAASRealm.java | 9 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 5 +
java/org/apache/catalina/realm/LockOutRealm.java | 5 +-
java/org/apache/catalina/realm/RealmBase.java | 25 +-
.../catalina/security/SecurityClassLoad.java | 6 +-
.../apache/catalina/security/SecurityConfig.java | 12 +-
.../catalina/servlet4preview/ServletContext.java | 32 +-
...ServletMapping.java => HttpServletMapping.java} | 16 +-
.../servlet4preview/http/HttpServletRequest.java | 4 +-
.../http/HttpServletRequestWrapper.java | 14 +-
.../servlet4preview/http/MappingMatch.java | 3 +-
.../catalina/servlet4preview/http/PushBuilder.java | 4 +-
.../apache/catalina/servlets/DefaultServlet.java | 16 +-
.../servlets/LocalStrings_zh_CN.properties | 2 +
.../apache/catalina/servlets/WebdavServlet.java | 7 +-
java/org/apache/catalina/session/FileStore.java | 10 +-
.../catalina/session/LocalStrings.properties | 2 +
.../catalina/session/LocalStrings_es.properties | 1 +
.../catalina/session/LocalStrings_fr.properties | 2 +
.../catalina/session/LocalStrings_ja.properties | 2 +
.../catalina/session/LocalStrings_ko.properties | 2 +
.../catalina/session/LocalStrings_zh_CN.properties | 10 +
.../apache/catalina/session/StandardManager.java | 7 +-
java/org/apache/catalina/startup/Bootstrap.java | 104 ++-
.../org/apache/catalina/startup/ContextConfig.java | 95 ++-
.../catalina/startup/LocalStrings.properties | 2 +
.../catalina/startup/LocalStrings_fr.properties | 2 +
.../catalina/startup/LocalStrings_ja.properties | 2 +
.../catalina/startup/LocalStrings_ko.properties | 2 +
.../catalina/startup/LocalStrings_zh_CN.properties | 26 +-
java/org/apache/catalina/startup/Tomcat.java | 22 +-
.../catalina/storeconfig/LocalStrings.properties | 3 +
.../storeconfig/LocalStrings_fr.properties | 3 +
.../storeconfig/LocalStrings_ja.properties | 3 +
.../storeconfig/LocalStrings_ko.properties | 3 +
.../LocalStrings_zh_CN.properties | 3 +-
.../catalina/storeconfig/StoreFileMover.java | 23 +-
java/org/apache/catalina/tribes/Member.java | 4 +-
.../catalina/tribes/group/ChannelCoordinator.java | 1 -
.../apache/catalina/tribes/group/GroupChannel.java | 8 +-
.../tribes/group/LocalStrings_zh_CN.properties | 4 +
.../interceptors/LocalStrings_zh_CN.properties | 4 +
.../group/interceptors/TcpPingInterceptor.java | 4 +-
.../group/interceptors/ThroughputInterceptor.java | 14 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 21 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 6 +-
.../membership/LocalStrings_zh_CN.properties | 11 +-
.../tribes/membership/McastServiceImpl.java | 2 +-
.../catalina/tribes/membership/Membership.java | 23 +-
.../tribes/tipis/AbstractReplicatedMap.java | 16 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 16 +-
.../catalina/tribes/tipis/LocalStrings.properties | 6 +-
.../tribes/tipis/LocalStrings_zh_CN.properties | 5 +
.../catalina/tribes/tipis/ReplicatedMap.java | 25 +-
.../catalina/tribes/transport/AbstractRxTask.java | 4 +-
.../catalina/tribes/transport/PooledSender.java | 8 +-
.../catalina/tribes/transport/ReceiverBase.java | 10 +-
.../catalina/tribes/transport/RxTaskPool.java | 8 +-
.../transport/bio/LocalStrings_zh_CN.properties | 4 +
.../tribes/transport/bio/MultipointBioSender.java | 16 +-
.../transport/nio/LocalStrings_zh_CN.properties | 5 +
.../tribes/transport/nio/ParallelNioSender.java | 16 +-
.../catalina/tribes/util/ExecutorFactory.java | 2 +-
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/util/LifecycleBase.java | 102 ++-
.../catalina/util/LocalStrings_zh_CN.properties | 6 +
java/org/apache/catalina/util/TomcatCSS.java | 16 +-
.../org/apache/catalina/valves/AccessLogValve.java | 2 +-
.../catalina/valves/LocalStrings_zh_CN.properties | 15 +
.../rewrite/LocalStrings_zh_CN.properties} | 3 +-
.../catalina/webresources/CachedResource.java | 136 +++-
.../catalina/webresources/LocalStrings.properties | 2 +
.../webresources/LocalStrings_zh_CN.properties | 7 +
.../apache/catalina/webresources/StandardRoot.java | 2 +-
java/org/apache/coyote/AbstractProcessor.java | 33 +-
java/org/apache/coyote/AbstractProcessorLight.java | 30 +-
java/org/apache/coyote/AbstractProtocol.java | 28 +-
java/org/apache/coyote/AsyncStateMachine.java | 282 ++++---
java/org/apache/coyote/CompressionConfig.java | 28 +-
java/org/apache/coyote/LocalStrings.properties | 6 +-
java/org/apache/coyote/LocalStrings_fr.properties | 1 -
java/org/apache/coyote/LocalStrings_ja.properties | 1 -
java/org/apache/coyote/LocalStrings_ko.properties | 1 -
.../apache/coyote/LocalStrings_zh_CN.properties | 3 +
java/org/apache/coyote/ajp/AjpProcessor.java | 14 +-
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/AbstractHttp11Protocol.java | 32 +-
java/org/apache/coyote/http11/Constants.java | 14 +
java/org/apache/coyote/http11/Http11Processor.java | 419 +++--------
.../coyote/http11/LocalStrings_zh_CN.properties | 5 +
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 4 +
.../apache/coyote/http2/Http2UpgradeHandler.java | 12 -
.../coyote/http2/LocalStrings_zh_CN.properties | 17 +
java/org/apache/el/util/Jre9Compat.java | 58 ++
java/org/apache/el/util/JreCompat.java | 60 ++
java/org/apache/el/util/ReflectionUtil.java | 41 +-
java/org/apache/jasper/JspCompilationContext.java | 4 +-
java/org/apache/jasper/compiler/AntCompiler.java | 5 +-
java/org/apache/jasper/compiler/Compiler.java | 14 +-
java/org/apache/jasper/compiler/Generator.java | 19 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 5 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 5 +-
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
java/org/apache/jasper/el/JasperELResolver.java | 18 +-
.../jasper/resources/LocalStrings.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 | 31 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 2 +-
.../apache/jasper/servlet/JspServletWrapper.java | 4 +-
java/org/apache/juli/logging/LogFactory.java | 4 +-
.../apache/naming/LocalStrings_zh_CN.properties | 4 +
.../naming/factory/LocalStrings_zh_CN.properties | 5 +
java/org/apache/tomcat/buildutil/SignCode.java | 8 +-
.../apache/tomcat/buildutil/translate/Utils.java | 6 +-
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/buf/CharChunk.java | 4 +-
java/org/apache/tomcat/util/buf/CharsetCache.java | 4 +-
.../apache/tomcat/util/buf/LocalStrings.properties | 2 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 5 +
java/org/apache/tomcat/util/buf/MessageBytes.java | 2 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 5 +-
java/org/apache/tomcat/util/buf/package.html | 2 +-
java/org/apache/tomcat/util/compat/Jre8Compat.java | 25 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 52 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 32 +-
.../tomcat/util/compat/LocalStrings.properties | 5 +
.../tomcat/util/compat/LocalStrings_fr.properties | 2 +
.../tomcat/util/compat/LocalStrings_ko.properties | 2 +
.../util/compat/LocalStrings_zh_CN.properties | 2 +
java/org/apache/tomcat/util/compat/TLS.java | 3 +
.../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 10 +
.../tomcat/util/http/CookieProcessorBase.java | 2 +-
.../tomcat/util/http/LegacyCookieProcessor.java | 2 +-
.../tomcat/util/http/LocalStrings.properties | 2 +-
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5 +
java/org/apache/tomcat/util/http/ResponseUtil.java | 4 +-
.../tomcat/util/http/Rfc6265CookieProcessor.java | 2 +-
.../apache/tomcat/util/http/SameSiteCookies.java | 7 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 2 +-
.../util/http/parser/LocalStrings.properties | 2 +-
.../util/http/parser/LocalStrings_zh_CN.properties | 3 +
.../util/http/parser/{Vary.java => TokenList.java} | 39 +-
java/org/apache/tomcat/util/http/parser/Vary.java | 34 +-
.../util/modeler}/LocalStrings.properties | 3 +-
.../util/modeler}/LocalStrings_fr.properties | 3 +-
.../util/modeler}/LocalStrings_ja.properties | 3 +-
.../util/modeler}/LocalStrings_ko.properties | 3 +-
.../util/modeler/LocalStrings_zh_CN.properties} | 3 +-
java/org/apache/tomcat/util/modeler/Registry.java | 476 ++++++------
.../modules/MbeansDescriptorsDigesterSource.java | 4 +-
.../MbeansDescriptorsIntrospectionSource.java | 120 +--
.../tomcat/util/modeler/modules/ModelerSource.java | 2 +
.../tomcat/util/net/AbstractJsseEndpoint.java | 35 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 553 +++++++-------
.../apache/tomcat/util/net/LocalStrings.properties | 2 +
.../tomcat/util/net/LocalStrings_zh_CN.properties | 19 +-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 317 +++-----
.../tomcat/util/net/NioBlockingSelector.java | 4 +-
java/org/apache/tomcat/util/net/NioChannel.java | 27 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 115 +++
.../apache/tomcat/util/net/SecureNio2Channel.java | 3 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 145 ++++
.../apache/tomcat/util/net/SocketWrapperBase.java | 359 ++++++++-
.../util/net/jsse/LocalStrings_zh_CN.properties | 1 +
.../util/net/openssl/LocalStrings_zh_CN.properties | 4 +
.../tomcat/util/net/openssl/OpenSSLContext.java | 5 +-
.../tomcat/util/net/openssl/OpenSSLEngine.java | 37 +-
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/threads/TaskQueue.java | 6 +-
.../tomcat/websocket/LocalStrings.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 17 +
.../apache/tomcat/websocket/PerMessageDeflate.java | 37 +-
.../apache/tomcat/websocket/Transformation.java | 5 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 7 +-
.../tomcat/websocket/WsWebSocketContainer.java | 7 +-
.../websocket/pojo/LocalStrings_zh_CN.properties | 6 +
.../websocket/server/LocalStrings_zh_CN.properties | 6 +
.../server/WsRemoteEndpointImplServer.java | 4 -
java/org/apache/tomcat/websocket/server/WsSci.java | 10 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 5 +-
.../apache/tomcat/jdbc/pool/PoolProperties.java | 2 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 54 +-
.../jdbc/pool/interceptor/StatementCache.java | 3 +-
.../interceptor/StatementDecoratorInterceptor.java | 2 +-
.../java/org/apache/tomcat/jdbc/bugs/Bug53367.java | 6 +-
.../apache/tomcat/jdbc/test/ConnectCountTest.java | 4 +-
.../org/apache/tomcat/jdbc/test/FairnessTest.java | 4 +-
.../apache/tomcat/jdbc/test/JmxPasswordTest.java | 2 +-
.../apache/tomcat/jdbc/test/MultipleCloseTest.java | 4 +-
.../apache/tomcat/jdbc/test/StarvationTest.java | 2 +
.../org/apache/tomcat/jdbc/test/TestException.java | 12 +-
.../tomcat/jdbc/test/TestStatementCache.java | 2 +
.../org/apache/tomcat/jdbc/test/TestTimeout.java | 26 +-
.../apache/tomcat/jdbc/test/TestValidation.java | 650 ++++++++++++++++
.../jdbc/test/TestValidationQueryTimeout.java | 16 +-
res/checkstyle/org-import-control.xml | 1 +
res/findbugs/filter-false-positives.xml | 830 ++++++++++++++++++++-
.../eclipse/java-compiler-errors-warnings.txt | 6 +-
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 39 +-
res/welcome.bin.html | 2 +-
res/welcome.main.html | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 7 +-
.../TesterDigestAuthenticatorPerformance.java | 2 +-
.../connector/TestCoyoteAdapterRequestFuzzing.java | 17 +
.../apache/catalina/connector/TestResponse.java | 4 +-
.../apache/catalina/connector/TestSendFile.java | 2 +-
...estApplicationContextGetRequestDispatcherB.java | 10 +-
.../catalina/core/TestApplicationMapping.java | 12 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 405 +++++++++-
.../core/TestAsyncContextStateChanges.java | 378 ++++++++++
.../catalina/filters/TestAddCharSetFilter.java | 4 +-
.../catalina/filters/TestCsrfPreventionFilter.java | 2 +-
.../apache/catalina/filters/TestExpiresFilter.java | 110 ++-
...TestWebappClassLoaderThreadLocalMemoryLeak.java | 5 +-
.../apache/catalina/mapper/TestMapperWebapps.java | 16 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 47 +-
.../servlets/DefaultServletEncodingBaseTest.java | 6 +-
.../apache/catalina/startup/SimpleHttpClient.java | 11 +-
.../apache/catalina/startup/TomcatBaseTest.java | 32 +-
.../tribes/test/transport/SocketNioReceive.java | 8 +-
.../valves/TestLoadBalancerDrainingValve.java | 6 +-
...lerIntegration.java => TestCachedResource.java} | 30 +-
test/org/apache/coyote/TestResponse.java | 75 +-
.../apache/coyote/http11/TestHttp11Processor.java | 162 +++-
.../http11/filters/TestChunkedInputFilter.java | 1 +
.../apache/coyote/http11/upgrade/TestUpgrade.java | 9 +-
.../http11/upgrade/TestUpgradeInternalHandler.java | 7 +-
test/org/apache/coyote/http2/Http2TestBase.java | 2 +-
test/org/apache/coyote/http2/TestAsync.java | 7 +-
.../coyote/http2/TestHttp2InitialConnection.java | 30 +-
test/org/apache/coyote/http2/TestHttp2Limits.java | 20 +-
test/org/apache/jasper/TestJspC.java | 2 +-
.../apache/jasper/TestJspCompilationContext.java | 3 +-
test/org/apache/jasper/compiler/TestCompiler.java | 6 +-
test/org/apache/jasper/compiler/TestGenerator.java | 8 +-
test/org/apache/jasper/compiler/TestParser.java | 30 +-
.../compiler/TestParserNoStrictWhitespace.java | 9 +-
.../org/apache/jasper/el/TestJasperELResolver.java | 3 +-
test/org/apache/jasper/servlet/TestTldScanner.java | 3 +-
test/org/apache/juli/TestFileHandler.java | 13 +-
.../util/http/TestCookieProcessorGeneration.java | 20 +-
.../tomcat/util/http/TestSameSiteCookies.java | 19 +
.../parser/{TestVary.java => TestTokenList.java} | 9 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 17 +-
.../tomcat/websocket/TestPerMessageDeflate.java | 2 +-
.../bug6nnnn/bug69303.txt} | 12 +-
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/appdev/processes.xml | 4 +-
webapps/docs/changelog.xml | 400 +++++++++-
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/config/ajp.xml | 7 +-
webapps/docs/config/cluster-receiver.xml | 2 +-
webapps/docs/config/cookie-processor.xml | 10 +-
webapps/docs/config/http.xml | 15 +-
webapps/docs/config/valve.xml | 2 +-
webapps/docs/default-servlet.xml | 116 +--
webapps/docs/logging.xml | 4 +-
webapps/docs/project.xml | 4 +-
webapps/docs/security-howto.xml | 5 +-
webapps/docs/setup.xml | 4 +-
webapps/docs/tomcat-docs.xsl | 4 +
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
webapps/examples/jsp/security/protected/error.jsp | 4 +-
353 files changed, 7525 insertions(+), 2804 deletions(-)
create mode 100644 java/javax/el/Jre9Compat.java
create mode 100644 java/javax/el/JreCompat.java
copy java/org/apache/catalina/{ant/ListTask.java => GSSRealm.java} (56%)
rename java/org/apache/catalina/servlet4preview/http/{ServletMapping.java => HttpServletMapping.java} (89%)
copy java/org/apache/catalina/{ha/authenticator => storeconfig}/LocalStrings_zh_CN.properties (86%)
copy java/org/apache/catalina/{util/CharsetMapperDefault.properties => valves/rewrite/LocalStrings_zh_CN.properties} (93%)
create mode 100644 java/org/apache/el/util/Jre9Compat.java
create mode 100644 java/org/apache/el/util/JreCompat.java
copy java/org/apache/{catalina/ha/authenticator => tomcat/util/descriptor}/LocalStrings_zh_CN.properties (86%)
copy java/org/apache/tomcat/util/http/parser/{Vary.java => TokenList.java} (57%)
copy java/org/apache/{naming/factory/webservices => tomcat/util/modeler}/LocalStrings.properties (87%)
copy java/org/apache/{naming/factory/webservices => tomcat/util/modeler}/LocalStrings_fr.properties (83%)
copy java/org/apache/{naming/factory/webservices => tomcat/util/modeler}/LocalStrings_ja.properties (84%)
copy java/org/apache/{naming/factory/webservices => tomcat/util/modeler}/LocalStrings_ko.properties (83%)
copy java/org/apache/{catalina/util/CharsetMapperDefault.properties => tomcat/util/modeler/LocalStrings_zh_CN.properties} (93%)
create mode 100644 modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
create mode 100644 test/org/apache/catalina/core/TestAsyncContextStateChanges.java
copy test/org/apache/catalina/webresources/{war/TestHandlerIntegration.java => TestCachedResource.java} (67%)
rename test/org/apache/tomcat/util/http/parser/{TestVary.java => TestTokenList.java} (93%)
copy test/{org/apache/tomcat/util/net/keystore-info.txt => webapp/bug6nnnn/bug69303.txt} (80%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/01: BZ 63681: Introduce RealmBase#authenticate(GSSName,
GSSCredential) and friends
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 a0e8d49197a98b92e28cf30f186f1708658d3159
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Aug 21 23:23:19 2019 +0200
BZ 63681: Introduce RealmBase#authenticate(GSSName, GSSCredential) and friends
---
java/org/apache/catalina/GSSRealm.java | 45 ++++++++++++++++
java/org/apache/catalina/realm/CombinedRealm.java | 43 ++++++++++++++++
java/org/apache/catalina/realm/LockOutRealm.java | 13 +++++
java/org/apache/catalina/realm/RealmBase.java | 62 ++++++++++++++++++-----
webapps/docs/changelog.xml | 4 ++
5 files changed, 155 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/GSSRealm.java b/java/org/apache/catalina/GSSRealm.java
new file mode 100644
index 0000000..9638c2b
--- /dev/null
+++ b/java/org/apache/catalina/GSSRealm.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.apache.catalina;
+
+import java.security.Principal;
+
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSName;
+
+/**
+ * A <b>GSSRealm</b> is a specialized realm for GSS-based usernames.
+ *
+ * @deprecated To be removed in Tomcat 9.0 and integrated into {@link Realm}.
+ */
+@Deprecated
+public interface GSSRealm extends Realm {
+
+
+ // --------------------------------------------------------- Public Methods
+
+ /**
+ * 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);
+
+}
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java
index 59511fa..cd64d99 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -26,12 +26,14 @@ import java.util.List;
import javax.management.ObjectName;
import org.apache.catalina.Container;
+import org.apache.catalina.GSSRealm;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
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 +395,47 @@ public class CombinedRealm extends RealmBase {
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Principal authenticate(GSSName gssName, GSSCredential gssCredential) {
+ Principal authenticatedUser = null;
+ String username = gssName.toString();
+
+ for (Realm realm : realms) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("combinedRealm.authStart",
+ username, realm.getClass().getName()));
+ }
+
+ if (!(realm instanceof GSSRealm)) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("combinedRealm.authFail",
+ username, realm.getClass().getName()));
+ }
+
+ continue;
+ }
+
+ authenticatedUser = ((GSSRealm) realm).authenticate(gssName, gssCredential);
+
+ 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 8bf0691..119c2b6 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,18 @@ public class LockOutRealm extends CombinedRealm {
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Principal authenticate(GSSName gssName, GSSCredential gssCredential) {
+ String username = gssName.toString();
+
+ 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..e5dd5e9 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -38,10 +38,10 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.CredentialHandler;
import org.apache.catalina.Engine;
+import org.apache.catalina.GSSRealm;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
-import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.Service;
import org.apache.catalina.Wrapper;
@@ -71,7 +71,7 @@ import org.ietf.jgss.GSSName;
*
* @author Craig R. McClanahan
*/
-public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
+public abstract class RealmBase extends LifecycleMBeanBase implements GSSRealm {
private static final Log log = LogFactory.getLog(RealmBase.class);
@@ -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.
@@ -1242,6 +1246,11 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
protected abstract Principal getPrincipal(String username);
+ /**
+ * @deprecated This will be removed in Tomcat 10 onwards. Use
+ * {@link #getPrincipal(GSSName, GSSCredential)} instead.
+ */
+ @Deprecated
protected Principal getPrincipal(String username,
GSSCredential gssCredential) {
Principal p = getPrincipal(username);
@@ -1253,6 +1262,35 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm {
return p;
}
+
+ /**
+ * 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 = 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);
+ }
+ }
+
+ 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8452d2e..5c32259 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,10 @@
CSRF nonce request parameter name to be customized.
(schultz)
</add>
+ <add>
+ <bug>63681</bug>: Introduce RealmBase#authenticate(GSSName, GSSCredential)
+ and friends. (michaelo)
+ </add>
<fix>
<bug>63964</bug>: Correct a regression in the static resource caching
changes introduced in 9.0.28. URLs constructed from URLs obtained from
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch BZ-63681/8.5.x updated (6be96eb -> a0e8d49)
Posted by Mark Thomas <ma...@apache.org>.
On 27/11/2019 18:24, Michael Osipov wrote:
> Am 2019-11-27 um 18:05 schrieb Rémy Maucherat:
>> On Wed, Nov 27, 2019 at 11:28 AM <mi...@apache.org> wrote:
>>
>>> 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.
>>>
>>
>> This branch is 100% unnecessary. Please delete it instead of keeping
>> spamming me (and others).
>
> It is not, 8.5.x requires a different implementation of the issue.
I think the point is that a branch in your fork and then a PR is less
noisy than a branch in the main repo for the other committers.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch BZ-63681/8.5.x updated (6be96eb -> a0e8d49)
Posted by Michael Osipov <mi...@apache.org>.
Am 2019-11-27 um 18:05 schrieb Rémy Maucherat:
> On Wed, Nov 27, 2019 at 11:28 AM <mi...@apache.org> wrote:
>
>> 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.
>>
>
> This branch is 100% unnecessary. Please delete it instead of keeping
> spamming me (and others).
It is not, 8.5.x requires a different implementation of the issue.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch BZ-63681/8.5.x updated (6be96eb -> a0e8d49)
Posted by Rémy Maucherat <re...@apache.org>.
On Wed, Nov 27, 2019 at 11:28 AM <mi...@apache.org> wrote:
> 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.
>
This branch is 100% unnecessary. Please delete it instead of keeping
spamming me (and others).
Rémy
>
>
> discard 6be96eb Frist draft
> add ca38cf1 Fix indent
> add 5c1699a Deprecate org.apache.tomcat.util.compat.TLS and move its
> functionality to its only using lass org.apache.tomcat.util.net
> .TesterSupport.
> add 831c6e1 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63753
> WS host header
> add 07f3c37 Fix test failures caused by APR crash during shutdown
> add b7ae3eb Add release date for 8.5.46
> add 6dae407 Revert "Fix test failures caused by APR crash during
> shutdown"
> add 99e5ea8 Add Javadoc for the Common Annotation API
> add 8b7ade1 Correct version number
> add da37f36 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759
> Uninstaller & UAC
> add 4e984dc Polish. Align spacing, remove svn (and cvs!) references
> add c24a6ae Align Java version references
> add c8ddc6f Update link to point to Java 7 javadoc
> add ce4f6b7 Parameterise minimum Java version
> add c9f3362 Fix xml source file that wasn't using expected version
> replacement
> add 39bcbd0 Fix xml source file that wasn't using expected version
> replacement
> add 993e80e BZ63765: Try to unwrap first after handshake
> add 3aba970 Fix test failures with APR/native.
> add 5dda8bf Fix incorrect default value of maxThreads in cluster
> receiver docs.
> add 8c2f067 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63766
> add d817d1e Align with 9.0.x. Spacing, Javadoc
> add 2a26382 Add throwOnFailure to LifecycleBase.
> add 8fc21ef Fix indent
> add 0378b4b Align Javadoc with 9.0.x
> add 30f7e93 Align with 9.0.x. Mostly Javadoc with a little
> refactoring.
> add 1b0c02c Align with 9.0.x. Spacing.
> add d9f4dd4 Align with 9.0.x - spacing
> add 71deb4b Align with 9.0.x - spacing, i18n
> add f3c4438 Align with 9.0.x- spacing, l10n
> add c9fda66 Align with 9.0.x
> add 02bbd57 Align with 9.0.x spacing
> add 845d972 Align with 9.0.x - spacing
> add 8dbabe3 Fix alignment of start-up messages
> add 74cd321 Fix open transaction after validation
> add 98943df Add logging
> add a7e6a5d Add logging
> add 0bcf094 Try and detect bugs like BZ 63778
> add 7c15360 Try and detect bugs like BZ 63778
> add fa8de32 Fix typos
> add cc85b6c Fixes having an issue number are sorted by their number,
> ascending.
> add 7637860 Remove unnecessary @SuppressWarnings
> add 260133b Remove unused code
> add b5d2660 Prep fix for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
> add c110bf8 Update to Commons Daemon 1.2.2
> add 1de02b6 Correct bug number
> add 90e55a9 More prep for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
> add 837eb2e Remove unnecessary code.
> add 7c4361e Use generics and remove a couple of casts
> add 79f5924 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63781
> reported issue
> add 4c12d98 Follow up to BZ 63781 fix. Restore explicit isPublic
> check.
> add eecce7a Additional fix releated to BZ 63781
> add bc9f590 Ensure correct exception type for defineFunction with
> Java 9+
> add aaf50d0 Ensure correct exception with ImportHandler and Java 9+
> add ec7a606 Ensure correct exception with StaticFieldELResolver and
> Java 9+
> add e8b7ec6 Catch <jsp:useBean> module export issues at compile time
> if configured to do so
> add 62a387a Polish. Formatting.
> add 2ae5c4b Polish. Align with 9.0.x. i18n improvements.
> add cc78a85 Also skip interfaces reported via onStartup()
> add 39e22eb Add a module check when processing the scan for server
> endpoints
> add fd7de63 Update changelog
> add 37782c6 Fix NPEs when looking for static methods
> add 434b5dd Increment version ready for next development cycle
> add 9d6e09f Fix typo
> add 4a9f854 Update URL for code signing service.
> add 20c39e9 Use consistent format
> add 7c31429 Expand debugging for async processing
> add 7839aab Add debug logging of read/write interest registration
> add 8db9014 Expand async tests
> add 570e2c8 Fix instance where pipelined data may be missed after an
> async request
> add ee83aed Don't trigger an additional dispatch with async I/O and
> complete
> add 050fb80 Improve debug logging
> add c9a87ee Further align complete()/dispatch() if called during
> async I/O
> add d91f848 asyncStarted should be false once complete/dispatch in
> onTimeout
> add 476c7f7 asyncStarted should be false once complete/dispatch in
> onError
> add a7da104 63765: Properly mark container as FAILED when a JVM
> error occurs on stop # Conflicts: # webapps/docs/changelog.xml
> add b57c622 Add test case for bug 63816
> add bf24a92 Add debug log messages for the triggering of async
> listener events
> add 0495f66 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63816
> async errors
> add 7c0a689 Expand test for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63816
> add eb9ca41 Refactor
> add 29bf1c5 Refactor
> add a6b3d5b Remove an illegal state transition
> add 6e1b6a9 Hack to fix failing test
> add 333ece2 Refactor the unit test to avoid race conditions
> add 57c6917 Fix BZ number
> add 8b2d892 Refactor Vary parser to the more generic TokenList parser
> add 30d46a4 Add a case sensitive / insensitive option to the token
> list parser
> add 8c789b3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63824
> add 9ec7f00 Simplify on the grounds all tokens of interest are
> case-insensitive
> add dcb77df Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63825
> add 6313c29 Remove unused String
> add 0d71dd5 Fix possible NPE with excessive header size
> add 9c7aff6 Update state definitions and associated diagram (now a
> lot simpler)
> add 801fc70 Minor optimisation - add new line to access log message
> outside the sync
> add c77c089 Additional fix for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63825
> add 1ec84d4 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63826
> add d713e8e Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
> add 9054e10 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63829
> add 94682c0 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63830
> add 117f44c Refactor Processor creation
> add 425e0da Complete the fix for 63829. Align CompressionConfig
> usage with 9.0.x
> add 321b2db Align with 9.0.x
> add 6c398f3 Remove unnecessary code.
> add c1c2161 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63865
> add b2a589a Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63831
> add 05664f3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63836
> add 6fac0e0 Update guidance for Eclipse 4.13
> add 08018d3 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63838
> add ab256a5 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63864
> add cf53f8a Remove unnecessary code
> add 80aaff5 Add missing i18n
> add d97f33b Log tweaks
> add 88f097b Correct description of default value of server attribute
> add ce6a3c9 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63872
> symlinked war
> add 6b2bb06 Polish. Improve alignment with 9.0.x/7.0.x
> add c5e531a Remove unused code
> add 31f324a Refactor to align better with 9.0.x
> add f7c8b94 Refactor to (slightly) reduce native calls when using
> OpenSSL
> add 0a986a1 OpenSSLEngine to differentiate between optional and
> optionalNoCA
> add 2d3a570 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63897
> JSP timestamps
> add 2ab75fb Fix a possible race condition
> add 7961a4a Fix credit
> add 7a35c15 Correct entry so it makes sense
> add 7cb3e16 Fix typos
> add ff139be Expand coverage of French translations
> add a327dd7 Remove unnecessary blank line
> add 9cbd837 Back-port Korean updates
> add d4d9942 Expand coverage and quality of Simplified Chinese
> translations
> add 7b841fa Fix PR #211 via POEditor
> add b5e740e Fix typo
> add 7890094 Remove unnecessary code
> add 846ff9a Improve clean-up after an OOME during request processing
> add 2b0aaed Fix JSP compilation showing old content reported on
> users@ list
> add 82cf2d0 Follow on to 2b0aaedd
> add 420c883 Fix logic that meant AJP was not always non-blocking
> between requests
> add a12a166 Polish
> add 98b021b BZ 63905: Clean up Tomcat CSS
> add c0e8462 Fix test fallout of BZ 63905
> add 7a5163b Polish (aligning with 9.0.x/7.0.x)
> add 0ae3dde Convert TestExpireFilter to use the built-in getUrl()
> methods
> add 2522b5a0 Refactor response header handling in unit tests
> add 28c60f1 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63909
> add b0ca786 Use servlet4preview package to access mapping info
> add c351145 Tab police
> add 6c03319 Update the Servlet 4 preview API to reflect the final
> release.
> add 064cca1 Remove unused code
> add cf4f6da Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63913
> Wrap NPEs
> add f13511f Polish. Align with 7.0.x/9.0.x. Use i18n.
> add 5479b5b Polish. Align with 9.0.x/7.0.x
> add 83bae8a Add more charsets to CharsetCache for the HPE JVM on
> HP-UX
> add 8475c0f Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63916
> speed up test
> add 9df8cae Additional fix for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63916
> add f056ef1 Properly calculate dynamic parts of ErrorReportValve
> response for TestHttp2InitialConnection
> add f001c56 Align with 9.0.x, improve i18n
> add 3fe5742 Back-port FindBugs fixes from 9.0.x
> add b46f44c Fix SpotBugs warnings in o.a.catalina
> add fce6e65 Fix SportBugs warnings for Coyote and EL
> add 36291e6 SpotBugs fixes (incomplete) for Jasper
> add 665a6da Fix SpotBug failures in Jasper
> add ee6ad62 Align with 9.0.x
> add 4467e6d Fix SpotBugs failures in JULI and naming
> add 9a95146 Jasper
> add 547f25c Fix some of the SpotBugs warnings in o.a.tomcat
> add 5c4b290 Add 8.5.47 release date
> add 2b2ed21 More SpotBugs fixes
> add a91d7db Refactor JMX remote RMI registry creation
> add 1786045 Remove failonwarning due to internal API use causing a
> javadoc warning
> add 49de92f Fix IDE warnings. Get build working with Java 8 through
> 14
> add 876fe18 Use -XDignore.symbol.file to avoid the proprietary API
> warning
> add 443f5ee Fix SpotBugs warnings. Align with 9.0.x/7.0.x.
> add 065f64c Fix remaining SpotBugs warnings in main code tree
> add 1412fc5 BZ 63835: Add support for Keep-Alive header
> add 56fb7dc Improve changelog entry for BZ 63835
> add b57136d Fix IDE auto-box warnings
> add a86f15c Restore compile.release where it can be done without
> breaking the build
> add b1674e5 Implement feedback on BZ 63835
> add 96cc274 Improve unit test robustness
> add 8c143ab Improve CSRF prevention filter by exposing the request's
> current nonce to the request.
> add 5c56cb7 Increment version number for next dev cycle
> add 27adc25 Fix NPE regression in 6c03319
> add f9d0fb0 Update changelog
> add a3cc1b7 Increment version for next dev cycle
> add 4508e70 Refactor APR Poller to remove use of multiple pollsets
> add 8120030 Remove extra space
> add 16d6a19 Fix broken link.
> add e92da8e Additional debug logging to investigate bug 63859
> add 52c6412 Fix SpotBugs warnings in JDBC pool module
> add 065c5d1 Fix SpotBugs warnings for unit tests
> add c4c1420 Fix SpotBugs issues in JDBC pool tests
> add 85ba8b6 One missed false positive
> add cc2e388 Fix MBean description of keepAliveTimeout
> add 402acdb Correct the docs for maxConnections
> add 6c9bb69 Add logging to CSRF prevention listener.
> add 24edf31 Post-review from kkolonko: fix typo in constant name,
> push initialization down into subclass.
> add 7b55938 Add missing changelog for CSRF prevention filter changes.
> add 856a2e2 Allow customization of the CSRF prevention filter's
> request parameter name.
> add 11ad208 Move initialization of CSRF REST nonce header name
> context attribute into the RestCsrfPreventionFilter where it belongs.
> add 7c9a50c Adjust changelog to reflect which releases actually
> contain which improvements to the CSRF prevention filter.
> add b97eadb Fix test
> add 2c5664d Fix typpo
> add 31ea629 Fix typos
> add f627f8e Port current version of the async API
> add fdf0ba0 Add RFC references.
> add 40aa617 Add release date for 8.5.49
> add dd7019b Fix javadoc @see reference.
> add 55dd280 .gitignore - Add .ant-targets-build.xml file to
> gitignore.
> add 2fedebf Fix potential test failure / hang if timing isn't as
> expected
> add d946928 Revert the fix for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
> add aeec08f Pull down APR specific lock structure
> add 752f17b Partial fix for
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
> add 2072077 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63964
> Cached URLs
> new a0e8d49 BZ 63681: Introduce RealmBase#authenticate(GSSName,
> GSSCredential) and friends
>
> 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 (6be96eb)
> \
> N -- N -- N refs/heads/BZ-63681/8.5.x (a0e8d49)
>
> 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:
> .gitignore | 1 +
> RELEASE-NOTES | 2 +-
> RUNNING.txt | 2 +-
> bin/catalina.sh | 16 +-
> bin/daemon.sh | 66 +-
> bin/tool-wrapper.sh | 8 +-
> build.properties.default | 10 +-
> build.xml | 86 ++-
> java/javax/annotation/Resource.java | 4 +
> java/javax/el/BeanELResolver.java | 36 +-
> java/javax/el/ELProcessor.java | 11 +-
> java/javax/el/ImportHandler.java | 6 +-
> java/javax/el/Jre9Compat.java | 83 +++
> java/javax/el/JreCompat.java | 73 ++
> java/javax/el/LocalStrings.properties | 4 +-
> java/javax/el/LocalStrings_zh_CN.properties | 4 +-
> java/javax/el/StaticFieldELResolver.java | 18 +-
> java/javax/el/Util.java | 95 ++-
> java/javax/servlet/AsyncContext.java | 2 +-
> .../servlet/http/LocalStrings_zh_CN.properties | 1 +
> java/org/apache/catalina/Cluster.java | 3 +-
> java/org/apache/catalina/ContainerEvent.java | 5 +-
> java/org/apache/catalina/Context.java | 6 +-
> .../catalina/{ant/ListTask.java => GSSRealm.java} | 38 +-
> java/org/apache/catalina/Host.java | 4 +-
> java/org/apache/catalina/Pipeline.java | 10 +-
> java/org/apache/catalina/Realm.java | 13 -
> java/org/apache/catalina/Service.java | 2 -
> java/org/apache/catalina/UserDatabase.java | 32 +-
> .../authenticator/LocalStrings_zh_CN.properties | 7 +
> .../jaspic/LocalStrings_zh_CN.properties | 1 +
> .../connector/LocalStrings_zh_CN.properties | 9 +
> java/org/apache/catalina/connector/Request.java | 6 +-
> .../apache/catalina/connector/RequestFacade.java | 6 +-
> .../catalina/connector/mbeans-descriptors.xml | 2 +-
> .../apache/catalina/core/ApplicationContext.java | 4 +-
> .../catalina/core/ApplicationDispatcher.java | 18 +-
> .../catalina/core/ApplicationFilterConfig.java | 2 +-
> .../catalina/core/ApplicationHttpRequest.java | 12 +-
> .../apache/catalina/core/ApplicationMapping.java | 75 +-
> .../org/apache/catalina/core/AsyncContextImpl.java | 12 +
> .../apache/catalina/core/LocalStrings.properties | 16 +
> .../catalina/core/LocalStrings_fr.properties | 12 +
> .../catalina/core/LocalStrings_ja.properties | 12 +
> .../catalina/core/LocalStrings_ko.properties | 12 +
> .../catalina/core/LocalStrings_zh_CN.properties | 32 +
> java/org/apache/catalina/core/StandardHost.java | 54 +-
> .../org/apache/catalina/core/StandardPipeline.java | 22 +-
> java/org/apache/catalina/core/StandardServer.java | 21 +-
> .../apache/catalina/core/StandardWrapperValve.java | 78 +-
> .../catalina/deploy/NamingResourcesImpl.java | 9 +-
> java/org/apache/catalina/filters/Constants.java | 33 +
> .../catalina/filters/CsrfPreventionFilter.java | 89 ++-
> .../org/apache/catalina/filters/ExpiresFilter.java | 60 +-
> .../catalina/filters/LocalStrings_zh_CN.properties | 20 +-
> .../catalina/filters/RestCsrfPreventionFilter.java | 12 +
> java/org/apache/catalina/ha/ClusterListener.java | 10 -
> .../catalina/ha/deploy/FileMessageFactory.java | 50 +-
> .../catalina/ha/deploy/LocalStrings.properties | 6 +
> .../catalina/ha/deploy/LocalStrings_de.properties | 2 +
> .../catalina/ha/deploy/LocalStrings_es.properties | 2 +
> .../catalina/ha/deploy/LocalStrings_fr.properties | 6 +
> .../catalina/ha/deploy/LocalStrings_ja.properties | 6 +
> .../catalina/ha/deploy/LocalStrings_ko.properties | 6 +
> .../ha/deploy/LocalStrings_zh_CN.properties | 5 +
> .../ha/session/LocalStrings_zh_CN.properties | 10 +
> .../apache/catalina/ha/tcp/ReplicationValve.java | 46 +-
> .../catalina/loader/LocalStrings_zh_CN.properties | 5 +
> .../catalina/loader/WebappClassLoaderBase.java | 10 +-
> .../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 | 1 +
> .../catalina/manager/LocalStrings_zh_CN.properties | 1 +
> .../apache/catalina/manager/ManagerServlet.java | 8 +-
> .../catalina/manager/StatusManagerServlet.java | 7 -
> .../manager/host/LocalStrings_zh_CN.properties | 2 +-
> .../catalina/mapper/LocalStrings_zh_CN.properties | 2 +
> java/org/apache/catalina/mapper/MappingData.java | 4 +-
> .../org/apache/catalina/mbeans/ContainerMBean.java | 4 +-
> .../mbeans/JmxRemoteLifecycleListener.java | 102 ++-
> .../catalina/mbeans/LocalStrings_zh_CN.properties | 2 +
> java/org/apache/catalina/mbeans/MBeanFactory.java | 16 +-
> java/org/apache/catalina/realm/CombinedRealm.java | 17 +-
> java/org/apache/catalina/realm/JAASRealm.java | 9 +-
> .../catalina/realm/LocalStrings_zh_CN.properties | 5 +
> java/org/apache/catalina/realm/LockOutRealm.java | 5 +-
> java/org/apache/catalina/realm/RealmBase.java | 25 +-
> .../catalina/security/SecurityClassLoad.java | 6 +-
> .../apache/catalina/security/SecurityConfig.java | 12 +-
> .../catalina/servlet4preview/ServletContext.java | 32 +-
> ...ServletMapping.java => HttpServletMapping.java} | 16 +-
> .../servlet4preview/http/HttpServletRequest.java | 4 +-
> .../http/HttpServletRequestWrapper.java | 14 +-
> .../servlet4preview/http/MappingMatch.java | 3 +-
> .../catalina/servlet4preview/http/PushBuilder.java | 4 +-
> .../apache/catalina/servlets/DefaultServlet.java | 16 +-
> .../servlets/LocalStrings_zh_CN.properties | 2 +
> .../apache/catalina/servlets/WebdavServlet.java | 7 +-
> java/org/apache/catalina/session/FileStore.java | 10 +-
> .../catalina/session/LocalStrings.properties | 2 +
> .../catalina/session/LocalStrings_es.properties | 1 +
> .../catalina/session/LocalStrings_fr.properties | 2 +
> .../catalina/session/LocalStrings_ja.properties | 2 +
> .../catalina/session/LocalStrings_ko.properties | 2 +
> .../catalina/session/LocalStrings_zh_CN.properties | 10 +
> .../apache/catalina/session/StandardManager.java | 7 +-
> java/org/apache/catalina/startup/Bootstrap.java | 104 ++-
> .../org/apache/catalina/startup/ContextConfig.java | 95 ++-
> .../catalina/startup/LocalStrings.properties | 2 +
> .../catalina/startup/LocalStrings_fr.properties | 2 +
> .../catalina/startup/LocalStrings_ja.properties | 2 +
> .../catalina/startup/LocalStrings_ko.properties | 2 +
> .../catalina/startup/LocalStrings_zh_CN.properties | 26 +-
> java/org/apache/catalina/startup/Tomcat.java | 22 +-
> .../catalina/storeconfig/LocalStrings.properties | 3 +
> .../storeconfig/LocalStrings_fr.properties | 3 +
> .../storeconfig/LocalStrings_ja.properties | 3 +
> .../storeconfig/LocalStrings_ko.properties | 3 +
> .../LocalStrings_zh_CN.properties | 3 +-
> .../catalina/storeconfig/StoreFileMover.java | 23 +-
> java/org/apache/catalina/tribes/Member.java | 4 +-
> .../catalina/tribes/group/ChannelCoordinator.java | 1 -
> .../apache/catalina/tribes/group/GroupChannel.java | 8 +-
> .../tribes/group/LocalStrings_zh_CN.properties | 4 +
> .../interceptors/LocalStrings_zh_CN.properties | 4 +
> .../group/interceptors/TcpPingInterceptor.java | 4 +-
> .../group/interceptors/ThroughputInterceptor.java | 14 +-
> .../org/apache/catalina/tribes/io/ChannelData.java | 21 +-
> .../org/apache/catalina/tribes/io/XByteBuffer.java | 6 +-
> .../membership/LocalStrings_zh_CN.properties | 11 +-
> .../tribes/membership/McastServiceImpl.java | 2 +-
> .../catalina/tribes/membership/Membership.java | 23 +-
> .../tribes/tipis/AbstractReplicatedMap.java | 16 +-
> .../catalina/tribes/tipis/LazyReplicatedMap.java | 16 +-
> .../catalina/tribes/tipis/LocalStrings.properties | 6 +-
> .../tribes/tipis/LocalStrings_zh_CN.properties | 5 +
> .../catalina/tribes/tipis/ReplicatedMap.java | 25 +-
> .../catalina/tribes/transport/AbstractRxTask.java | 4 +-
> .../catalina/tribes/transport/PooledSender.java | 8 +-
> .../catalina/tribes/transport/ReceiverBase.java | 10 +-
> .../catalina/tribes/transport/RxTaskPool.java | 8 +-
> .../transport/bio/LocalStrings_zh_CN.properties | 4 +
> .../tribes/transport/bio/MultipointBioSender.java | 16 +-
> .../transport/nio/LocalStrings_zh_CN.properties | 5 +
> .../tribes/transport/nio/ParallelNioSender.java | 16 +-
> .../catalina/tribes/util/ExecutorFactory.java | 2 +-
> .../tribes/util/LocalStrings_zh_CN.properties | 1 +
> java/org/apache/catalina/util/LifecycleBase.java | 102 ++-
> .../catalina/util/LocalStrings_zh_CN.properties | 6 +
> java/org/apache/catalina/util/TomcatCSS.java | 16 +-
> .../org/apache/catalina/valves/AccessLogValve.java | 2 +-
> .../catalina/valves/LocalStrings_zh_CN.properties | 15 +
> .../rewrite/LocalStrings_zh_CN.properties} | 3 +-
> .../catalina/webresources/CachedResource.java | 136 +++-
> .../catalina/webresources/LocalStrings.properties | 2 +
> .../webresources/LocalStrings_zh_CN.properties | 7 +
> .../apache/catalina/webresources/StandardRoot.java | 2 +-
> java/org/apache/coyote/AbstractProcessor.java | 33 +-
> java/org/apache/coyote/AbstractProcessorLight.java | 30 +-
> java/org/apache/coyote/AbstractProtocol.java | 28 +-
> java/org/apache/coyote/AsyncStateMachine.java | 282 ++++---
> java/org/apache/coyote/CompressionConfig.java | 28 +-
> java/org/apache/coyote/LocalStrings.properties | 6 +-
> java/org/apache/coyote/LocalStrings_fr.properties | 1 -
> java/org/apache/coyote/LocalStrings_ja.properties | 1 -
> java/org/apache/coyote/LocalStrings_ko.properties | 1 -
> .../apache/coyote/LocalStrings_zh_CN.properties | 3 +
> java/org/apache/coyote/ajp/AjpProcessor.java | 14 +-
> .../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
> .../coyote/http11/AbstractHttp11Protocol.java | 32 +-
> java/org/apache/coyote/http11/Constants.java | 14 +
> java/org/apache/coyote/http11/Http11Processor.java | 419 +++--------
> .../coyote/http11/LocalStrings_zh_CN.properties | 5 +
> .../http11/filters/LocalStrings_zh_CN.properties | 1 +
> .../http11/upgrade/LocalStrings_zh_CN.properties | 4 +
> .../apache/coyote/http2/Http2UpgradeHandler.java | 12 -
> .../coyote/http2/LocalStrings_zh_CN.properties | 17 +
> java/org/apache/el/util/Jre9Compat.java | 58 ++
> java/org/apache/el/util/JreCompat.java | 60 ++
> java/org/apache/el/util/ReflectionUtil.java | 41 +-
> java/org/apache/jasper/JspCompilationContext.java | 4 +-
> java/org/apache/jasper/compiler/AntCompiler.java | 5 +-
> java/org/apache/jasper/compiler/Compiler.java | 14 +-
> java/org/apache/jasper/compiler/Generator.java | 19 +-
> java/org/apache/jasper/compiler/JDTCompiler.java | 5 +-
> .../apache/jasper/compiler/JspRuntimeContext.java | 5 +-
> .../apache/jasper/compiler/TagFileProcessor.java | 2 +-
> java/org/apache/jasper/el/JasperELResolver.java | 18 +-
> .../jasper/resources/LocalStrings.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 | 31 +-
> .../apache/jasper/runtime/JspRuntimeLibrary.java | 2 +-
> .../apache/jasper/servlet/JspServletWrapper.java | 4 +-
> java/org/apache/juli/logging/LogFactory.java | 4 +-
> .../apache/naming/LocalStrings_zh_CN.properties | 4 +
> .../naming/factory/LocalStrings_zh_CN.properties | 5 +
> java/org/apache/tomcat/buildutil/SignCode.java | 8 +-
> .../apache/tomcat/buildutil/translate/Utils.java | 6 +-
> .../tomcat/util/LocalStrings_zh_CN.properties | 1 +
> java/org/apache/tomcat/util/buf/CharChunk.java | 4 +-
> java/org/apache/tomcat/util/buf/CharsetCache.java | 4 +-
> .../apache/tomcat/util/buf/LocalStrings.properties | 2 +
> .../tomcat/util/buf/LocalStrings_zh_CN.properties | 5 +
> java/org/apache/tomcat/util/buf/MessageBytes.java | 2 +-
> java/org/apache/tomcat/util/buf/UDecoder.java | 5 +-
> java/org/apache/tomcat/util/buf/package.html | 2 +-
> java/org/apache/tomcat/util/compat/Jre8Compat.java | 25 +-
> java/org/apache/tomcat/util/compat/Jre9Compat.java | 52 +-
> java/org/apache/tomcat/util/compat/JreCompat.java | 32 +-
> .../tomcat/util/compat/LocalStrings.properties | 5 +
> .../tomcat/util/compat/LocalStrings_fr.properties | 2 +
> .../tomcat/util/compat/LocalStrings_ko.properties | 2 +
> .../util/compat/LocalStrings_zh_CN.properties | 2 +
> java/org/apache/tomcat/util/compat/TLS.java | 3 +
> .../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
> .../descriptor/web/LocalStrings_zh_CN.properties | 10 +
> .../tomcat/util/http/CookieProcessorBase.java | 2 +-
> .../tomcat/util/http/LegacyCookieProcessor.java | 2 +-
> .../tomcat/util/http/LocalStrings.properties | 2 +-
> .../tomcat/util/http/LocalStrings_zh_CN.properties | 5 +
> java/org/apache/tomcat/util/http/ResponseUtil.java | 4 +-
> .../tomcat/util/http/Rfc6265CookieProcessor.java | 2 +-
> .../apache/tomcat/util/http/SameSiteCookies.java | 7 +-
> .../apache/tomcat/util/http/parser/HttpParser.java | 2 +-
> .../util/http/parser/LocalStrings.properties | 2 +-
> .../util/http/parser/LocalStrings_zh_CN.properties | 3 +
> .../util/http/parser/{Vary.java => TokenList.java} | 39 +-
> java/org/apache/tomcat/util/http/parser/Vary.java | 34 +-
> .../util/modeler}/LocalStrings.properties | 3 +-
> .../util/modeler}/LocalStrings_fr.properties | 3 +-
> .../util/modeler}/LocalStrings_ja.properties | 3 +-
> .../util/modeler}/LocalStrings_ko.properties | 3 +-
> .../util/modeler/LocalStrings_zh_CN.properties} | 3 +-
> java/org/apache/tomcat/util/modeler/Registry.java | 476 ++++++------
> .../modules/MbeansDescriptorsDigesterSource.java | 4 +-
> .../MbeansDescriptorsIntrospectionSource.java | 120 +--
> .../tomcat/util/modeler/modules/ModelerSource.java | 2 +
> .../tomcat/util/net/AbstractJsseEndpoint.java | 35 +-
> java/org/apache/tomcat/util/net/AprEndpoint.java | 553 +++++++-------
> .../apache/tomcat/util/net/LocalStrings.properties | 2 +
> .../tomcat/util/net/LocalStrings_zh_CN.properties | 19 +-
> java/org/apache/tomcat/util/net/Nio2Endpoint.java | 317 +++-----
> .../tomcat/util/net/NioBlockingSelector.java | 4 +-
> java/org/apache/tomcat/util/net/NioChannel.java | 27 +-
> java/org/apache/tomcat/util/net/NioEndpoint.java | 115 +++
> .../apache/tomcat/util/net/SecureNio2Channel.java | 3 +-
> .../apache/tomcat/util/net/SecureNioChannel.java | 145 ++++
> .../apache/tomcat/util/net/SocketWrapperBase.java | 359 ++++++++-
> .../util/net/jsse/LocalStrings_zh_CN.properties | 1 +
> .../util/net/openssl/LocalStrings_zh_CN.properties | 4 +
> .../tomcat/util/net/openssl/OpenSSLContext.java | 5 +-
> .../tomcat/util/net/openssl/OpenSSLEngine.java | 37 +-
> .../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
> java/org/apache/tomcat/util/threads/TaskQueue.java | 6 +-
> .../tomcat/websocket/LocalStrings.properties | 1 +
> .../tomcat/websocket/LocalStrings_zh_CN.properties | 17 +
> .../apache/tomcat/websocket/PerMessageDeflate.java | 37 +-
> .../apache/tomcat/websocket/Transformation.java | 5 +-
> .../tomcat/websocket/WsRemoteEndpointImplBase.java | 7 +-
> .../tomcat/websocket/WsWebSocketContainer.java | 7 +-
> .../websocket/pojo/LocalStrings_zh_CN.properties | 6 +
> .../websocket/server/LocalStrings_zh_CN.properties | 6 +
> .../server/WsRemoteEndpointImplServer.java | 4 -
> java/org/apache/tomcat/websocket/server/WsSci.java | 10 +-
> .../apache/tomcat/jdbc/pool/ConnectionPool.java | 5 +-
> .../apache/tomcat/jdbc/pool/PoolProperties.java | 2 +-
> .../apache/tomcat/jdbc/pool/PooledConnection.java | 54 +-
> .../jdbc/pool/interceptor/StatementCache.java | 3 +-
> .../interceptor/StatementDecoratorInterceptor.java | 2 +-
> .../java/org/apache/tomcat/jdbc/bugs/Bug53367.java | 6 +-
> .../apache/tomcat/jdbc/test/ConnectCountTest.java | 4 +-
> .../org/apache/tomcat/jdbc/test/FairnessTest.java | 4 +-
> .../apache/tomcat/jdbc/test/JmxPasswordTest.java | 2 +-
> .../apache/tomcat/jdbc/test/MultipleCloseTest.java | 4 +-
> .../apache/tomcat/jdbc/test/StarvationTest.java | 2 +
> .../org/apache/tomcat/jdbc/test/TestException.java | 12 +-
> .../tomcat/jdbc/test/TestStatementCache.java | 2 +
> .../org/apache/tomcat/jdbc/test/TestTimeout.java | 26 +-
> .../apache/tomcat/jdbc/test/TestValidation.java | 650 ++++++++++++++++
> .../jdbc/test/TestValidationQueryTimeout.java | 16 +-
> res/checkstyle/org-import-control.xml | 1 +
> res/findbugs/filter-false-positives.xml | 830
> ++++++++++++++++++++-
> .../eclipse/java-compiler-errors-warnings.txt | 6 +-
> res/maven/mvn.properties.default | 2 +-
> res/tomcat.nsi | 39 +-
> res/welcome.bin.html | 2 +-
> res/welcome.main.html | 2 +-
> test/javax/servlet/http/TestHttpServlet.java | 7 +-
> .../TesterDigestAuthenticatorPerformance.java | 2 +-
> .../connector/TestCoyoteAdapterRequestFuzzing.java | 17 +
> .../apache/catalina/connector/TestResponse.java | 4 +-
> .../apache/catalina/connector/TestSendFile.java | 2 +-
> ...estApplicationContextGetRequestDispatcherB.java | 10 +-
> .../catalina/core/TestApplicationMapping.java | 12 +-
> .../apache/catalina/core/TestAsyncContextImpl.java | 405 +++++++++-
> .../core/TestAsyncContextStateChanges.java | 378 ++++++++++
> .../catalina/filters/TestAddCharSetFilter.java | 4 +-
> .../catalina/filters/TestCsrfPreventionFilter.java | 2 +-
> .../apache/catalina/filters/TestExpiresFilter.java | 110 ++-
> ...TestWebappClassLoaderThreadLocalMemoryLeak.java | 5 +-
> .../apache/catalina/mapper/TestMapperWebapps.java | 16 +-
> .../catalina/nonblocking/TestNonBlockingAPI.java | 47 +-
> .../servlets/DefaultServletEncodingBaseTest.java | 6 +-
> .../apache/catalina/startup/SimpleHttpClient.java | 11 +-
> .../apache/catalina/startup/TomcatBaseTest.java | 32 +-
> .../tribes/test/transport/SocketNioReceive.java | 8 +-
> .../valves/TestLoadBalancerDrainingValve.java | 6 +-
> ...lerIntegration.java => TestCachedResource.java} | 30 +-
> test/org/apache/coyote/TestResponse.java | 75 +-
> .../apache/coyote/http11/TestHttp11Processor.java | 162 +++-
> .../http11/filters/TestChunkedInputFilter.java | 1 +
> .../apache/coyote/http11/upgrade/TestUpgrade.java | 9 +-
> .../http11/upgrade/TestUpgradeInternalHandler.java | 7 +-
> test/org/apache/coyote/http2/Http2TestBase.java | 2 +-
> test/org/apache/coyote/http2/TestAsync.java | 7 +-
> .../coyote/http2/TestHttp2InitialConnection.java | 30 +-
> test/org/apache/coyote/http2/TestHttp2Limits.java | 20 +-
> test/org/apache/jasper/TestJspC.java | 2 +-
> .../apache/jasper/TestJspCompilationContext.java | 3 +-
> test/org/apache/jasper/compiler/TestCompiler.java | 6 +-
> test/org/apache/jasper/compiler/TestGenerator.java | 8 +-
> test/org/apache/jasper/compiler/TestParser.java | 30 +-
> .../compiler/TestParserNoStrictWhitespace.java | 9 +-
> .../org/apache/jasper/el/TestJasperELResolver.java | 3 +-
> test/org/apache/jasper/servlet/TestTldScanner.java | 3 +-
> test/org/apache/juli/TestFileHandler.java | 13 +-
> .../util/http/TestCookieProcessorGeneration.java | 20 +-
> .../tomcat/util/http/TestSameSiteCookies.java | 19 +
> .../parser/{TestVary.java => TestTokenList.java} | 9 +-
> test/org/apache/tomcat/util/net/TesterSupport.java | 17 +-
> .../tomcat/websocket/TestPerMessageDeflate.java | 2 +-
> .../bug6nnnn/bug69303.txt} | 12 +-
> webapps/docs/appdev/installation.xml | 2 +-
> webapps/docs/appdev/processes.xml | 4 +-
> webapps/docs/changelog.xml | 400 +++++++++-
> webapps/docs/cluster-howto.xml | 2 +-
> webapps/docs/config/ajp.xml | 7 +-
> webapps/docs/config/cluster-receiver.xml | 2 +-
> webapps/docs/config/cookie-processor.xml | 10 +-
> webapps/docs/config/http.xml | 15 +-
> webapps/docs/config/valve.xml | 2 +-
> webapps/docs/default-servlet.xml | 116 +--
> webapps/docs/logging.xml | 4 +-
> webapps/docs/project.xml | 4 +-
> webapps/docs/security-howto.xml | 5 +-
> webapps/docs/setup.xml | 4 +-
> webapps/docs/tomcat-docs.xsl | 4 +
> .../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
> webapps/examples/jsp/security/protected/error.jsp | 4 +-
> 353 files changed, 7525 insertions(+), 2804 deletions(-)
> create mode 100644 java/javax/el/Jre9Compat.java
> create mode 100644 java/javax/el/JreCompat.java
> copy java/org/apache/catalina/{ant/ListTask.java => GSSRealm.java} (56%)
> rename java/org/apache/catalina/servlet4preview/http/{ServletMapping.java
> => HttpServletMapping.java} (89%)
> copy java/org/apache/catalina/{ha/authenticator =>
> storeconfig}/LocalStrings_zh_CN.properties (86%)
> copy java/org/apache/catalina/{util/CharsetMapperDefault.properties =>
> valves/rewrite/LocalStrings_zh_CN.properties} (93%)
> create mode 100644 java/org/apache/el/util/Jre9Compat.java
> create mode 100644 java/org/apache/el/util/JreCompat.java
> copy java/org/apache/{catalina/ha/authenticator =>
> tomcat/util/descriptor}/LocalStrings_zh_CN.properties (86%)
> copy java/org/apache/tomcat/util/http/parser/{Vary.java =>
> TokenList.java} (57%)
> copy java/org/apache/{naming/factory/webservices =>
> tomcat/util/modeler}/LocalStrings.properties (87%)
> copy java/org/apache/{naming/factory/webservices =>
> tomcat/util/modeler}/LocalStrings_fr.properties (83%)
> copy java/org/apache/{naming/factory/webservices =>
> tomcat/util/modeler}/LocalStrings_ja.properties (84%)
> copy java/org/apache/{naming/factory/webservices =>
> tomcat/util/modeler}/LocalStrings_ko.properties (83%)
> copy java/org/apache/{catalina/util/CharsetMapperDefault.properties =>
> tomcat/util/modeler/LocalStrings_zh_CN.properties} (93%)
> create mode 100644
> modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java
> create mode 100644
> test/org/apache/catalina/core/TestAsyncContextStateChanges.java
> copy
> test/org/apache/catalina/webresources/{war/TestHandlerIntegration.java =>
> TestCachedResource.java} (67%)
> rename test/org/apache/tomcat/util/http/parser/{TestVary.java =>
> TestTokenList.java} (93%)
> copy test/{org/apache/tomcat/util/net/keystore-info.txt =>
> webapp/bug6nnnn/bug69303.txt} (80%)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>