ASF Bugzilla – Attachment 24505 Details for
Bug 47330
proposal : port of mod_remoteip in Tomcat as RemoteIpValve
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
logging, naming and javadoc patch of RemoteIpFilter
remoteIpFilter.patch (text/plain), 7.57 KB, created by
Cyrille Le Clerc
on 2009-11-08 15:50:42 UTC
(
hide
)
Description:
logging, naming and javadoc patch of RemoteIpFilter
Filename:
MIME Type:
Creator:
Cyrille Le Clerc
Created:
2009-11-08 15:50:42 UTC
Size:
7.57 KB
patch
obsolete
>Index: java/org/apache/catalina/filters/RemoteIpFilter.java >=================================================================== >--- java/org/apache/catalina/filters/RemoteIpFilter.java (revision 833729) >+++ java/org/apache/catalina/filters/RemoteIpFilter.java (working copy) >@@ -156,8 +156,8 @@ > * </p> > * <code><pre> > * <filter> >- * <filter-name>XForwardedFilter</filter-name> >- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class> >+ * <filter-name>RemoteIpFilter</filter-name> >+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class> > * <init-param> > * <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value> > * </init-param> >@@ -173,7 +173,7 @@ > * </filter> > * > * <filter-mapping> >- * <filter-name>XForwardedFilter</filter-name> >+ * <filter-name>RemoteIpFilter</filter-name> > * <url-pattern>/*</url-pattern> > * <dispatcher>REQUEST</dispatcher> > * </filter-mapping></pre></code> >@@ -182,8 +182,8 @@ > * <table border="1"> > * <tr> > * <th>property</th> >- * <th>Value Before XForwardedFilter</th> >- * <th>Value After XForwardedFilter</th> >+ * <th>Value Before RemoteIpFilter</th> >+ * <th>Value After RemoteIpFilter</th> > * </tr> > * <tr> > * <td>request.remoteAddr</td> >@@ -229,12 +229,12 @@ > * <strong>Sample with trusted proxies</strong> > * </p> > * <p> >- * XForwardedFilter configuration: >+ * RemoteIpFilter configuration: > * </p> > * <code><pre> > * <filter> >- * <filter-name>XForwardedFilter</filter-name> >- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class> >+ * <filter-name>RemoteIpFilter</filter-name> >+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class> > * <init-param> > * <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value> > * </init-param> >@@ -250,7 +250,7 @@ > * </filter> > * > * <filter-mapping> >- * <filter-name>XForwardedFilter</filter-name> >+ * <filter-name>RemoteIpFilter</filter-name> > * <url-pattern>/*</url-pattern> > * <dispatcher>REQUEST</dispatcher> > * </filter-mapping></pre></code> >@@ -259,8 +259,8 @@ > * <table border="1"> > * <tr> > * <th>property</th> >- * <th>Value Before XForwardedFilter</th> >- * <th>Value After XForwardedFilter</th> >+ * <th>Value Before RemoteIpFilter</th> >+ * <th>Value After RemoteIpFilter</th> > * </tr> > * <tr> > * <td>request.remoteAddr</td> >@@ -286,12 +286,12 @@ > * <strong>Sample with internal and trusted proxies</strong> > * </p> > * <p> >- * XForwardedFilter configuration: >+ * RemoteIpFilter configuration: > * </p> > * <code><pre> > * <filter> >- * <filter-name>XForwardedFilter</filter-name> >- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class> >+ * <filter-name>RemoteIpFilter</filter-name> >+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class> > * <init-param> > * <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value> > * </init-param> >@@ -307,7 +307,7 @@ > * </filter> > * > * <filter-mapping> >- * <filter-name>XForwardedFilter</filter-name> >+ * <filter-name>RemoteIpFilter</filter-name> > * <url-pattern>/*</url-pattern> > * <dispatcher>REQUEST</dispatcher> > * </filter-mapping></pre></code> >@@ -316,8 +316,8 @@ > * <table border="1"> > * <tr> > * <th>property</th> >- * <th>Value Before XForwardedFilter</th> >- * <th>Value After XForwardedFilter</th> >+ * <th>Value Before RemoteIpFilter</th> >+ * <th>Value After RemoteIpFilter</th> > * </tr> > * <tr> > * <td>request.remoteAddr</td> >@@ -344,12 +344,12 @@ > * <strong>Sample with an untrusted proxy</strong> > * </p> > * <p> >- * XForwardedFilter configuration: >+ * RemoteIpFilter configuration: > * </p> > * <code><pre> > * <filter> >- * <filter-name>XForwardedFilter</filter-name> >- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class> >+ * <filter-name>RemoteIpFilter</filter-name> >+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class> > * <init-param> > * <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value> > * </init-param> >@@ -365,7 +365,7 @@ > * </filter> > * > * <filter-mapping> >- * <filter-name>XForwardedFilter</filter-name> >+ * <filter-name>RemoteIpFilter</filter-name> > * <url-pattern>/*</url-pattern> > * <dispatcher>REQUEST</dispatcher> > * </filter-mapping></pre></code> >@@ -374,8 +374,8 @@ > * <table border="1"> > * <tr> > * <th>property</th> >- * <th>Value Before XForwardedFilter</th> >- * <th>Value After XForwardedFilter</th> >+ * <th>Value Before RemoteIpFilter</th> >+ * <th>Value After RemoteIpFilter</th> > * </tr> > * <tr> > * <td>request.remoteAddr</td> >@@ -580,7 +580,7 @@ > > protected static final String HTTPS_SERVER_PORT_PARAMETER = "httpsServerPort"; > >- protected static final String INTERNAL_PROXIES_PARAMETER = "allowedInternalProxies"; >+ protected static final String INTERNAL_PROXIES_PARAMETER = "internalProxies"; > > /** > * Logger >@@ -756,13 +756,13 @@ > > if (log.isDebugEnabled()) { > log.debug("Incoming request " + request.getRequestURI() + " with originalRemoteAddr '" + request.getRemoteAddr() >- + "', originalRemoteHost='" + request.getRemoteHost() + "', originalSecure='" + request.isSecure() >- + "', originalScheme='" + request.getScheme() + "', original[" + remoteIPHeader + "]='" >- + request.getHeader(remoteIPHeader) + ", original[" + protocolHeader + "]='" >- + request.getHeader(protocolHeader) + "' will be seen as newRemoteAddr='" + xRequest.getRemoteAddr() >- + "', newRemoteHost='" + xRequest.getRemoteHost() + "', newScheme='" + xRequest.getScheme() + "', newSecure='" >- + xRequest.isSecure() + "', new[" + remoteIPHeader + "]='" + xRequest.getHeader(remoteIPHeader) + ", new[" >- + proxiesHeader + "]='" + xRequest.getHeader(proxiesHeader) + "'"); >+ + "', originalRemoteHost='" + request.getRemoteHost() + "', originalSecure='" + request.isSecure() >+ + "', originalScheme='" + request.getScheme() + "', original[" + remoteIPHeader + "]='" >+ + request.getHeader(remoteIPHeader) + ", original[" + protocolHeader + "]='" >+ + (protocolHeader == null ? null : request.getHeader(protocolHeader)) + "' will be seen as newRemoteAddr='" >+ + xRequest.getRemoteAddr() + "', newRemoteHost='" + xRequest.getRemoteHost() + "', newScheme='" >+ + xRequest.getScheme() + "', newSecure='" + xRequest.isSecure() + "', new[" + remoteIPHeader + "]='" >+ + xRequest.getHeader(remoteIPHeader) + ", new[" + proxiesHeader + "]='" + xRequest.getHeader(proxiesHeader) + "'"); > } > chain.doFilter(xRequest, response); > } else {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 47330
:
23772
|
23773
|
23970
|
24455
|
24465
|
24471
| 24505