This is an automated email from the ASF dual-hosted git repository. isapir 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 04c7bf0 BZ-64797 Aligned Host-Manager manager.xml with Manager context.xml 04c7bf0 is described below commit 04c7bf00144e38c7b1128e4bb5fed310a1ccfec8 Author: Igal Sapir <isa...@apache.org> AuthorDate: Sun Oct 18 10:45:11 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/host-manager/{ => WEB-INF}/manager.xml | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RUNNING.txt b/RUNNING.txt index c71620b..9f9b4b2 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 7ed209f..3c122e5 100644 --- a/java/org/apache/catalina/manager/host/HostManagerServlet.java +++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java @@ -395,7 +395,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/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