Make Tomcat allow a .JAR file that contains a webapp #146
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trustin
force-pushed
the
tomcat_allow_jar_webapp
branch
2 times, most recently
from
300b45c
to
49b9991
Compare
| for (Enumeration<JarEntry> i = jar.entries(); i.hasMoreElements();) { | ||
| final JarEntry e = i.nextElement(); | ||
| if (!e.isDirectory()) { | ||
| numEntries++; |
There was a problem hiding this comment.
I asked you for check intend. It's for check all entry is fine?
I think we also possible return true this line , if this method just checks jar is not empty.
There was a problem hiding this comment.
Yes, I wanted to check if all entries are OK, but I guess it's not the responsibility of this method. Let me update it.
|
LGTM! |
Motivation: 1) Tomcat does not allow us to use a JAR file whose extention is not '.war' as a web application: - https://github.com/apache/tomcat/blob/4166a2b96f482f8bf7b0024836dab53d3594710e/java/org/apache/catalina/webresources/StandardRoot.java#L722 2) When TomcatService is created via forClassPath(Class, String), the service construction fails if the specified class is packaged in a .JAR file. forClassPath(Class, String) currently requires the specified class to exist in a directory, which is not always true. Modifications: - Replace Tomcat's StandardRoot with ArmeriaWebResourceRoot to accept any JAR files - Add JarSubsetResourceSet which allows a user to specify non-root web application path in a JAR file - Note that the upstream JarResourceSet is used unless specified explicitly. - Add TomcatConfig.jarRoot() - Add TomcatUtil.isZip() to determine if the specified path is really a ZIP-based archive file - Add the tests for the issue (2) in the Motivations section Result: A user can use TomcatService.forClassPath(Class, String) even when the specified class is packaged in a JAR file.
trustin
force-pushed
the
tomcat_allow_jar_webapp
branch
from
49b9991
to
10d8046
Compare
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
'.war' as a web application:
service construction fails if the specified class is packaged in a .JAR
file. forClassPath(Class, String) currently requires the specified class
to exist in a directory, which is not always true.
Modifications:
any JAR files
application path in a JAR file
explicitly.
JAR-compatible archive file
Result:
A user can use TomcatService.forClassPath(Class, String) even when the
specified class is packaged in a JAR file.