Author: markt
Date: Wed Aug 28 10:47:08 2024
New Revision: 1920248

URL: http://svn.apache.org/viewvc?rev=1920248&view=rev
Log:
Restructure

Modified:
    tomcat/site/trunk/docs/security-model.html
    tomcat/site/trunk/xdocs/security-model.xml

Modified: tomcat/site/trunk/docs/security-model.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-model.html?rev=1920248&r1=1920247&r2=1920248&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-model.html (original)
+++ tomcat/site/trunk/docs/security-model.html Wed Aug 28 10:47:08 2024
@@ -1,39 +1,79 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; 
charset=UTF-8"><meta name="viewport" content="width=device-width, 
initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" 
type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" 
type="text/css"><title>Apache Tomcat&reg; - Security Model</title><meta 
name="author" content="Apache Tomcat Project"><script 
src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div
 id="wrapper"><header id="header"><div class="clearfix"><div 
class="menu-toggler pull-left" tabindex="1"><div 
class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a><h1 class="pull-left">Apache 
Tomcat<sup>&reg;</sup></h1><div class="asf-logos pull-right"><a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img src="https://www.apache.org/images/SupportApache-smal
 l.png" class="support-asf" alt="Support Apache"></a><a 
href="http://www.apache.org/"; target="_blank" class="pull-left"><img 
src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software 
Foundation"></a></div></div></header><main id="middle"><div><div 
id="mainLeft"><div id="nav-wrapper"><form 
action="https://www.google.com/search"; method="get"><div 
class="searchbox"><input value="tomcat.apache.org" name="sitesearch" 
type="hidden"><input aria-label="Search text" placeholder="Search&hellip;" 
required="required" name="q" id="query" 
type="search"><button>GO</button></div></form><div class="asfevents"><a 
class="acevent" data-format="square" 
data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a 
href="./index.html">Home</a></li><li><a 
href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven 
Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a 
href="./whichversion.html">Which version?</a></li><li><a 
href="https://tomcat.apache.org/download
 -11.cgi">Tomcat 11 (beta)</a></li><li><a 
href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10</a></li><li><a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a 
href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EE</a></li><li><a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a></li><li><a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat 
Native</a></li><li><a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a
 href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (beta)</a></li><li><a 
href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a 
href="./upgrading.html">Upgrading</a></li><li><a 
href="./connectors-doc/index.html">Tomcat Connectors</a></li><li><a 
href="./native-doc/index.htm
 l">Tomcat Native 2</a></li><li><a href="./native-1.3-doc/index.html">Tomcat 
Native 1.3</a></li><li><a 
href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a 
href="./migration.html">Migration Guide</a></li><li><a 
href="./presentations.html">Presentations</a></li><li><a 
href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a
 href="./security.html">Security Reports</a></li><li><a 
href="./findhelp.html">Find help</a></li><li><a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a
 href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug 
Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get 
Involved</h2><ul><li><a href="./getinvolved.html">Overview</a></li><li><a 
href="./source.html">Source code</a></li><li><a 
href="./ci.html">Buildbot</a></li><li><a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a 
hre
 f="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a 
href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a 
href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a
 href="./whoweare.html">Who We Are</a></li><li><a 
href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a
 href="./heritage.html">Heritage</a></li><li><a 
href="http://www.apache.org";>Apache Home</a></li><li><a 
href="./resources.html">Resources</a></li><li><a 
href="./contact.html">Contact</a></li><li><a 
href="./legal.html">Legal</a></li><li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li><li><a
 href="https://www.apache.org/foundation/contributing.html";>Support 
Apache</a></li><li><a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 href="http://www.apache.org/foundation/
 thanks.html">Thanks</a></li><li><a 
href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div
 id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 
id="Security_model_for_Apache_Tomcat">Security model for Apache Tomcat</h3><div 
class="text">
 
-    <p>This security model is currently in DRAFT from.</p>
+    <div class="subsection"><h4 id="Introduction">Introduction</h4><div 
class="text">
 
-    <p>The Apache Tomcat<sup>&reg;</sup> Security Team reviews reported
-       vulnerabilities against the following security model:</p>
+      <p>This security model is currently in DRAFT from.</p>
 
-    <ul>
-      <li>Users with the ability to modify Tomcat and/or application
-          configuration files and/or binaries are trusted.</li>
-      <li>Deployed web applications are trusted.</li>
-      <li>Vulnerabilities in deployed web applications are application
-          vulnerabilities, not Tomcat vulnerabilities.</li>
-      <li>Data received by an HTTP connector is untrusted.</li>
-      <li>Data received by an AJP connector is untrusted apart from:
-        <ul>
-          <li>The standard request attributes and any arbitrary request
-              attributes permitted by
-              <code>allowedRequestAttributesPattern</code></li>
-        </ul>
-      </li>
-      <li>JMX is an administrative interface and users with access to it are
-          trusted.</li>
-      <li>The Manager and Host manager web applications are administrative
-          interfaces and users with access to either of them are considered to
-          be trusted.</li>
-      <li>Cluster traffic requires a trusted network unless the
-          EncryptInterceptor is used in which case confidentiality and 
integrity
-          but not availability will be protected.</li>
-      <li>Multi-cast cluster membership always requires a trusted network.</li>
-      <li>Security sensitive information will not be logged with the default
-          configuration apart from anything included in the request URI.</li>
-      <li>Security sensitive information may be logged with modified logging
-          configurations, particularly if debug logging is enabled.</li>
-    </ul>
+      <p>The Apache Tomcat<sup>&reg;</sup> Security Team reviews reported
+         vulnerabilities against the following security model:</p>
+
+    </div></div>
+
+    <div class="subsection"><h4 id="Administrative_users">Administrative 
users</h4><div class="text">
+
+      <p>Administrative users are always considered to be trusted. Reports that
+         require attacker access to and/or control of any of the following to
+         succeed will be rejected:</p>
+
+      <ul>
+        <li>The Manager or Host Manager applications provided with Tomcat</li>
+        <li>Tomcat configuration files</li>
+        <li>Tomcat binaries and/or scripts</li>
+        <li>The JMX API (local or remote)</li>
+        <li>The Java Attach API or any other debugging interface</li>
+      </ul>
+
+    </div></div>
+
+    <div class="subsection"><h4 id="Web_applications">Web 
applications</h4><div class="text">
+
+      <p>Web applications deployed to Tomcat are considered to be trusted.
+         Vulnerabilities in user provided web applications are application
+         vulnerabilities, not Tomcat vulnerabilities.</p>
+
+      <p>Reports of vulnerabilities in the web applications included with
+         Tomcat will be accepted. Reporters should review the comments about
+         each of the provided applications in the security considerations
+         section of the documentation for the version under test.</p>
+
+    </div></div>
+
+    <div class="subsection"><h4 id="Connectors">Connectors</h4><div 
class="text">
+
+      <p>Data received via a Connector, regardless of protocol, is considered 
to
+         be untrusted apart from:</p>
+
+      <ul>
+        <li>The standard request attributes and any arbitrary request 
attributes
+            permitted by <code>allowedRequestAttributesPattern</code> for an 
AJP
+            connector</li>
+        <li>HTTP headers processed by a <code>RemoteIpValve</code>,
+            <code>SSLValve</code>, equivalent filters or any similar
+            functionality.</li>
+      </ul>
+
+    </div></div>
+
+    <div class="subsection"><h4 id="Clustering">Clustering</h4><div 
class="text">
+
+      <p>Cluster traffic requires a trusted network unless the
+         <code>EncryptInterceptor</code> is used in which case confidentiality
+         and integrity will be protected but not availability.</p>
+
+      <p>Multicast cluster membership always requires a trusted network.</p>
+
+    </div></div>
+
+    <div class="subsection"><h4 id="Logging">Logging</h4><div class="text">
+
+      <p>Security sensitive information will not be logged with the default
+         configuration apart from anything included in the request URI.</p>
+
+      <p>Security sensitive information may be logged with modified logging
+         configurations, particularly if debug logging is enabled.</p>
+
+    </div></div>
 
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2024, The Apache Software Foundation

Modified: tomcat/site/trunk/xdocs/security-model.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-model.xml?rev=1920248&r1=1920247&r2=1920248&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-model.xml (original)
+++ tomcat/site/trunk/xdocs/security-model.xml Wed Aug 28 10:47:08 2024
@@ -9,39 +9,79 @@
 <body>
   <section name="Security model for Apache Tomcat">
 
-    <p>This security model is currently in DRAFT from.</p>
+    <subsection name="Introduction">
 
-    <p>The Apache Tomcat<sup>&#174;</sup> Security Team reviews reported
-       vulnerabilities against the following security model:</p>
+      <p>This security model is currently in DRAFT from.</p>
 
-    <ul>
-      <li>Users with the ability to modify Tomcat and/or application
-          configuration files and/or binaries are trusted.</li>
-      <li>Deployed web applications are trusted.</li>
-      <li>Vulnerabilities in deployed web applications are application
-          vulnerabilities, not Tomcat vulnerabilities.</li>
-      <li>Data received by an HTTP connector is untrusted.</li>
-      <li>Data received by an AJP connector is untrusted apart from:
-        <ul>
-          <li>The standard request attributes and any arbitrary request
-              attributes permitted by
-              <code>allowedRequestAttributesPattern</code></li>
-        </ul>
-      </li>
-      <li>JMX is an administrative interface and users with access to it are
-          trusted.</li>
-      <li>The Manager and Host manager web applications are administrative
-          interfaces and users with access to either of them are considered to
-          be trusted.</li>
-      <li>Cluster traffic requires a trusted network unless the
-          EncryptInterceptor is used in which case confidentiality and 
integrity
-          but not availability will be protected.</li>
-      <li>Multi-cast cluster membership always requires a trusted network.</li>
-      <li>Security sensitive information will not be logged with the default
-          configuration apart from anything included in the request URI.</li>
-      <li>Security sensitive information may be logged with modified logging
-          configurations, particularly if debug logging is enabled.</li>
-    </ul>
+      <p>The Apache Tomcat<sup>&#174;</sup> Security Team reviews reported
+         vulnerabilities against the following security model:</p>
+
+    </subsection>
+
+    <subsection name="Administrative users">
+
+      <p>Administrative users are always considered to be trusted. Reports that
+         require attacker access to and/or control of any of the following to
+         succeed will be rejected:</p>
+
+      <ul>
+        <li>The Manager or Host Manager applications provided with Tomcat</li>
+        <li>Tomcat configuration files</li>
+        <li>Tomcat binaries and/or scripts</li>
+        <li>The JMX API (local or remote)</li>
+        <li>The Java Attach API or any other debugging interface</li>
+      </ul>
+
+    </subsection>
+
+    <subsection name="Web applications">
+
+      <p>Web applications deployed to Tomcat are considered to be trusted.
+         Vulnerabilities in user provided web applications are application
+         vulnerabilities, not Tomcat vulnerabilities.</p>
+
+      <p>Reports of vulnerabilities in the web applications included with
+         Tomcat will be accepted. Reporters should review the comments about
+         each of the provided applications in the security considerations
+         section of the documentation for the version under test.</p>
+
+    </subsection>
+
+    <subsection name="Connectors">
+
+      <p>Data received via a Connector, regardless of protocol, is considered 
to
+         be untrusted apart from:</p>
+
+      <ul>
+        <li>The standard request attributes and any arbitrary request 
attributes
+            permitted by <code>allowedRequestAttributesPattern</code> for an 
AJP
+            connector</li>
+        <li>HTTP headers processed by a <code>RemoteIpValve</code>,
+            <code>SSLValve</code>, equivalent filters or any similar
+            functionality.</li>
+      </ul>
+
+    </subsection>
+
+    <subsection name="Clustering">
+
+      <p>Cluster traffic requires a trusted network unless the
+         <code>EncryptInterceptor</code> is used in which case confidentiality
+         and integrity will be protected but not availability.</p>
+
+      <p>Multicast cluster membership always requires a trusted network.</p>
+
+    </subsection>
+
+    <subsection name="Logging">
+
+      <p>Security sensitive information will not be logged with the default
+         configuration apart from anything included in the request URI.</p>
+
+      <p>Security sensitive information may be logged with modified logging
+         configurations, particularly if debug logging is enabled.</p>
+
+    </subsection>
 
   </section>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to