This is an automated email from the ASF dual-hosted git repository. isapir 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 e3aa8d0 BZ-64797 Aligned Host-Manager manager.xml with Manager context.xml e3aa8d0 is described below commit e3aa8d0b83da98ededaf8a30d721131926239891 Author: Igal Sapir <isa...@apache.org> AuthorDate: Tue Oct 20 22:54:00 2020 -0700 BZ-64797 Aligned Host-Manager manager.xml with Manager context.xml --- RUNNING.txt | 1 + java/org/apache/catalina/manager/host/HostManagerServlet.java | 2 +- webapps/docs/changelog.xml | 4 ++++ webapps/host-manager/{ => WEB-INF}/manager.xml | 6 +++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/RUNNING.txt b/RUNNING.txt index 02283a3..a4b2d76 100644 --- a/RUNNING.txt +++ b/RUNNING.txt @@ -312,6 +312,7 @@ The file will look like the following: antiResourceLocking="false" privileged="true" > <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="127\.0\.0\.1" /> + <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/> </Context> See Deployer chapter in User Guide and Context and Host chapters in the diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java index a1e10da..f25dbff 100644 --- a/java/org/apache/catalina/manager/host/HostManagerServlet.java +++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java @@ -394,7 +394,7 @@ public class HostManagerServlet "hostManagerServlet.configBaseCreateFail", name)); return; } - try (InputStream is = getServletContext().getResourceAsStream("/manager.xml")) { + try (InputStream is = getServletContext().getResourceAsStream("/WEB-INF/manager.xml")) { Path dest = (new File(configBaseFile, "manager.xml")).toPath(); Files.copy(is, dest); } catch (IOException e) { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index db32630..85220d4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -120,6 +120,10 @@ <fix> <bug>64799</bug>: Added missing resources to host-manager web app. (isapir) </fix> + <fix> + <bug>64797</bug>: Align manager.xml template file in Host-Manager with + context.xml of real Manager web application. (isapir) + </fix> </changelog> </subsection> </section> diff --git a/webapps/host-manager/manager.xml b/webapps/host-manager/WEB-INF/manager.xml similarity index 69% rename from webapps/host-manager/manager.xml rename to webapps/host-manager/WEB-INF/manager.xml index 2510acb..a26dca6 100644 --- a/webapps/host-manager/manager.xml +++ b/webapps/host-manager/WEB-INF/manager.xml @@ -22,5 +22,9 @@ --> <Context docBase="${catalina.home}/webapps/manager" privileged="true" antiResourceLocking="false" > - + <CookieProcessor className="org.apache.tomcat.util.http.Rfc6265CookieProcessor" + sameSiteCookies="strict" /> + <Valve className="org.apache.catalina.valves.RemoteAddrValve" + allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" /> + <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/> </Context> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org