Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1785 Fix Javadoc and vhost warn logic 

Signed-off-by: Steve Bolton <steve@boltn.com>
This commit is contained in:
Steve Bolton 2018-05-04 02:01:04 -04:00
parent 03d96ae538
commit 7e0afae70b
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -318,12 +318,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
* matching virtual host name. * matching virtual host name.
* *
* @param vhosts * @param vhosts
* Array of virtual hosts that this context responds to. A null host name or null/empty array means any hostname is acceptable. Host names may be * Array of virtual hosts that this context responds to. A null/empty array means any hostname is acceptable. Host names may be String
* String representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed * representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed with
* with '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is * '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is just
* just '@connectorname' it will match if that connector was used but to match legacy behavior it will only check other '@connectorname' only * '@connectorname' it will match any host if that connector was used. Note - In previous versions if one or more connectorname only entries existed
* entries for matches. A warning will be logged and host entries will be removed if both host and connector entries are used. * and non of the connectors matched the handler would not match regardless of any hostname entries. If there is one or more connectorname only
* * entries and one or more host only entries but no hostname and connector entries we assume the old behavior and will log a warning. The warning
* can be removed by removing the host entries that were previously being ignored, or modifying to include a hostname and connectorname entry.
*/ */
public void setVirtualHosts(String[] vhosts) public void setVirtualHosts(String[] vhosts)
{ {
@ -336,19 +337,21 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
{ {
boolean hostMatch = false; boolean hostMatch = false;
boolean connectorHostMatch = false;
_vhosts = new String[vhosts.length]; _vhosts = new String[vhosts.length];
_vconnectors = new String[vhosts.length]; _vconnectors = new String[vhosts.length];
_vhostswildcard = new boolean[vhosts.length]; _vhostswildcard = new boolean[vhosts.length];
ArrayList<Integer> connectorOnlyIndexes = null; ArrayList<Integer> connectorOnlyIndexes = null;
for (int i = 0; i < vhosts.length; i++) for (int i = 0; i < vhosts.length; i++)
{ {
boolean connectorMatch = false;
_vhosts[i] = vhosts[i]; _vhosts[i] = vhosts[i];
if (vhosts[i] == null) if (vhosts[i] == null)
continue; continue;
int connectorIndex = _vhosts[i].indexOf('@'); int connectorIndex = _vhosts[i].indexOf('@');
if (connectorIndex >= 0) if (connectorIndex >= 0)
{ {
connectorMatch = true;
_vconnectors[i] = _vhosts[i].substring(connectorIndex + 1); _vconnectors[i] = _vhosts[i].substring(connectorIndex + 1);
_vhosts[i] = _vhosts[i].substring(0,connectorIndex); _vhosts[i] = _vhosts[i].substring(0,connectorIndex);
if (connectorIndex == 0) if (connectorIndex == 0)
@ -367,16 +370,18 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
if (_vhosts[i].isEmpty()) if (_vhosts[i].isEmpty())
_vhosts[i] = null; _vhosts[i] = null;
else else
{
hostMatch = true; hostMatch = true;
connectorHostMatch = connectorHostMatch || connectorMatch;
}
_vhosts[i] = normalizeHostname(_vhosts[i]); _vhosts[i] = normalizeHostname(_vhosts[i]);
} }
if (connectorOnlyIndexes != null && hostMatch) if (connectorOnlyIndexes != null && hostMatch && !connectorHostMatch)
{ {
LOG.warn( LOG.warn(
"ContextHandler {} has a connector only entry e.g. \"@connector\" and one or more host entries. \n" "ContextHandler {} has a connector only entry e.g. \"@connector\" and one or more host only entries. \n"
+ "The host entries will be ignored. To clear this warning remove host entries or Use host@connector syntax to match a host for an specific connector", + "The host entries will be ignored to match legacy behavior. To clear this warning remove the host entries or update to us at least one host@connector syntax entry that will match a host for an specific connector",
Arrays.asList(vhosts)); Arrays.asList(vhosts));
String[] filteredHosts = new String[connectorOnlyIndexes.size()]; String[] filteredHosts = new String[connectorOnlyIndexes.size()];
for (int i = 0; i < connectorOnlyIndexes.size(); i++) for (int i = 0; i < connectorOnlyIndexes.size(); i++)
@ -394,12 +399,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
* Either set virtual hosts or add to an existing set of virtual hosts. * Either set virtual hosts or add to an existing set of virtual hosts.
* *
* @param virtualHosts * @param virtualHosts
* Array of virtual hosts that this context responds to. A null host name or null/empty array means any hostname is acceptable. Host names may be * Array of virtual hosts that this context responds to. A null/empty array means any hostname is acceptable. Host names may be String
* String representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed * representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed with
* with '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is * '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is just
* just '@connectorname' it will match if that connector was used but to match legacy behavior it will only check other '@connectorname' only * '@connectorname' it will match any host if that connector was used. Note - In previous versions if one or more connectorname only entries existed
* entries for matches. A warning will be logged and host entries will be removed if both host and connector entries are used. * and non of the connectors matched the handler would not match regardless of any hostname entries. If there is one or more connectorname only
* * entries and one or more host only entries but no hostname and connector entries we assume the old behavior and will log a warning. The warning
* can be removed by removing the host entries that were previously being ignored, or modifying to include a hostname and connectorname entry.
*/ */
public void addVirtualHosts(String[] virtualHosts) public void addVirtualHosts(String[] virtualHosts)
{ {
@ -424,12 +430,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
* Removes an array of virtual host entries, if this removes all entries the _vhosts will be set to null * Removes an array of virtual host entries, if this removes all entries the _vhosts will be set to null
* *
* @param virtualHosts * @param virtualHosts
* Array of virtual hosts that this context responds to. A null host name or null/empty array means any hostname is acceptable. Host names may be * Array of virtual hosts that this context responds to. A null/empty array means any hostname is acceptable. Host names may be String
* String representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed * representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed with
* with '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is * '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is just
* just '@connectorname' it will match if that connector was used but to match legacy behavior it will only check other '@connectorname' only * '@connectorname' it will match any host if that connector was used. Note - In previous versions if one or more connectorname only entries existed
* entries for matches. A warning will be logged and host entries will be removed if both host and connector entries are used. * and non of the connectors matched the handler would not match regardless of any hostname entries. If there is one or more connectorname only
* * entries and one or more host only entries but no hostname and connector entries we assume the old behavior and will log a warning. The warning
* can be removed by removing the host entries that were previously being ignored, or modifying to include a hostname and connectorname entry.
*/ */
public void removeVirtualHosts(String[] virtualHosts) public void removeVirtualHosts(String[] virtualHosts)
{ {
@ -451,12 +458,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
* virtual host name. A context with no virtual host names or a null virtual host name is available to all requests that are not served by a context with a * virtual host name. A context with no virtual host names or a null virtual host name is available to all requests that are not served by a context with a
* matching virtual host name. * matching virtual host name.
* *
* @return Array of virtual hosts that this context responds to. A null host name or null/empty array means any hostname is acceptable. Host names may be * @return Array of virtual hosts that this context responds to. A null/empty array means any hostname is acceptable. Host names may be String
* String representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed * representation of IP addresses. Host names may start with '*.' to wildcard one level of names. Hosts and wildcard hosts may be followed with
* with '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is * '@connectorname', in which case they will match only if the the {@link Connector#getName()} for the request also matches. If an entry is just
* just '@connectorname' it will match if that connector was used but to match legacy behavior it will only check other '@connectorname' only * '@connectorname' it will match any host if that connector was used. Note - In previous versions if one or more connectorname only entries existed
* entries for matches. A warning will be logged and host entries will be removed if both host and connector entries are used. * and non of the connectors matched the handler would not match regardless of any hostname entries. If there is one or more connectorname only
* * entries and one or more host only entries but no hostname and connector entries we assume the old behavior and will log a warning. The warning
* can be removed by removing the host entries that were previously being ignored, or modifying to include a hostname and connectorname entry.
*/ */
@ManagedAttribute(value = "Virtual hosts accepted by the context", readonly = true) @ManagedAttribute(value = "Virtual hosts accepted by the context", readonly = true)
public String[] getVirtualHosts() public String[] getVirtualHosts()