[tomcat] branch master updated: Add back support for static resources for now
This is an automated email from the ASF dual-hosted git repository. fhanik 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 33185e3 Add back support for static resources for now 33185e3 is described below commit 33185e3abaf440239fd2b4d777d9639c9fdfbce3 Author: Filip Hanik AuthorDate: Fri Aug 14 14:02:24 2020 -0700 Add back support for static resources for now Found embedded applications that serve up resources from META-INF/resources in nested Jar files --- build.xml | 14 -- 1 file changed, 14 deletions(-) diff --git a/build.xml b/build.xml index 0613b1f..1dfa845 100644 --- a/build.xml +++ b/build.xml @@ -589,20 +589,6 @@ - - - - - - - - - - - - - - - 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: Add back support for static resources for now
This is an automated email from the ASF dual-hosted git repository. fhanik 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 5f9f36c Add back support for static resources for now 5f9f36c is described below commit 5f9f36c59279320c6bbabdf0420dcdf1a359ff9b Author: Filip Hanik AuthorDate: Fri Aug 14 14:02:24 2020 -0700 Add back support for static resources for now Found embedded applications that serve up resources from META-INF/resources in nested Jar files --- build.xml | 14 -- 1 file changed, 14 deletions(-) diff --git a/build.xml b/build.xml index 343ae3b..6da7bbf 100644 --- a/build.xml +++ b/build.xml @@ -585,20 +585,6 @@ - - - - - - - - - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on a change in pull request #334: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=64614
markt-asf commented on a change in pull request #334:
URL: https://github.com/apache/tomcat/pull/334#discussion_r470811556
##
File path: java/org/apache/tomcat/util/net/LocalStrings.properties
##
@@ -176,3 +176,4 @@ sslUtilBase.ssl3=SSLv3 has been explicitly enabled. This
protocol is known to be
sslUtilBase.tls13.auth=The JSSE TLS 1.3 implementation does not support
authentication after the initial handshake and is therefore incompatible with
optional client authentication
sslUtilBase.trustedCertNotChecked=The validity dates of the trusted
certificate with alias [{0}] were not checked as the certificate was of an
unknown type
sslUtilBase.trustedCertNotValid=The trusted certificate with alias [{0}] and
DN [{1}] is not valid due to [{2}]. Certificates signed by this trusted
certificate WILL be accepted
+sslUtilBase.alias_ignored=Alias name [{0}] is ignored
Review comment:
Maybe add a reason here. e.g.
"FIPS enabled so alias name [{0}] will be ignored. If there is more than one
key in the key store, the key used will depend on the key store implementation"
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on a change in pull request #333: [Patch] Support INDEX.LIST in jar file to speed up resource finding
markt-asf commented on a change in pull request #333:
URL: https://github.com/apache/tomcat/pull/333#discussion_r470802517
##
File path: java/org/apache/tomcat/util/scan/JarIndex.java
##
@@ -0,0 +1,61 @@
+package org.apache.tomcat.util.scan;
Review comment:
No ALv2 Header
Why is this class in this package when it is only used in
`org.apache.catalina.webresources`?
##
File path: java/org/apache/catalina/webresources/JarResourceSet.java
##
@@ -59,6 +63,36 @@ public JarResourceSet(WebResourceRoot root, String
webAppMount, String base,
super(root, webAppMount, base, internalPath);
}
+@Override
+public WebResource getResource(String path, List>
allResources) {
+JarIndex jarIndex = getJarIndex();
+if(jarIndex==null){
+return getResource(path);
+}
+String webAppMount = getWebAppMount();
+if (path.startsWith(getWebAppMount())) {
+String pathInJar = getInternalPath() + path.substring(
+webAppMount.length());
+if (pathInJar.length() > 0 && pathInJar.charAt(0) == '/') {
+pathInJar = pathInJar.substring(1);
+}
+List jarFiles = jarIndex.get(pathInJar);
+if(jarFiles!=null){
Review comment:
Why is this here rather than in `StandardRoot` ?
##
File path: java/org/apache/catalina/WebResourceSet.java
##
@@ -36,6 +37,10 @@
*/
WebResource getResource(String path);
+default WebResource getResource(String path, List>
allResources){
Review comment:
This looks wrong. A single `WebResourceSet` shouldn't need to be passed
a reference to `allResources`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on a change in pull request #331: Remove White Spaces and extra lines from the JSP files
markt-asf commented on a change in pull request #331:
URL: https://github.com/apache/tomcat/pull/331#discussion_r470788056
##
File path: java/org/apache/jasper/compiler/NewlineReductionServletWriter.java
##
@@ -0,0 +1,40 @@
+package org.apache.jasper.compiler;
+
+import java.io.PrintWriter;
+
+/**
+ * This class filters duplicate newlines instructions from the compiler output,
+ * and therefore from the runtime JSP. The duplicates typically happen because
+ * the compiler has multiple branches that write them, but they operate
+ * independently and don't realize that the previous output was identical.
+ *
+ * Removing these lines makes the JSP more efficient by executing fewer
operations during runtime.
+ *
+ * @author Engebretson, John
+ * @author Kamnani, Jatin
+ *
+ */
+public class NewlineReductionServletWriter extends ServletWriter {
+private static final String NEWLINE_WRITE_TEXT = "out.write('\\n');";
Review comment:
There are no calls that match this pattern in the Tomcat code base. Due
to this point alone, I don't see the justification for this feature.
Skipping blank lines like this is going to break SMAP support. That isn't a
show stopper but needs to be noted in the documentation.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Discouraging Rogue Users In Tomcat
This looks like a Tomcat specific fail2ban clone to me. My recommendation for users that want this sort of functionality is have the app write the offending IP address (and optional additional info) to a log file and configure fail2ban to monitor that log file. Mark On 05/08/2020 18:51, Dave Fisher wrote: > Hi - > > In my experience the scans you are reporting may be from a white hat security > scan of your website that is contracted by your security team. These tend to > try every exploit that is known for any web server to make sure that your web > apps is secure. > > I’m not sure how the Tomcat team will respond to your ideas. But to me this > seems like a use case for a filter and/or a reason to put httpd in front of > Tomcat. > > All the best, > Dave > >> On Aug 5, 2020, at 10:17 AM, Alan Basche wrote: >> >>> >>> Alan, >>> >>> >>> What kind of protections does this module provide? How does it >>> integrate into Tomcat (e.g. custom >>> Filter/Valve/ServletContextListener, patches to arbitrary places in >>> Tomcat internals, etc.)? >>> >> >> The point of this code is to prevent malicious users from probing >> Tomcat hosted apps for weaknesses that can be exploited. After >> deploying Tomcat a year ago, I found that some automated programs were >> requesting hundreds of files that were not found on my system. >> Besides the security risk of revealing your system's configuration, a >> single attack could increase my daily access log file size by 3 or 4 >> times with all of the file requests. I was not able to find any way >> to discourage this activity with any Tomcat feature. So I started >> developing my own solutions to shutdown these visitors. Initially my >> efforts focused on manipulating the website apps' responses in various >> ways but ultimately, the most determined black-hats were not deterred. >> A few months ago I found a solution that worked quite well. I >> concluded that Tomcat should simply refuse to connect to bad IP >> addresses. Of course, Tomcat has no way of knowing when the server is >> being probed for vulnerabilities. However, the website apps are fully >> aware of an attack (e.g. when a user asks for 'wp-login.php', but the >> apps don't even use php technology). So the apps can determine if an >> attack is in-progress, and inform Tomcat of the attack so it can be >> dealt with. >> >> I added a new class IpHitTable.java to Tomcat that manages a list of >> bad IP addresses, checks for an IP address in the table, has a public >> method that allows apps to add a problem IP address, and can return an >> HTML-formatted String for use in a website page to view the bad IP >> address table. I modified Tomcat class NioEndpoint.java to call a >> method in IpHitTable to see if an IP address that wants to connect >> should be allowed. This bad IP address table in IpHitTable is built >> as the system runs and is not stored/loaded to/from a disk or config >> file. The table is empty each time Tomcat is started. >> >> When a web app gets a bad request, it tells Tomcat the IP address and >> how many bad hits are permissible before future connections should be >> refused, and then sends a response with a status code that causes >> Tomcat to disconnect the session >> (org.apache.coyote.http11.statusDropsConnection()) if Tomcat informed >> the app that the bad hits limit has been reached. My own web apps >> allow 3 bad requests before breaking a connection (to allow for >> legitimate file-not-found scenarios... the hostmaster removed/renamed >> HTML files for example). I also have a default web app (defined in >> server.xml, the 'Engine' definition parameter) that receives requests >> that are not bound for a particular app. This covers black-hats who >> come to my server by IP address and didn't even know it was a web >> server. The default web app does not allow 3 bad requests, but rather >> immediately disconnects and tells Tomcat to immediately refuse future >> connections. This type of request represents the vast majority of the >> black-hat probe attempts. >> >>> >>> Are you willing to post your code somewhere like GitHub where everyone >>> can see it? >>> >>> - -chris >> >> I have posted the 2 described classes at: >> >> https://github.com/alannotallan/tc-code-01 >> >> Some points regarding the code & design: >> >> - Look for *Alan* in NioEndpoint.java to see the bit of code I added. >> >> - I built at least 8 proof-of-concept systems before I came up with >> this design. They were meant to prove an idea, not implement a final >> version. Therefore, some changes are to be expected. >> >> - I didn't include the default web app since my app heavily uses a >> private library. I would create a bare-bones default web app to >> handle requests in the manner described. >> >> - I would add a valve to turn on/off this feature and set parameters as >> needed. >> >> - The IP address list is an ArrayList, which should probably be >> changed to some kind of hash list for
[Bug 64666] Cannot allow special characters in query strings without replacing server.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=64666 --- Comment #2 from Felix Schumacher --- Maybe you can achieve the same using a PropertySource and lookup your values from environment variables. See https://tomcat.apache.org/tomcat-8.5-doc/config/systemprops.html#Property_replacements and https://tomcat.apache.org/tomcat-9.0-doc/api/org/apache/tomcat/util/digester/EnvironmentPropertySource.html for more information -- 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: [tomcat] branch master updated: Allow recursive substitution of properties. Add tests and use indexOf("${") instead indexOf('$').
On 06/08/2020 12:26, jfcl...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> jfclere 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 e7896ee Allow recursive substitution of properties. Add tests and
> use indexOf("${") instead indexOf('$').
> new ec5e948 Merge pull request #309 from jfclere/trunk
> e7896ee is described below
>
> commit e7896ee44a3c9f2cff4b93bca9ae6112917f6c88
> Author: Jean-Frederic Clere
> AuthorDate: Fri Jun 26 09:50:09 2020 +0200
>
> Allow recursive substitution of properties.
> Add tests and use indexOf("${") instead indexOf('$').
Change log?
Docs?
Or did I miss a commit somewhere?
Mark
> ---
> java/org/apache/tomcat/util/IntrospectionUtils.java | 21
> +++--
> .../apache/tomcat/util/TestIntrospectionUtils.java | 12
> 2 files changed, 31 insertions(+), 2 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
> b/java/org/apache/tomcat/util/IntrospectionUtils.java
> index 78ab66f..9f12323 100644
> --- a/java/org/apache/tomcat/util/IntrospectionUtils.java
> +++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
> @@ -285,8 +285,17 @@ public final class IntrospectionUtils {
> public static String replaceProperties(String value,
> Hashtable staticProp, PropertySource
> dynamicProp[],
> ClassLoader classLoader) {
> +return replaceProperties(value, staticProp, dynamicProp,
> classLoader, 0);
> +}
>
> -if (value.indexOf('$') < 0) {
> +private static String replaceProperties(String value,
> +Hashtable staticProp, PropertySource
> dynamicProp[],
> +ClassLoader classLoader, int iterationCount) {
> +if (value.indexOf("${") < 0) {
> +return value;
> +}
> +if (iterationCount >=20) {
> +log.warn("System property failed to update and remains [" +
> value + "]");
> return value;
> }
> StringBuilder sb = new StringBuilder();
> @@ -332,7 +341,15 @@ public final class IntrospectionUtils {
> }
> if (prev < value.length())
> sb.append(value.substring(prev));
> -return sb.toString();
> +String newval = sb.toString();
> +if (newval.indexOf("${") < 0) {
> +return newval;
> +}
> +if (newval.equals(value))
> +return value;
> +if (log.isDebugEnabled())
> +log.debug("IntrospectionUtils.replaceProperties iter on: " +
> newval);
> +return replaceProperties(newval, staticProp, dynamicProp,
> classLoader, iterationCount+1);
> }
>
> private static String getProperty(String name, Hashtable
> staticProp,
> diff --git a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
> b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
> index ed9fe39..73ea86a 100644
> --- a/test/org/apache/tomcat/util/TestIntrospectionUtils.java
> +++ b/test/org/apache/tomcat/util/TestIntrospectionUtils.java
> @@ -143,5 +143,17 @@ public class TestIntrospectionUtils {
>
> Assert.assertEquals("abc${normal}xyz",
> IntrospectionUtils.replaceProperties(
> "abc${normal}xyz", properties, null, null));
> +
> +properties.setProperty("my.ajp.port", "8009");
> +properties.setProperty("tomcat.ajp.port", "${my.ajp.port}");
> +Assert.assertEquals("8009", IntrospectionUtils.replaceProperties(
> +"${tomcat.ajp.port}", properties, null, null));
> +
> +}
> +@Test
> +public void testReplacePropertiesRecursively() {
> +Properties properties = new Properties();
> +properties.setProperty("replaceMe", "something ${replaceMe}");
> +IntrospectionUtils.replaceProperties("${replaceMe}", properties,
> null, null);
> }
> }
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Bug 60030] Run away CPU with JSSE / OpenSSL with IE8
Am 14.08.20 um 18:48 schrieb bugzi...@apache.org: > https://bz.apache.org/bugzilla/show_bug.cgi?id=60030 > > MoNs changed: Spam reverted and the account has been disabled. Felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60030] Run away CPU with JSSE / OpenSSL with IE8
https://bz.apache.org/bugzilla/show_bug.cgi?id=60030 MoNs changed: What|Removed |Added URL||https://www.gelkeyfim.com --- Comment #5 from MoNs --- https://www.mavisohbet.org ile gerçekleşen sohbetler. -- 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 64645] bin/service.bat doesn't handle wrongly configured JAVA_HOME
https://bz.apache.org/bugzilla/show_bug.cgi?id=64645 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #8 from Mark Thomas --- One of JRE_HOME, JAVA_HOME or neither is acceptable. JAVA_HOME takes priority over JRE_HOME. If neither is set, the registry is used. If JAVA_HOME is configured to point to a JRE then: - the service install is not attempted - an error message is displayed and, now that this bug is fixed - the script completes with a non-zero return code -- 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] markt-asf commented on a change in pull request #332: Support sending the 100 continue response when the servlet reads the …
markt-asf commented on a change in pull request #332:
URL: https://github.com/apache/tomcat/pull/332#discussion_r470715185
##
File path: java/org/apache/catalina/core/StandardContextValve.java
##
@@ -81,7 +82,17 @@ public final void invoke(Request request, Response response)
// Acknowledge the request
try {
-response.sendAcknowledgement();
+// Acknowledge based on the policy
+final ContinueHandlingResponsePolicy
continueHandlingResponsePolicy = (ContinueHandlingResponsePolicy)
request.getConnector().getProperty("continueHandlingResponsePolicy");
+
Review comment:
Code lines need to wrap at 120 chars. This one looks too long.
##
File path: java/org/apache/coyote/AbstractProtocol.java
##
@@ -262,6 +267,17 @@ public void setConnectionLinger(int connectionLinger) {
endpoint.setConnectionLinger(connectionLinger);
}
+// HTTP specific
properties
+// - queried by
StandardContextValve
+public void setContinueHandlingResponsePolicy(String value) {
+continueHandlingResponsePolicy =
Enum.valueOf(ContinueHandlingResponsePolicy.class, value);
Review comment:
I think you need a `trim()` and a `.toUpperCase(Locale.ENGLISH)` here
##
File path: java/org/apache/catalina/connector/Response.java
##
@@ -1197,16 +1197,12 @@ public String encodeUrl(String url) {
public void sendAcknowledgement()
throws IOException {
-if (isCommitted()) {
Review comment:
I'm still uncomfortable with this check moving. I like that it is the
first check in all the `connector.Reponse` methods that need it. I think I'd
prefer duplication (as per `setCharacterEncoding()`).
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64645] bin/service.bat doesn't handle wrongly configured JAVA_HOME
https://bz.apache.org/bugzilla/show_bug.cgi?id=64645 --- Comment #7 from Christopher Schultz --- This seems like a different bug to me. JRE or JDK should be fine either way. -- 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
ApacheCon @ Home Tomcat Track Schedule
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I'm happy to announce that the Apache Tomcat track schedule has been posted for ApacheCon @ Home, our virtual conference to replace "ApacheCon North America 2020". If you use social media to discuss this event, please use #ACAH2020 and tag @apachecon. You can find the schedule here, as well as links to the other 27 (!) tracks that will be held at the conference: https://www.apachecon.com/acah2020/tracks/tomcat.html If you'd like to register (zero cost!), you can do that here: https://hopin.to/events/apachecon-home Note that some tracks are happening at different times; please check the times for each presentation in each track for your timezone. I hope to "see" many of you at the conference this year. Thanks, - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl82sk4ACgkQHPApP6U8 pFiypw/+M6Sz1wUtXk6A1CO5Lbz0jMU6/Ky53+zCb3skp4wNSVXaUuJ4xCb2hWg/ cl8KkgP6N0e4stwB9M/XbL403Ic6NGYBvS2ZcMmm2rJqO99t5UvTpUY/DzzNwaXf d5z2h8p+aSU4ph6UZavi/Tydxa83WxQSRDuRww61xs6yHv7myELicv+fATJGY4fb slMLJt2Hzmh9C7t7+xkQDTpEUNz+oIV2yyQwuvkAS6WMHJbrqAkuqgQq6eAYm5Qc 79pb4e/G+E71Sr2AzeuFSpLQCUzYIyOkXFoLfr9L6Wb7iwwiu5bFP7+WAbJvI200 tYjokn9NdZOwf4P3uY0xfCk3aq2jI9DZAcYjh7n0nhHCN+8vrqodQ/CZtoBYNQR5 /HwMgszCyimfkegwb3CcuayFUko/Oa+klSOuh9XqFM8jb9XobyXx7dprZk3Ly0Kq oL/7h3+uBvz4rzR6FVdcuJ7stY4JpBhG+ZsjkiMktYcZovD9IP20RIE+omvqc0/S L1d/3XyRk3fM6JuQq2Y9yqTcgsbBrzEtcwIAOv2r9TQaRrwSbO2nTUiPVx8RTwQ4 dtE60qVUvZ933I8aV4akqGkeUSBbxiv0WSfpV3T2F1latoqfEmlzueJNWrdgwXFC 8hSVyx29AsTiDGAXAswzxQDyNFlaY9zZZKi467doMvhJBGzTYfk= =pleB -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Travis failures on s390x
Hi, I am seeing consistent failures for the TestParserNoStrictWhitespace on Travis for s390x. Rather than proxying my testing through Travis, I am trying to get access to a free instance via IBM's cloud. I need to jump through some account upgrade hoops to do that and IBM's systems seem to have something against me at the moment. I'll keep the list posted re progress but expect to see at least 3 failures when the unit tests run on s390x for now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove unnecessary code.
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 af5e746 Remove unnecessary code.
af5e746 is described below
commit af5e746c13b875158bb42decbe19915387983e40
Author: Mark Thomas
AuthorDate: Fri Aug 14 13:04:07 2020 +0100
Remove unnecessary code.
System property is no longer use to control strict whitespace parsing.
No need to duplicate tests that do not depend on the setting of strict
whitespace parsing.
---
test/org/apache/jasper/compiler/TestParser.java| 5 +-
.../compiler/TestParserNoStrictWhitespace.java | 87 +-
2 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestParser.java
b/test/org/apache/jasper/compiler/TestParser.java
index 1e682f0..356ebab 100644
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -23,8 +23,9 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests are duplicated in {@link TestParserNoStrictWhitespace} with the strict
- * whitespace parsing disabled.
+ * Tests that depend on strict whitespace parsing are duplicated in
+ * {@link TestParserNoStrictWhitespace} with the strict whitespace parsing
+ * disabled.
*/
public class TestParser extends TomcatBaseTest {
diff --git a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
index 19f9633..58d3f9f 100644
--- a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
+++ b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
@@ -24,83 +24,12 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests are duplicated in {@link TestParser} with the strict whitespace
parsing
- * enabled by default.
+ * Tests duplicate those in {@link TestParser} where the strict whitespace
+ * parsing is enabled by default. Strict whitespace parsing is disabled for
+ * these tests in web.xml.
*/
public class TestParserNoStrictWhitespace extends TomcatBaseTest {
-@Override
-public void setUp() throws Exception {
-System.setProperty(
-"org.apache.jasper.compiler.Parser.STRICT_WHITESPACE",
-"false");
-super.setUp();
-}
-
-@Test
-public void testBug48627() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-ByteChunk res = getUrl("http://localhost:"; + getPort() +
-"/test/bug48nnn/bug48627.jsp");
-
-String result = res.toString();
-// Beware of the differences between escaping in JSP attributes and
-// in Java Strings
-assertEcho(result, "00-\\");
-assertEcho(result, "01-\\");
-}
-
-@Test
-public void testBug48668a() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-ByteChunk res = getUrl("http://localhost:"; + getPort() +
-"/test/bug48nnn/bug48668a.jsp");
-String result = res.toString();
-assertEcho(result, "00-Hello world#{foo.bar}");
-assertEcho(result, "01-Hello world${foo.bar}");
-assertEcho(result, "10-Hello ${'foo.bar}");
-assertEcho(result, "11-Hello ${'foo.bar}");
-assertEcho(result, "12-Hello #{'foo.bar}");
-assertEcho(result, "13-Hello #{'foo.bar}");
-assertEcho(result, "14-Hello ${'foo}");
-assertEcho(result, "15-Hello ${'foo}");
-assertEcho(result, "16-Hello #{'foo}");
-assertEcho(result, "17-Hello #{'foo}");
-assertEcho(result, "18-Hello ${'foo.bar}");
-assertEcho(result, "19-Hello ${'foo.bar}");
-assertEcho(result, "20-Hello #{'foo.bar}");
-assertEcho(result, "21-Hello #{'foo.bar}");
-assertEcho(result, "30-Hello ${'foo}");
-assertEcho(result, "31-Hello ${'foo}");
-assertEcho(result, "32-Hello #{'foo}");
-assertEcho(result, "33-Hello #{'foo}");
-assertEcho(result, "34-Hello ${'foo}");
-assertEcho(result, "35-Hello ${'foo}");
-assertEcho(result, "36-Hello #{'foo}");
-assertEcho(result, "37-Hello #{'foo}");
-assertEcho(result, "40-Hello ${'foo}");
-assertEcho(result, "41-Hello ${'foo}");
-assertEcho(result, "42-Hello #{'foo}");
-assertEcho(result, "43-Hello #{'foo}");
-assertEcho(result, "50-Hello ${'foo}");
-assertEcho(result, "51-Hello ${'foo}");
-assertEcho(result, "52-Hello #{'foo}");
-assertEcho(result, "53-Hello #{'foo}");
-}
-
-@Test
-public void testBug48668b() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-ByteChunk res = getUrl("http://localhost:"; + get
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2406 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] f0647024c9d3b316b60dcc3b5d7b88e94f05cec1 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - 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: Remove out of date functional spec docs
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 62daed8 Remove out of date functional spec docs 62daed8 is described below commit 62daed8c3cc0482c754d62289000995738b1cc14 Author: Mark Thomas AuthorDate: Fri Aug 14 10:45:29 2020 +0100 Remove out of date functional spec docs --- build.xml | 18 - webapps/docs/changelog.xml | 4 + webapps/docs/funcspecs/fs-admin-apps.xml| 299 --- webapps/docs/funcspecs/fs-admin-objects.xml | 495 -- webapps/docs/funcspecs/fs-admin-opers.xml | 342 - webapps/docs/funcspecs/fs-default.xml | 270 -- webapps/docs/funcspecs/fs-jdbc-realm.xml| 266 -- webapps/docs/funcspecs/fs-jndi-realm.xml| 417 --- webapps/docs/funcspecs/fs-memory-realm.xml | 253 -- webapps/docs/funcspecs/index.xml| 70 --- webapps/docs/funcspecs/mbean-names.xml | 755 webapps/docs/funcspecs/project.xml | 56 --- webapps/docs/index.xml | 3 - webapps/docs/monitoring.xml | 3 +- webapps/docs/project.xml| 1 - 15 files changed, 5 insertions(+), 3247 deletions(-) diff --git a/build.xml b/build.xml index 9412e4a..c1bec02 100644 --- a/build.xml +++ b/build.xml @@ -987,8 +987,6 @@ - - - - - - - - - - - - + +Remove the out of date functional specification secton from the +documentation web application. (markt) + diff --git a/webapps/docs/funcspecs/fs-admin-apps.xml b/webapps/docs/funcspecs/fs-admin-apps.xml deleted file mode 100644 index 6e313ce..000 --- a/webapps/docs/funcspecs/fs-admin-apps.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - -]> - - - &project; - - -Craig McClanahan -Administrative Apps - Overall Requirements - - - - - - - - - - - - - -The purpose of this specification is to define high level requirements -for administrative applications that can be used to manage the operation -of a running Tomcat container. A variety of Access Methods -to the supported administrative functionality shall be supported, to -meet varying requirements: - -As A Scriptable Web Application - The existing -Manager web application provides a simple HTTP-based -interface for managing Tomcat through commands that are expressed -entirely through a request URI. This is useful in environments -where you wish to script administrative commands with tools that -can generate HTTP transactions. -As An HTML-Based Web Application - Use an HTML presentation -to provide a GUI-like user interface for humans to interact with the -administrative capabilities. -As SOAP-Based Web Services - The operational commands to -administer Tomcat are made available as web services that utilize -SOAP message formats. -As Java Management Extensions (JMX) Commands - The operational -commands to administer Tomcat are made available through JMX APIs, -for integration into management consoles that utilize them. -Other Remote Access APIs - Other remote access APIs, such -as JINI, RMI, and CORBA can also be utilized to access administrative -capabilities. - - -Underlying all of the access methods described above, it is assumed -that the actual operations are performed either directly on the -corresponding Catalina components (such as calling the -Deployer.deploy() method to deploy a new web application), -or through a "business logic" layer that can be shared across all of the -access methods. This approach minimizes the cost of adding new -administrative capabilities later -- it is only necessary to add the -corresponding business logic function, and then write adapters to it for -all desired access methods. - -The current status of this functional specification is -PROPOSED. It has not yet been discussed and -agreed to on the TOMCAT-DEV mailing list. - - - - - - -The implementation of this functionality depends on the following -external specifications: - -http://docs.oracle.com/javase/7/docs/technotes/guides/idl";> -Java IDL (for CORBA, included in the JDK) -http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html";> -Java Management Extensions -http://docs.oracle.com/javase/7/docs/technotes/guides/rmi";> -Remote Method Invocation (Included in the JDK) - - - - - - - -The implementation of this functionality shall conform to the -following requirements:
[tomcat] branch 8.5.x updated: Remove out of date functional spec docs
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 f064702 Remove out of date functional spec docs f064702 is described below commit f0647024c9d3b316b60dcc3b5d7b88e94f05cec1 Author: Mark Thomas AuthorDate: Fri Aug 14 10:45:29 2020 +0100 Remove out of date functional spec docs --- build.xml | 19 - webapps/docs/changelog.xml | 4 + webapps/docs/funcspecs/fs-admin-apps.xml| 299 webapps/docs/funcspecs/fs-admin-objects.xml | 485 --- webapps/docs/funcspecs/fs-admin-opers.xml | 342 -- webapps/docs/funcspecs/fs-default.xml | 270 --- webapps/docs/funcspecs/fs-jdbc-realm.xml| 266 --- webapps/docs/funcspecs/fs-jndi-realm.xml| 417 - webapps/docs/funcspecs/fs-memory-realm.xml | 253 -- webapps/docs/funcspecs/index.xml| 70 --- webapps/docs/funcspecs/mbean-names.xml | 698 webapps/docs/funcspecs/project.xml | 56 --- webapps/docs/index.xml | 3 - webapps/docs/monitoring.xml | 3 +- webapps/docs/project.xml| 1 - 15 files changed, 5 insertions(+), 3181 deletions(-) diff --git a/build.xml b/build.xml index 348487c..a1f5860 100644 --- a/build.xml +++ b/build.xml @@ -986,8 +986,6 @@ - - - - - - - - - - - - - channelSendOptions. Patch provided by Mitch Claborn. (schultz) + +Remove the out of date functional specification secton from the +documentation web application. (markt) + diff --git a/webapps/docs/funcspecs/fs-admin-apps.xml b/webapps/docs/funcspecs/fs-admin-apps.xml deleted file mode 100644 index 9903116..000 --- a/webapps/docs/funcspecs/fs-admin-apps.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - -]> - - - &project; - - -Craig McClanahan -Administrative Apps - Overall Requirements - - - - - - - - - - - - - -The purpose of this specification is to define high level requirements -for administrative applications that can be used to manage the operation -of a running Tomcat container. A variety of Access Methods -to the supported administrative functionality shall be supported, to -meet varying requirements: - -As A Scriptable Web Application - The existing -Manager web application provides a simple HTTP-based -interface for managing Tomcat through commands that are expressed -entirely through a request URI. This is useful in environments -where you wish to script administrative commands with tools that -can generate HTTP transactions. -As An HTML-Based Web Application - Use an HTML presentation -to provide a GUI-like user interface for humans to interact with the -administrative capabilities. -As SOAP-Based Web Services - The operational commands to -administer Tomcat are made available as web services that utilize -SOAP message formats. -As Java Management Extensions (JMX) Commands - The operational -commands to administer Tomcat are made available through JMX APIs, -for integration into management consoles that utilize them. -Other Remote Access APIs - Other remote access APIs, such -as JINI, RMI, and CORBA can also be utilized to access administrative -capabilities. - - -Underlying all of the access methods described above, it is assumed -that the actual operations are performed either directly on the -corresponding Catalina components (such as calling the -Deployer.deploy() method to deploy a new web application), -or through a "business logic" layer that can be shared across all of the -access methods. This approach minimizes the cost of adding new -administrative capabilities later -- it is only necessary to add the -corresponding business logic function, and then write adapters to it for -all desired access methods. - -The current status of this functional specification is -PROPOSED. It has not yet been discussed and -agreed to on the TOMCAT-DEV mailing list. - - - - - - -The implementation of this functionality depends on the following -external specifications: - -http://docs.oracle.com/javase/7/docs/technotes/guides/idl";> -Java IDL (for CORBA, included in the JDK) -http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html";> -Java Management Extensions -http://docs.oracle.com/javase/7/docs/technotes/guides/rmi";> -Remote Method Invocation (Included in the JDK) - - - - - - - -
[tomcat] branch 9.0.x updated: Remove out of date functional spec docs
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 acc8170 Remove out of date functional spec docs acc8170 is described below commit acc81702836ecbefadb3e389869c14b1ffa2d851 Author: Mark Thomas AuthorDate: Fri Aug 14 10:45:29 2020 +0100 Remove out of date functional spec docs --- build.xml | 19 - webapps/docs/changelog.xml | 4 + webapps/docs/funcspecs/fs-admin-apps.xml| 299 webapps/docs/funcspecs/fs-admin-objects.xml | 485 --- webapps/docs/funcspecs/fs-admin-opers.xml | 342 -- webapps/docs/funcspecs/fs-default.xml | 270 --- webapps/docs/funcspecs/fs-jdbc-realm.xml| 266 --- webapps/docs/funcspecs/fs-jndi-realm.xml| 417 - webapps/docs/funcspecs/fs-memory-realm.xml | 253 -- webapps/docs/funcspecs/index.xml| 70 --- webapps/docs/funcspecs/mbean-names.xml | 698 webapps/docs/funcspecs/project.xml | 56 --- webapps/docs/index.xml | 3 - webapps/docs/monitoring.xml | 3 +- webapps/docs/project.xml| 1 - 15 files changed, 5 insertions(+), 3181 deletions(-) diff --git a/build.xml b/build.xml index bd87179..343ae3b 100644 --- a/build.xml +++ b/build.xml @@ -1293,8 +1293,6 @@ - - - - - - - - - - - - - channelSendOptions. Patch provided by Mitch Claborn. (schultz) + +Remove the out of date functional specification secton from the +documentation web application. (markt) + diff --git a/webapps/docs/funcspecs/fs-admin-apps.xml b/webapps/docs/funcspecs/fs-admin-apps.xml deleted file mode 100644 index 9903116..000 --- a/webapps/docs/funcspecs/fs-admin-apps.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - -]> - - - &project; - - -Craig McClanahan -Administrative Apps - Overall Requirements - - - - - - - - - - - - - -The purpose of this specification is to define high level requirements -for administrative applications that can be used to manage the operation -of a running Tomcat container. A variety of Access Methods -to the supported administrative functionality shall be supported, to -meet varying requirements: - -As A Scriptable Web Application - The existing -Manager web application provides a simple HTTP-based -interface for managing Tomcat through commands that are expressed -entirely through a request URI. This is useful in environments -where you wish to script administrative commands with tools that -can generate HTTP transactions. -As An HTML-Based Web Application - Use an HTML presentation -to provide a GUI-like user interface for humans to interact with the -administrative capabilities. -As SOAP-Based Web Services - The operational commands to -administer Tomcat are made available as web services that utilize -SOAP message formats. -As Java Management Extensions (JMX) Commands - The operational -commands to administer Tomcat are made available through JMX APIs, -for integration into management consoles that utilize them. -Other Remote Access APIs - Other remote access APIs, such -as JINI, RMI, and CORBA can also be utilized to access administrative -capabilities. - - -Underlying all of the access methods described above, it is assumed -that the actual operations are performed either directly on the -corresponding Catalina components (such as calling the -Deployer.deploy() method to deploy a new web application), -or through a "business logic" layer that can be shared across all of the -access methods. This approach minimizes the cost of adding new -administrative capabilities later -- it is only necessary to add the -corresponding business logic function, and then write adapters to it for -all desired access methods. - -The current status of this functional specification is -PROPOSED. It has not yet been discussed and -agreed to on the TOMCAT-DEV mailing list. - - - - - - -The implementation of this functionality depends on the following -external specifications: - -http://docs.oracle.com/javase/7/docs/technotes/guides/idl";> -Java IDL (for CORBA, included in the JDK) -http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html";> -Java Management Extensions -http://docs.oracle.com/javase/7/docs/technotes/guides/rmi";> -Remote Method Invocation (Included in the JDK) - - - - - - -
[tomcat] branch master updated: Remove out of date functional spec docs
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 70338a0 Remove out of date functional spec docs 70338a0 is described below commit 70338a0e8094c84b6387b12a2965b497a03de716 Author: Mark Thomas AuthorDate: Fri Aug 14 10:45:29 2020 +0100 Remove out of date functional spec docs --- build.xml | 19 - webapps/docs/changelog.xml | 4 + webapps/docs/funcspecs/fs-admin-apps.xml| 299 webapps/docs/funcspecs/fs-admin-objects.xml | 485 --- webapps/docs/funcspecs/fs-admin-opers.xml | 342 -- webapps/docs/funcspecs/fs-default.xml | 270 --- webapps/docs/funcspecs/fs-jdbc-realm.xml| 266 --- webapps/docs/funcspecs/fs-jndi-realm.xml| 417 - webapps/docs/funcspecs/fs-memory-realm.xml | 253 -- webapps/docs/funcspecs/index.xml| 70 --- webapps/docs/funcspecs/mbean-names.xml | 698 webapps/docs/funcspecs/project.xml | 56 --- webapps/docs/index.xml | 3 - webapps/docs/monitoring.xml | 3 +- webapps/docs/project.xml| 1 - 15 files changed, 5 insertions(+), 3181 deletions(-) diff --git a/build.xml b/build.xml index 41441e4..0613b1f 100644 --- a/build.xml +++ b/build.xml @@ -1303,8 +1303,6 @@ - - - - - - - - - - - - - channelSendOptions. Patch provided by Mitch Claborn. (schultz) + +Remove the out of date functional specification secton from the +documentation web application. (markt) + diff --git a/webapps/docs/funcspecs/fs-admin-apps.xml b/webapps/docs/funcspecs/fs-admin-apps.xml deleted file mode 100644 index 9903116..000 --- a/webapps/docs/funcspecs/fs-admin-apps.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - -]> - - - &project; - - -Craig McClanahan -Administrative Apps - Overall Requirements - - - - - - - - - - - - - -The purpose of this specification is to define high level requirements -for administrative applications that can be used to manage the operation -of a running Tomcat container. A variety of Access Methods -to the supported administrative functionality shall be supported, to -meet varying requirements: - -As A Scriptable Web Application - The existing -Manager web application provides a simple HTTP-based -interface for managing Tomcat through commands that are expressed -entirely through a request URI. This is useful in environments -where you wish to script administrative commands with tools that -can generate HTTP transactions. -As An HTML-Based Web Application - Use an HTML presentation -to provide a GUI-like user interface for humans to interact with the -administrative capabilities. -As SOAP-Based Web Services - The operational commands to -administer Tomcat are made available as web services that utilize -SOAP message formats. -As Java Management Extensions (JMX) Commands - The operational -commands to administer Tomcat are made available through JMX APIs, -for integration into management consoles that utilize them. -Other Remote Access APIs - Other remote access APIs, such -as JINI, RMI, and CORBA can also be utilized to access administrative -capabilities. - - -Underlying all of the access methods described above, it is assumed -that the actual operations are performed either directly on the -corresponding Catalina components (such as calling the -Deployer.deploy() method to deploy a new web application), -or through a "business logic" layer that can be shared across all of the -access methods. This approach minimizes the cost of adding new -administrative capabilities later -- it is only necessary to add the -corresponding business logic function, and then write adapters to it for -all desired access methods. - -The current status of this functional specification is -PROPOSED. It has not yet been discussed and -agreed to on the TOMCAT-DEV mailing list. - - - - - - -The implementation of this functionality depends on the following -external specifications: - -http://docs.oracle.com/javase/7/docs/technotes/guides/idl";> -Java IDL (for CORBA, included in the JDK) -http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html";> -Java Management Extensions -http://docs.oracle.com/javase/7/docs/technotes/guides/rmi";> -Remote Method Invocation (Included in the JDK) - - - - - -
