[Bug 65224] JNDIRealm doesn't escape filters containing username
https://bz.apache.org/bugzilla/show_bug.cgi?id=65224 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in: - 10.0.x for 10.0.6 onwards - 9.0.x for 9.0.46 onwards - 8.5.x for 8.5.66 onwards - 7.0.x for 7.0.109 onwards -- 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
[tomcat] branch 8.5.x updated: Fix BZ 65235. Correct docs. Expand MBean descriptor.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 01770c6 Fix BZ 65235. Correct docs. Expand MBean descriptor. 01770c6 is described below commit 01770c614f41c1758f6791c977f98589d030f691 Author: Mark Thomas AuthorDate: Fri Apr 16 12:44:40 2021 +0100 Fix BZ 65235. Correct docs. Expand MBean descriptor. --- .../apache/catalina/valves/mbeans-descriptors.xml | 48 ++ webapps/docs/changelog.xml | 12 ++ webapps/docs/config/valve.xml | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml index 1fd880e..6290778 100644 --- a/java/org/apache/catalina/valves/mbeans-descriptors.xml +++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml @@ -527,44 +527,59 @@ type="org.apache.catalina.valves.RemoteIpValve"> + + + + + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> + + + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 63c9e6e..fd6ebd7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -114,6 +114,10 @@ 65224: Ensure the correct escaping of attribute values and search filters in the JNDIRealm. (markt) + +65235: Add missing attributes to the MBean descriptor file +for the RemoteIpValve. (markt) + @@ -124,6 +128,14 @@ + + + +65235: Correct name of changeLocalName in the +documentation for the RemoteIpValve. (markt) + + + diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index 98793a2..44b1574 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -1155,7 +1155,7 @@ specified, the default of 443 is used. - + If true, the value returned by ServletRequest.getLocalHost() and ServletRequest.getServerHost() is modified by the this - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 65235. Correct docs. Expand MBean descriptor.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 3096221 Fix BZ 65235. Correct docs. Expand MBean descriptor. 3096221 is described below commit 30962215f8f6c1f3f24acf9826745a822379cbb3 Author: Mark Thomas AuthorDate: Fri Apr 16 12:44:40 2021 +0100 Fix BZ 65235. Correct docs. Expand MBean descriptor. --- .../apache/catalina/valves/mbeans-descriptors.xml | 48 ++ webapps/docs/changelog.xml | 12 ++ webapps/docs/config/valve.xml | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml index 1fd880e..6290778 100644 --- a/java/org/apache/catalina/valves/mbeans-descriptors.xml +++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml @@ -527,44 +527,59 @@ type="org.apache.catalina.valves.RemoteIpValve"> + + + + + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> + + + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4472321..b754fa1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -118,6 +118,10 @@ 65224: Ensure the correct escaping of attribute values and search filters in the JNDIRealm. (markt) + +65235: Add missing attributes to the MBean descriptor file +for the RemoteIpValve. (markt) + @@ -128,6 +132,14 @@ + + + +65235: Correct name of changeLocalName in the +documentation for the RemoteIpValve. (markt) + + + diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index 4e0770f..e5aca90 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -1155,7 +1155,7 @@ specified, the default of 443 is used. - + If true, the value returned by ServletRequest.getLocalHost() and ServletRequest.getServerHost() is modified by the this - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 65235. Correct docs. Expand MBean descriptor.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 04fbddc Fix BZ 65235. Correct docs. Expand MBean descriptor. 04fbddc is described below commit 04fbddcf49b866e1f0152d324c70885f04150fd5 Author: Mark Thomas AuthorDate: Fri Apr 16 12:44:40 2021 +0100 Fix BZ 65235. Correct docs. Expand MBean descriptor. --- .../apache/catalina/valves/mbeans-descriptors.xml | 48 ++ webapps/docs/changelog.xml | 12 ++ webapps/docs/config/valve.xml | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml index 1fd880e..6290778 100644 --- a/java/org/apache/catalina/valves/mbeans-descriptors.xml +++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml @@ -527,44 +527,59 @@ type="org.apache.catalina.valves.RemoteIpValve"> + + + + + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> + + + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e898958..43bd12e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -114,6 +114,10 @@ 65224: Ensure the correct escaping of attribute values and search filters in the JNDIRealm. (markt) + +65235: Add missing attributes to the MBean descriptor file +for the RemoteIpValve. (markt) + @@ -124,6 +128,14 @@ + + + +65235: Correct name of changeLocalName in the +documentation for the RemoteIpValve. (markt) + + + diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index 007c931..a3246e2 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -1154,7 +1154,7 @@ specified, the default of 443 is used. - + If true, the value returned by ServletRequest.getLocalHost() and ServletRequest.getServerHost() is modified by the this - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65235] Mismatch between RemoteIpValve documentation and source code
https://bz.apache.org/bugzilla/show_bug.cgi?id=65235 Mark Thomas changed: What|Removed |Added OS||All Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Fixed in: - 10.0.x for 10.0.6 onwards - 9.0.x for 9.0.46 onwards - 8.5.x for 8.5.66 onwards - 7.0.x for 7.0.109 onwards -- 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
[tomcat] branch 7.0.x updated: Fix BZ 65235. Correct docs. Expand MBean descriptor.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new bc50c78 Fix BZ 65235. Correct docs. Expand MBean descriptor. bc50c78 is described below commit bc50c78924c201c6a8f261b54f3aa50eb0f83178 Author: Mark Thomas AuthorDate: Fri Apr 16 12:44:40 2021 +0100 Fix BZ 65235. Correct docs. Expand MBean descriptor. --- .../apache/catalina/valves/mbeans-descriptors.xml | 48 ++ webapps/docs/changelog.xml | 12 ++ webapps/docs/config/valve.xml | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml index f4329a2..993ed30 100644 --- a/java/org/apache/catalina/valves/mbeans-descriptors.xml +++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml @@ -504,19 +504,31 @@ type="org.apache.catalina.valves.RemoteIpValve"> + + + + + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> + + + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + type="java.lang.String"/> + + + type="java.lang.String"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b5fa4ef..c436374 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -129,6 +129,18 @@ 65226: Fix extraction of JAR name in some cases in StandardJarScanner. Submitted by Lynx. (remm) + +65235: Add missing attributes to the MBean descriptor file +for the RemoteIpValve. (markt) + + + + + + +65235: Correct name of changeLocalName in the +documentation for the RemoteIpValve. (markt) + diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index fbb19fe..3f5d9aa 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -936,7 +936,7 @@ specified, the default of 443 is used. - + If true, the value returned by ServletRequest.getLocalHost() and ServletRequest.getServerHost() is modified by the this - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65240] Multi line CATALINA_OPTS is failing in with new catalina.sh
https://bz.apache.org/bugzilla/show_bug.cgi?id=65240 --- Comment #3 from mgrigorov --- Can you use trailing '\': -DmolnetConfigLocation=file:$CATALINA_BASE/conf/app.properties \ -Dspring.profiles.active=. \ -Dcom.sun.management.jmxremote \ -Dcom.sun.management.jmxremote.port=. \ ... ? I haven't tried it but I think it should work. -- 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 65244] annotations from @HandlesTypes are checked only at class level when scanning
https://bz.apache.org/bugzilla/show_bug.cgi?id=65244 --- Comment #7 from Remy Maucherat --- Although not urgent at all, the specification seems very clear now that I have reviewed it (annotations on fields and method do count). I'll try to do something about it next week to see how it can work. -- 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
[PROPOSAL] Change the way we present sslProtocol and sslEnabledProtocols config attributes
All, The sslProtocol and sslEnabledProtocols configuration attributes on are potentially confusing to people, and there really isn't any reason for it. There is really never any reason to change sslProtocol from the default which is "TLS" because: 1. "TLS" actually enables SSLv3 when SSLv3 is available (which is rare these days) 2. "TLS" covers all current and likely future versions of the protocol 3. sslEnabledProtocols exists to tweak exactly which of many protocol-versions are actually being used The only reason we have sslProtocol vs sslEnabledProtocols is because of the Java API details; there is no need to present this complexity to users. Initially, this was going to be a proposal to simply *remove* sslProtocol altogether and fix its value at "TLS" forever, and then treat both sslProtocol and sslEnabledProtocols as aliases for each other. Just choose the longer of the two non-default values assuming that "TLSv1.2" would be longer than "TLS", and so we would enable only TLSv1.2 if it were specified in sslProtocol and not sslEnabledProtocols. But my guess is that there are some weird circumstances where someone might actually want to change that value. So my proposal instead of to change the documentation for sslProtocol to simple say: "This should always be left at the default value of 'TLS'." Then, the documentation for sslEnabledProtocols can be changed to "list of protocol versions to enable e.g. SSLv3, TLSv1.2, etc.". -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65244] annotations from @HandlesTypes are checked only at class level when scanning
https://bz.apache.org/bugzilla/show_bug.cgi?id=65244 --- Comment #8 from Mark Thomas --- I've been thinking about implementation options. It looks relatively simple although there is potential complexity depending on the extent to which we are concerned about retaining current behaviour of existing internal method calls in case anyone is using them directly. My biggest concern is performance. I have set up a simple test to scan the WEB-INF/lib dir from Jira 8.15.0. I plan to use that to track relative performance. My current thinking is implement the additional scanning, look at the relative performance and then discuss what, if anything, we should optimise. We'll want to back-port this to 9.0.x and 8.5.x but I think we'll want to do that slowly in case of regressions. -- 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 65244] annotations from @HandlesTypes are checked only at class level when scanning
https://bz.apache.org/bugzilla/show_bug.cgi?id=65244 --- Comment #9 from romain.manni-bucau --- Maybe it is an opportunity to make it properly pluggable. Most tomcat integrators drops that part to use their own scanner (tomee uses xbean, pax uses osgi flavor of xbean, others bypasses it, some use jandex, etc). Can be good to make it properly pluggable if changed no? Once done having a classscanner and deepscanner (fields, methods, hierarchy) sounds trivial and will enable to not break apps or quickly disable the new behavior when breaking. -- 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 65244] annotations from @HandlesTypes are checked only at class level when scanning
https://bz.apache.org/bugzilla/show_bug.cgi?id=65244 --- Comment #10 from Mark Thomas --- I like it. That does almost certainly mean one breaking change now to introduce the pluggable API. Would we consider ServiceLoader for this? -- 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 65244] annotations from @HandlesTypes are checked only at class level when scanning
https://bz.apache.org/bugzilla/show_bug.cgi?id=65244 --- Comment #11 from romain.manni-bucau --- Context or contextconfig configuration is fine since most integrations have listeners already no? -- 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
