Re: [Git migration] trunk or master
Hi, 2018-01-09 9:06 GMT+02:00 Martin Grigorov : > > Hi, > > On Jan 8, 2018 15:33, "Mark Thomas" wrote: > > This is the third of the per issue e-mails to discuss the issues > associated with migrating from svn to git. > > The standard name for the main branch where development takes place in > svn is 'trunk'. In git the standard name is 'master'. > > We can use either of these going forwards. Or something completely > different. > > We need to pick a name. > > Thoughts? > > > Here is another suggestion: > each branch is named after the version of Tomcat it is for. > For example : 7.x, 8.x, 8.5.x, 9.x, etc. +1 > Tomcat supports several versions and this approach makes it very clear > which branch for which version is. > Also this way all branch names are consistent. > > If it just between trunk and master then I vote for master. +1 Regards, Violeta > > Regards, > Martin > > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Git migration] trunk or master
Hi, On Jan 8, 2018 15:33, "Mark Thomas" wrote: This is the third of the per issue e-mails to discuss the issues associated with migrating from svn to git. The standard name for the main branch where development takes place in svn is 'trunk'. In git the standard name is 'master'. We can use either of these going forwards. Or something completely different. We need to pick a name. Thoughts? Here is another suggestion: each branch is named after the version of Tomcat it is for. For example : 7.x, 8.x, 8.5.x, 9.x, etc. Tomcat supports several versions and this approach makes it very clear which branch for which version is. Also this way all branch names are consistent. If it just between trunk and master then I vote for master. Regards, Martin Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 11 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 21 mins 31 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180109/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerform ance=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util-scan.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/li
[Bug 61977] New: JNDIRealm with SPNEGO, GSSAPI and SRV record fails to find LDAP SPN due to training sname period
https://bz.apache.org/bugzilla/show_bug.cgi?id=61977 Bug ID: 61977 Summary: JNDIRealm with SPNEGO, GSSAPI and SRV record fails to find LDAP SPN due to training sname period Product: Tomcat 8 Version: 8.5.20 Hardware: PC Status: NEW Severity: blocker Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: marian.romasc...@nuance.com Target Milestone: SPNEGO and JNDIRealm are integrated in catalina core library. The web application is using Kerberos SSO using SPNEGO and JNDIRealm. The application requires using hostname-independent LDAP URLs in the JNDIRealm configuration. This is done (e.g.) using a construct based on SRV records similar to the following domain-based construct: ldap:///dc=testdomain,dc=example,dc=org"; ... The ldap:///dc=testdomain,dc=example,dc=org construct is internally resolved into a query against a SRV record exposed by the DNS server (AD in this case): _ldap._tcp.testdomain.example.org This is visible in the wireshark trace of the transaction and in the logs. The query return several valid hostnames corresponding to one of several Domain Controllers and Tomcat JNDIREalm would chose one, e.g.: dc1.testdomain.example.org IN A 1.2.3.4 In the DNS However when the JNDIREalm logic tries first to get a Kerberos ticket for the GSSAPI/SASL protocol, it issues a TGS-REQ containing the DNS-returned hostname plus a trailing dot as illustrated below in a trace excerpt. tgs-req ... sname-string: 2 items SNameString: ldap SNameString: dc1.testdomain.example.org. As a result the LDAP SPN is not found (KDC_ERR_PRINCIPAL_UNKNOWN) - the SPN defined in AD is ldap/dc1.testdomain.example.org w/o the trailing dot. The issue is reported as originating in a JDK core library: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8149521 However the issue is being marked as resolved in JDK 8u152 - however fixed not in the JNDI "servicelocator" but apparently at the Kerberos level - the krb5 component in the Java core runtime library, which is not being used by Catalina. Tests with Tomcat 8.20 and JRE 8u152 show the issue is still there. There is a need for a bug fix in the catalina JNDIRealm for stripping the trailing dot, if any, before attempting the LDAP SPN resolution. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Git Migration] Review board
On 08/01/18 16:14, Christopher Schultz wrote: > Mark, > > On 1/4/18 5:29 AM, Mark Thomas wrote: >> Happy New Year all! > >> This is the first of the per issue e-mails to discuss the issues >> associated with migrating from svn to git. > >> Some years ago we looked at using review board. It didn't really >> gain traction. It is currently configured to use svn. > >> Rather than migrate Review Board for Tomcat to git, the proposal is >> to remove Tomcat from Review Board completely. This is something we >> can (and probably should) do regardless of the git migration. > > The Tomcat what-now? I think it was Tomcat trunk but I haven't looked at it for years. >> Given the lack of use, I intend to work with infra to remove Tomcat >> from Review Board in 72 hours unless there are objections and/or >> alternative proposals. > > Given that I've never heard of this, I'm sure I won't miss it if it's > gone and/or replaced with something else. The replacement is comments on PRs. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Git Migration] Review board
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 1/4/18 5:29 AM, Mark Thomas wrote: > Happy New Year all! > > This is the first of the per issue e-mails to discuss the issues > associated with migrating from svn to git. > > Some years ago we looked at using review board. It didn't really > gain traction. It is currently configured to use svn. > > Rather than migrate Review Board for Tomcat to git, the proposal is > to remove Tomcat from Review Board completely. This is something we > can (and probably should) do regardless of the git migration. The Tomcat what-now? > Given the lack of use, I intend to work with infra to remove Tomcat > from Review Board in 72 hours unless there are objections and/or > alternative proposals. Given that I've never heard of this, I'm sure I won't miss it if it's gone and/or replaced with something else. - -chris -BEGIN PGP SIGNATURE- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQJRBAEBCAA7FiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlpTmPYdHGNocmlzQGNo cmlzdG9waGVyc2NodWx0ei5uZXQACgkQHPApP6U8pFhvig/9FJ3Habc0MrBQjj2c 0jwm+XxEIJny069jFPcrtm0TmA9T4qX7rvLMru2wl5BuQO+XNiRDT3eUkhe6jE7D UIKqROFOFl7uaT1hxRoh/lR7aQAuaUT+u95z2deT4vFDrjYAp4jvLFmxUTRfYXmg ylUplPCTUyFc3q3RbDobPFqv0IcwiTeKB5+IzpMSC08+d5dvxMYcjIPRy6faQBRs WP0cCnDqOn9JNw9F3jkh2cXsa3G6XT2F8o5Pe5cKFj7vX2W8/kWzDENxYIJr5rvd dbr12GV7R0r4Z96V0UVVBMOtyox4CmNtDJ6EjAswARnZ8LZ4vR8x7/xQmefAO2wb ehiTMCc0BhGpTLddW8GbTzbx09iD3uw5FhkOi06eKwRuzvYESgBm81pQ627Zp3bY BR7aSrx2heA8kxdzv80HKiC4G1toioW1cR99ch3HaY0uwiEhfILpT5y5dCp1twpD nCxBPwkdbaY9ZfZjAeg/mph+B0k5qJ4mz+Qm7eardf/4U+FQPbjdstyCG3S3xf9g XzTgNvtUxmzVlB4RxW0qr/q4ud+7osjNcuK7YVHxJ1CfEAgUHF3prMS6G/CNyxrg ikvuFuRMrVXa5hRZ8+yCXxtyXP49KpoP5EGeLgm31n0R/AOooVv+NzgUv/x8nQDr A1Qb3c7TGyfxc+58k3DQgszcmWg= =+y70 -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1820576 - in /tomcat/trunk: java/org/apache/catalina/servlets/WebdavServlet.java webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 8 15:52:15 2018
New Revision: 1820576
URL: http://svn.apache.org/viewvc?rev=1820576&view=rev
Log:
When using WebDAV to copy a file resource to a destination that requires a
collection to be overwritten, ensure that the operation succeeds rather than
fails (with a 500 response). This enables Tomcat to pass two additional tests
from the Litmus WebDAV test suite.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1820576&r1=1820575&r2=1820576&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Mon Jan
8 15:52:15 2018
@@ -1742,19 +1742,23 @@ public class WebdavServlet extends Defau
}
}
}
+// WebDAV Litmus test attempts to copy/move a file over a
collection
+// Need to remove trailing / from destination to enable test to
pass
+if (!destResource.exists() && dest.endsWith("/") && dest.length()
> 1) {
+// Convert destination name from collection (with trailing '/')
+// to file (without trailing '/')
+dest = dest.substring(0, dest.length() - 1);
+}
try (InputStream is = sourceResource.getInputStream()) {
-if (!resources.write(dest, is,
-false)) {
-errorList.put(source,
-
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+if (!resources.write(dest, is, false)) {
+errorList.put(source,
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return false;
}
} catch (IOException e) {
log(sm.getString("webdavservlet.inputstreamclosefail",
source), e);
}
} else {
-errorList.put(source,
-Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+errorList.put(source,
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return false;
}
return true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1820576&r1=1820575&r2=1820576&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 8 15:52:15 2018
@@ -67,6 +67,12 @@
setHeader() or addHeader() as well as when it
is set via setContentType(). (markt)
+
+When using WebDAV to copy a file resource to a destination that
requires
+a collection to be overwritten, ensure that the operation succeeds
+rather than fails (with a 500 response). This enables Tomcat to pass
two
+additional tests from the Litmus WebDAV test suite. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #96: Remove PUT and DELETE methods from an OPTIONS request if r...
Github user ChristopherSchultz commented on the issue: https://github.com/apache/tomcat/pull/96 WRT WebDav, [RFC2618](https://tools.ietf.org/html/rfc2518) says that WebDav is an extension to HTTP/1.1 so I think we are always okay using 405 from `WebDavServlet`. We should, however, take care to adhere to the spec as much as possible, so we should e.g. include an `Allow` header in the response. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61886] 7.0.83 Calling [asyncComplete()] is not valid for a request with Async state [MUST_COMPLETE]
https://bz.apache.org/bugzilla/show_bug.cgi?id=61886 --- Comment #9 from Konstantin Kolinko --- (In reply to Konstantin Kolinko from comment #8) > Testing current Tomcat 8.5-dev @r1820546 That ConcurrentModificationException was when running with Java 7u80. With Java 8u152 it also occurs. Line numbers are a bit different, java.util.ConcurrentModificationException at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:909) at java.util.ArrayList$Itr.next(ArrayList.java:859) at async.Stockticker.run(Stockticker.java:83) at java.lang.Thread.run(Thread.java:748) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Git migration] trunk or master
I think the standard name for the main branch where development takes place in git is 'develop'. Master contains the last released version and is used to branch from for patches etc. At least with branch-based development models like gitflow or githubflow. regards Leon On Mon, Jan 8, 2018 at 9:33 AM, Mark Thomas wrote: > This is the third of the per issue e-mails to discuss the issues > associated with migrating from svn to git. > > The standard name for the main branch where development takes place in > svn is 'trunk'. In git the standard name is 'master'. > > We can use either of these going forwards. Or something completely > different. > > We need to pick a name. > > Thoughts? > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Git migration] trunk or master
This is the third of the per issue e-mails to discuss the issues associated with migrating from svn to git. The standard name for the main branch where development takes place in svn is 'trunk'. In git the standard name is 'master'. We can use either of these going forwards. Or something completely different. We need to pick a name. Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #96: Remove PUT and DELETE methods from an OPTIONS request if r...
Github user markt-asf commented on the issue: https://github.com/apache/tomcat/pull/96 No argument with Konstantin's points here. I started to look at implementing this and I realised that the WebDAV is inconsistent with how the allow header is generated. A method may not be included in the allow header but will not generate a 405 if that method is used for the same resource. That seems wrong to me. Before I start changing this, I'm going to put together a simple test case to check it and dig out the WebDAV test suite we have used in the past to make sure my changes don't break anything. This is probably going to delay the tag by a day or so. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61886] 7.0.83 Calling [asyncComplete()] is not valid for a request with Async state [MUST_COMPLETE]
https://bz.apache.org/bugzilla/show_bug.cgi?id=61886 --- Comment #8 from Konstantin Kolinko --- Testing current Tomcat 8.5-dev @r1820546 A ConcurrentModificationException is printed on the console, but not in the logs. Nothing interesting in the logs. Not attaching them here. 08-Jan-2018 17:08:49.566 INFO [http-nio-8080-exec-1] async.AsyncStockServlet. AsyncStockServlet created java.util.ConcurrentModificationException at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:859) at java.util.ArrayList$Itr.next(ArrayList.java:831) at async.Stockticker.run(Stockticker.java:83) at java.lang.Thread.run(Thread.java:745) java.util.ConcurrentModificationException at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:859) at java.util.ArrayList$Itr.next(ArrayList.java:831) at async.Stockticker.run(Stockticker.java:83) at java.lang.Thread.run(Thread.java:745) java.util.ConcurrentModificationException at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:859) at java.util.ArrayList$Itr.next(ArrayList.java:831) at async.Stockticker.run(Stockticker.java:83) at java.lang.Thread.run(Thread.java:745) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61886] 7.0.83 Calling [asyncComplete()] is not valid for a request with Async state [MUST_COMPLETE]
https://bz.apache.org/bugzilla/show_bug.cgi?id=61886 --- Comment #7 from Konstantin Kolinko --- Created attachment 35659 --> https://bz.apache.org/bugzilla/attachment.cgi?id=35659&action=edit catalina.2018-01-08.log.txt Testing current Tomcat 9.0-dev @r1820558. Generally - OK. A NullPointerException when stopping Tomcat, in AsyncContextImpl.fireOnComplete(AsyncContextImpl.java:116) I am attaching the log file here. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #96: Remove PUT and DELETE methods from an OPTIONS request if r...
Github user kkolinko commented on the issue: https://github.com/apache/tomcat/pull/96 1) POST fallsback to GET, I think since RFC1945 (HTTP/1.0). Both HEAD and POST were improvements over single GET method supported by original HTTP protocol (0.9). 2) DefaultServlet can be used as a target of RequestDispatcher.forward(), and such forward does not change the request method. As such, I think that the behaviour of DefaultServlet.doPost() must not be changed. I am OK to change 403 to 405 as response code in DefaultServlet.doPut(), doDelete(). It seems reasonable. Though: 1) The code 405 is since HTTP/1.1, does not exist in HTTP/1.0 2) You are correct, that when a server uses code 405 it MUST generate an "Allow" header as well (RFC 7231). There are some other places where SC_METHOD_NOT_ALLOWED code is used and no "Allow" header is generated. 3) This changes behaviour of WebdavServlet. For a readOnly WebdavServlet it is reasonable to return 403. Though 405 is OK as well. 4) WebdavServlet has method determineMethodsAllowed(). It should be updated accordingly. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat issue #96: Remove PUT and DELETE methods from an OPTIONS request if r...
Github user markt-asf commented on the issue: https://github.com/apache/tomcat/pull/96 Lack of response == lazy consensus. I plan to look at applying these patches (or possibly a variation of them) before tagging 9.0.x. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1820552 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ java/org/apache/tomcat/util/net/openssl/ we
Author: markt Date: Mon Jan 8 11:44:24 2018 New Revision: 1820552 URL: http://svn.apache.org/viewvc?rev=1820552&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61566 Expose the currently in use certificate chain and list of trusted certificates for all virtual hosts configured using the JSSE style (keystore) TLS configuration via the Manager web application. Added: tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/connectorCerts.jsp - copied, changed from r1817997, tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCerts.jsp tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp - copied unchanged from r1817999, tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLContext.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/manager-howto.xml tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 8 11:44:24 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578
svn commit: r1820551 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java
Author: markt Date: Mon Jan 8 11:31:12 2018 New Revision: 1820551 URL: http://svn.apache.org/viewvc?rev=1820551&view=rev Log: Refactor the OpenSSLContext implementation so that a reference is retained to the instance while a request that is using it is in progress. This allows destruction to be safely triggered by finalize() Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 8 11:31:12 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,
[Bug 47214] Inner classes that are explicitly referenced - should not be anonymous
https://bz.apache.org/bugzilla/show_bug.cgi?id=47214 Konstantin Kolinko changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #10 from Konstantin Kolinko --- (In reply to Konstantin Kolinko from comment #7) > Reassigning to Tomcat 8 to track forward-porting of r1817901. + r1820543 Applied to Tomcat 8.5 in r1820546 Applied to Tomcat 8.0 in r1820550 SecurityClassLoad classes in Tomcat 9.0 do not load any anonymous inner classes. Thus there is no need for this fix in Tomcat 9. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1820550 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/security/SecurityClassLoad.java java/org/apache/jasper/security/SecurityClassLoad.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon Jan 8 11:00:17 2018
New Revision: 1820550
URL: http://svn.apache.org/viewvc?rev=1820550&view=rev
Log:
Use a loop to preload anonymous inner classes, to be safe for future changes in
the code or using a different compiler..
https://bz.apache.org/bugzilla/show_bug.cgi?id=47214
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1820550&r1=1820549&r2=1820550&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon Jan 8 11:00:17 2018
@@ -53,17 +53,15 @@ public final class SecurityClassLoad {
private static final void loadCorePackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.core.";
loader.loadClass(basePackage + "AccessLogAdapter");
-loader.loadClass(basePackage + "ApplicationContextFacade$1");
+loadAnonymousInnerClasses(loader, basePackage +
"ApplicationContextFacade");
loader.loadClass(basePackage +
"ApplicationDispatcher$PrivilegedForward");
loader.loadClass(basePackage +
"ApplicationDispatcher$PrivilegedInclude");
loader.loadClass(basePackage + "AsyncContextImpl");
loader.loadClass(basePackage + "AsyncContextImpl$DebugException");
-loader.loadClass(basePackage + "AsyncContextImpl$1");
+loadAnonymousInnerClasses(loader, basePackage + "AsyncContextImpl");
loader.loadClass(basePackage + "AsyncListenerWrapper");
loader.loadClass(basePackage + "ContainerBase$PrivilegedAddChild");
-loader.loadClass(basePackage + "DefaultInstanceManager$1");
-loader.loadClass(basePackage + "DefaultInstanceManager$2");
-loader.loadClass(basePackage + "DefaultInstanceManager$3");
+loadAnonymousInnerClasses(loader, basePackage +
"DefaultInstanceManager");
loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntry");
loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntryType");
loader.loadClass(basePackage +
"ApplicationHttpRequest$AttributeNamesEnumerator");
@@ -94,7 +92,7 @@ public final class SecurityClassLoad {
private static final void loadSessionPackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.session.";
loader.loadClass(basePackage + "StandardSession");
-loader.loadClass(basePackage + "StandardSession$1");
+loadAnonymousInnerClasses(loader, basePackage + "StandardSession");
loader.loadClass(basePackage + "StandardManager$PrivilegedDoUnload");
}
@@ -106,7 +104,7 @@ public final class SecurityClassLoad {
private static final void loadValvesPackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.valves.";
-loader.loadClass(basePackage + "AbstractAccessLogValve$3");
+loadAnonymousInnerClasses(loader, basePackage +
"AbstractAccessLogValve");
}
private static final void loadWebResourcesPackage(ClassLoader loader)
throws Exception {
@@ -116,7 +114,7 @@ public final class SecurityClassLoad {
private static final void loadCoyotePackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.coyote.";
-loader.loadClass(basePackage + "http11.AbstractOutputBuffer$1");
+loadAnonymousInnerClasses(loader, basePackage +
"http11.AbstractOutputBuffer");
loader.loadClass(basePackage + "http11.Constants");
// Make sure system property is read at this point
Class clazz = loader.loadClass(basePackage + "Constants");
@@ -144,17 +142,11 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage +
"ResponseFacade$SetContentTypePrivilegedAction");
loader.loadClass(basePackage +
"ResponseFacade$DateHeaderPrivilegedAction");
loader.loadClass(basePackage +
"RequestFacade$GetSessionPrivilegedAction");
-loader.loadClass(basePackage + "ResponseFacade$1");
-loader.loadClass(basePackage + "OutputBuffer$1");
-loader.loadClass(basePackage + "CoyoteInputStream$1");
-loader.loadClass(basePackage + "CoyoteInputStream$2");
-loader.loadClass(basePackage + "CoyoteInputStream$3");
-loader.loadClass(basePackage + "CoyoteInputStream$4");
-loader.loadClass(basePackage + "CoyoteInputStream$5");
-loader.loadClass(basePackage + "InputB
svn commit: r1820548 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/security/SecurityClassLoad.java jasper/security/SecurityClassLoad.java
Author: kkolinko
Date: Mon Jan 8 10:55:06 2018
New Revision: 1820548
URL: http://svn.apache.org/viewvc?rev=1820548&view=rev
Log:
Done auto-formatting. No functional change.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1820548&r1=1820547&r2=1820548&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon Jan 8 10:55:06 2018
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-
package org.apache.catalina.security;
/**
- * Static class used to preload java classes when using the
- * Java SecurityManager so that the defineClassInPackage
- * RuntimePermission does not trigger an AccessControlException.
+ * Static class used to preload java classes when using the Java
SecurityManager
+ * so that the defineClassInPackage RuntimePermission does not trigger an
+ * AccessControlException.
*
* @author Glenn L. Nielsen
*/
@@ -31,9 +30,7 @@ public final class SecurityClassLoad {
securityClassLoad(loader, true);
}
-
-static void securityClassLoad(ClassLoader loader, boolean
requireSecurityManager)
-throws Exception {
+static void securityClassLoad(ClassLoader loader, boolean
requireSecurityManager) throws Exception {
if (requireSecurityManager && System.getSecurityManager() == null) {
return;
@@ -53,81 +50,38 @@ public final class SecurityClassLoad {
loadTomcatPackage(loader);
}
-
-private static final void loadCorePackage(ClassLoader loader)
-throws Exception {
+private static final void loadCorePackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.core.";
-loader.loadClass
-(basePackage +
- "AccessLogAdapter");
-loader.loadClass
-(basePackage +
- "ApplicationContextFacade$1");
-loader.loadClass
-(basePackage +
- "ApplicationDispatcher$PrivilegedForward");
-loader.loadClass
-(basePackage +
- "ApplicationDispatcher$PrivilegedInclude");
-loader.loadClass
-(basePackage +
-"AsyncContextImpl");
-loader.loadClass
-(basePackage +
-"AsyncContextImpl$DebugException");
-loader.loadClass
-(basePackage +
-"AsyncContextImpl$1");
-loader.loadClass
-(basePackage +
-"AsyncListenerWrapper");
-loader.loadClass
-(basePackage +
- "ContainerBase$PrivilegedAddChild");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$1");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$2");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$3");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$AnnotationCacheEntry");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$AnnotationCacheEntryType");
-loader.loadClass
-(basePackage +
- "ApplicationHttpRequest$AttributeNamesEnumerator");
+loader.loadClass(basePackage + "AccessLogAdapter");
+loader.loadClass(basePackage + "ApplicationContextFacade$1");
+loader.loadClass(basePackage +
"ApplicationDispatcher$PrivilegedForward");
+loader.loadClass(basePackage +
"ApplicationDispatcher$PrivilegedInclude");
+loader.loadClass(basePackage + "AsyncContextImpl");
+loader.loadClass(basePackage + "AsyncContextImpl$DebugException");
+loader.loadClass(basePackage + "AsyncContextImpl$1");
+loader.loadClass(basePackage + "AsyncListenerWrapper");
+loader.loadClass(basePackage + "ContainerBase$PrivilegedAddChild");
+loader.loadClass(basePackage + "DefaultInstanceManager$1");
+loader.loadClass(basePackage + "DefaultInstanceManager$2");
+loader.loadClass(basePackage + "DefaultInstanceManager$3");
+loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntry");
+loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntryType");
+loader.loadClass(basePackage +
"ApplicationHttpRequest$AttributeNamesEnumerator");
}
-
-private static final void loadLoaderPackage(ClassLoader loader)
-throws Exception {
+private static final void
svn commit: r1820546 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/security/SecurityClassLoad.java java/org/apache/jasper/security/SecurityClassLoad.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon Jan 8 10:42:12 2018
New Revision: 1820546
URL: http://svn.apache.org/viewvc?rev=1820546&view=rev
Log:
Use a loop to preload anonymous inner classes, to be safe for future changes in
the code or using a different compiler..
https://bz.apache.org/bugzilla/show_bug.cgi?id=47214
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1820546&r1=1820545&r2=1820546&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon Jan 8 10:42:12 2018
@@ -61,9 +61,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "AsyncContextImpl$DebugException");
loader.loadClass(basePackage + "AsyncListenerWrapper");
loader.loadClass(basePackage + "ContainerBase$PrivilegedAddChild");
-loader.loadClass(basePackage + "DefaultInstanceManager$1");
-loader.loadClass(basePackage + "DefaultInstanceManager$2");
-loader.loadClass(basePackage + "DefaultInstanceManager$3");
+loadAnonymousInnerClasses(loader, basePackage +
"DefaultInstanceManager");
loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntry");
loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntryType");
loader.loadClass(basePackage +
"ApplicationHttpRequest$AttributeNamesEnumerator");
@@ -93,7 +91,7 @@ public final class SecurityClassLoad {
private static final void loadSessionPackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.session.";
loader.loadClass(basePackage + "StandardSession");
-loader.loadClass(basePackage + "StandardSession$1");
+loadAnonymousInnerClasses(loader, basePackage + "StandardSession");
loader.loadClass(basePackage + "StandardManager$PrivilegedDoUnload");
}
@@ -106,7 +104,7 @@ public final class SecurityClassLoad {
private static final void loadValvesPackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.valves.";
-loader.loadClass(basePackage + "AbstractAccessLogValve$3");
+loadAnonymousInnerClasses(loader, basePackage +
"AbstractAccessLogValve");
}
private static final void loadCoyotePackage(ClassLoader loader) throws
Exception {
@@ -139,18 +137,11 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage +
"ResponseFacade$SetContentTypePrivilegedAction");
loader.loadClass(basePackage +
"ResponseFacade$DateHeaderPrivilegedAction");
loader.loadClass(basePackage +
"RequestFacade$GetSessionPrivilegedAction");
-loader.loadClass(basePackage + "ResponseFacade$1");
-loader.loadClass(basePackage + "OutputBuffer$1");
-loader.loadClass(basePackage + "OutputBuffer$2");
-loader.loadClass(basePackage + "CoyoteInputStream$1");
-loader.loadClass(basePackage + "CoyoteInputStream$2");
-loader.loadClass(basePackage + "CoyoteInputStream$3");
-loader.loadClass(basePackage + "CoyoteInputStream$4");
-loader.loadClass(basePackage + "CoyoteInputStream$5");
-loader.loadClass(basePackage + "InputBuffer$1");
-loader.loadClass(basePackage + "Response$1");
-loader.loadClass(basePackage + "Response$2");
-loader.loadClass(basePackage + "Response$3");
+loadAnonymousInnerClasses(loader, basePackage + "ResponseFacade");
+loadAnonymousInnerClasses(loader, basePackage + "OutputBuffer");
+loadAnonymousInnerClasses(loader, basePackage + "CoyoteInputStream");
+loadAnonymousInnerClasses(loader, basePackage + "InputBuffer");
+loadAnonymousInnerClasses(loader, basePackage + "Response");
}
private static final void loadTomcatPackage(ClassLoader loader) throws
Exception {
@@ -192,4 +183,14 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "util.security.PrivilegedGetTccl");
loader.loadClass(basePackage + "util.security.PrivilegedSetTccl");
}
+
+private static final void loadAnonymousInnerClasses(ClassLoader loader,
String enclosingClass) {
+try {
+for (int i = 1;; i++) {
+loader.loadClass(enclosingClass + '$' + i);
+}
+} catch (ClassNotFoundException ignored) {
+//
+}
+}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/S
svn commit: r1820544 - in /tomcat/tc8.5.x/trunk/java/org/apache: catalina/security/SecurityClassLoad.java jasper/security/SecurityClassLoad.java
Author: kkolinko
Date: Mon Jan 8 10:34:14 2018
New Revision: 1820544
URL: http://svn.apache.org/viewvc?rev=1820544&view=rev
Log:
Done auto-formatting. No functional change.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1820544&r1=1820543&r2=1820544&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon Jan 8 10:34:14 2018
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-
package org.apache.catalina.security;
/**
- * Static class used to preload java classes when using the
- * Java SecurityManager so that the defineClassInPackage
- * RuntimePermission does not trigger an AccessControlException.
+ * Static class used to preload java classes when using the Java
SecurityManager
+ * so that the defineClassInPackage RuntimePermission does not trigger an
+ * AccessControlException.
*
* @author Glenn L. Nielsen
*/
@@ -31,9 +30,7 @@ public final class SecurityClassLoad {
securityClassLoad(loader, true);
}
-
-static void securityClassLoad(ClassLoader loader, boolean
requireSecurityManager)
-throws Exception {
+static void securityClassLoad(ClassLoader loader, boolean
requireSecurityManager) throws Exception {
if (requireSecurityManager && System.getSecurityManager() == null) {
return;
@@ -52,81 +49,38 @@ public final class SecurityClassLoad {
loadTomcatPackage(loader);
}
-
-private static final void loadCorePackage(ClassLoader loader)
-throws Exception {
+private static final void loadCorePackage(ClassLoader loader) throws
Exception {
final String basePackage = "org.apache.catalina.core.";
-loader.loadClass
-(basePackage +
- "AccessLogAdapter");
-loader.loadClass
-(basePackage +
- "ApplicationContextFacade$PrivilegedExecuteMethod");
-loader.loadClass
-(basePackage +
- "ApplicationDispatcher$PrivilegedForward");
-loader.loadClass
-(basePackage +
- "ApplicationDispatcher$PrivilegedInclude");
-loader.loadClass
-(basePackage +
- "ApplicationPushBuilder");
-loader.loadClass
-(basePackage +
-"AsyncContextImpl");
-loader.loadClass
-(basePackage +
-"AsyncContextImpl$AsyncRunnable");
-loader.loadClass
-(basePackage +
-"AsyncContextImpl$DebugException");
-loader.loadClass
-(basePackage +
-"AsyncListenerWrapper");
-loader.loadClass
-(basePackage +
- "ContainerBase$PrivilegedAddChild");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$1");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$2");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$3");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$AnnotationCacheEntry");
-loader.loadClass
-(basePackage +
- "DefaultInstanceManager$AnnotationCacheEntryType");
-loader.loadClass
-(basePackage +
- "ApplicationHttpRequest$AttributeNamesEnumerator");
+loader.loadClass(basePackage + "AccessLogAdapter");
+loader.loadClass(basePackage +
"ApplicationContextFacade$PrivilegedExecuteMethod");
+loader.loadClass(basePackage +
"ApplicationDispatcher$PrivilegedForward");
+loader.loadClass(basePackage +
"ApplicationDispatcher$PrivilegedInclude");
+loader.loadClass(basePackage + "ApplicationPushBuilder");
+loader.loadClass(basePackage + "AsyncContextImpl");
+loader.loadClass(basePackage + "AsyncContextImpl$AsyncRunnable");
+loader.loadClass(basePackage + "AsyncContextImpl$DebugException");
+loader.loadClass(basePackage + "AsyncListenerWrapper");
+loader.loadClass(basePackage + "ContainerBase$PrivilegedAddChild");
+loader.loadClass(basePackage + "DefaultInstanceManager$1");
+loader.loadClass(basePackage + "DefaultInstanceManager$2");
+loader.loadClass(basePackage + "DefaultInstanceManager$3");
+loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntry");
+loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntryType");
+
svn commit: r1820543 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: kkolinko
Date: Mon Jan 8 10:23:37 2018
New Revision: 1820543
URL: http://svn.apache.org/viewvc?rev=1820543&view=rev
Log:
Followup to r1817901 (BZ 47214) Remove explicit loading of classes that are
already leaded by loadAnonymousInnerClasses() call.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1820543&r1=1820542&r2=1820543&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon Jan 8 10:23:37 2018
@@ -62,8 +62,6 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "AsyncListenerWrapper");
loader.loadClass(basePackage + "ContainerBase$PrivilegedAddChild");
loadAnonymousInnerClasses(loader, basePackage +
"DefaultInstanceManager");
-loader.loadClass(basePackage + "DefaultInstanceManager$2");
-loader.loadClass(basePackage + "DefaultInstanceManager$3");
loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntry");
loader.loadClass(basePackage +
"DefaultInstanceManager$AnnotationCacheEntryType");
loader.loadClass(basePackage +
"ApplicationHttpRequest$AttributeNamesEnumerator");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61312] NullPointerException in StatementCache.isCached
https://bz.apache.org/bugzilla/show_bug.cgi?id=61312 changjun changed: What|Removed |Added OS||All --- Comment #1 from changjun --- hi everyone, is there any update of this bug? any workaround of this bug? thanks. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 9.0.x and 8.5.x
On 08/01/18 09:31, Konstantin Kolinko wrote: > 2018-01-04 23:42 GMT+03:00 Mark Thomas : >> Hi all, >> >> It is the start of a new month and the open issue list looks to be clear >> so I'm planning on tagging 9.0.x and 8.5.x early next week. > > Is there a need for a new Tomcat-Native build for Windows, > to update to OpenSSL 1.0.2n (released 2017-12-07). > > Tomcat Native 1.2.16 (released 2017-11-20) is built with 1.0.2m, > > https://www.openssl.org/news/newslog.html > > Generally, I think that CVE-2017-3737 does not affect us, as I read it that it > relies on an application ignoring a fatal error from a handshake and > continuing to read data, > and I think that Tomcat won't ignore a fatal handshake error. I concur. I wasn't planning on a Tomcat-Native release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 9.0.x and 8.5.x
2018-01-04 23:42 GMT+03:00 Mark Thomas : > Hi all, > > It is the start of a new month and the open issue list looks to be clear > so I'm planning on tagging 9.0.x and 8.5.x early next week. Is there a need for a new Tomcat-Native build for Windows, to update to OpenSSL 1.0.2n (released 2017-12-07). Tomcat Native 1.2.16 (released 2017-11-20) is built with 1.0.2m, https://www.openssl.org/news/newslog.html Generally, I think that CVE-2017-3737 does not affect us, as I read it that it relies on an application ignoring a fatal error from a handshake and continuing to read data, and I think that Tomcat won't ignore a fatal handshake error. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
