[jbossweb-commits] JBossWeb SVN: r2056 - trunk/src/main/java/org/apache/catalina/connector.
Author: remy.maucherat(a)jboss.com
Date: 2012-07-26 10:09:13 -0400 (Thu, 26 Jul 2012)
New Revision: 2056
Modified:
trunk/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
Log:
Probable fix for allowed host feature.
Modified: trunk/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-07-26
12:58:36 UTC (rev 2055)
+++ trunk/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-07-26
14:09:13 UTC (rev 2056)
@@ -55,6 +55,7 @@
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
+import org.apache.catalina.Host;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
@@ -547,11 +548,13 @@
res.setMessage("Context not mapped");
return false;
}
- if (connector.getAllowedHosts() != null
- &&
!connector.getAllowedHosts().contains(request.getMappingData().host)) {
- res.setStatus(403);
- res.setMessage("Host access is forbidden through this connector");
- return false;
+ if (connector.getAllowedHosts() != null) {
+ Host host = (Host) request.getMappingData().host;
+ if (!connector.getAllowedHosts().contains(host.getName())) {
+ res.setStatus(403);
+ res.setMessage("Host access is forbidden through this
connector");
+ return false;
+ }
}
// Filter trace method