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

345704 jetty-nested works with forwarded SSL in cloudfoundry 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3140 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-05-13 09:21:47 +00:00
parent ee7333baf7
commit 6a2ecc493e
6 changed files with 127 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -21,6 +21,7 @@ jetty-7.4.1.v20110513
+ 345290 Weak references from SessionIdManager. HashSessionManager cleanup.
+ 345543 Always close endpoint on SSLException
+ 345679 Allow setting an initialized KeyStore as keystore/truststore of SslContextFactory
+ 345704 jetty-nested works with forwarded SSL in cloudfoundry
+ JETTY-954 WebAppContext eats any start exceptions instead of stopping the server load
+ JETTY-1314 Handle bad URI encodings
+ JETTY-1324 Tested not using CESU-8 instead of UTF-8

4
jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedConnection.java
View File

@ -64,10 +64,6 @@ public class NestedConnection extends HttpConnection
fields.add(header,value);
}
// Slight hack for cloud foundry
if (!fields.containsKey("x-forwarded-for") && outerRequest.getHeader("x-forwarded_for")!=null)
fields.add("x-forwarded-for",outerRequest.getHeader("x-forwarded_for"));
// Let outer parse the cookies
_request.setCookies(outerRequest.getCookies());

4
jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedRequest.java
View File

@ -15,6 +15,7 @@ package org.eclipse.jetty.nested;
import javax.servlet.http.HttpServletRequest;
import org.eclipse.jetty.http.HttpSchemes;
import org.eclipse.jetty.server.Request;
public class NestedRequest extends Request
@ -33,8 +34,7 @@ public class NestedRequest extends Request
public boolean isSecure()
{
return _outer.isSecure();
return _outer.isSecure() || HttpSchemes.HTTPS.equals(getScheme());
}
}

207
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -38,8 +38,7 @@ import org.eclipse.jetty.util.statistic.SampleStatistic;
import org.eclipse.jetty.util.thread.ThreadPool;
/**
* Abstract Connector implementation. This abstract implementation of the
* Connector interface provides:
* Abstract Connector implementation. This abstract implementation of the Connector interface provides:
* <ul>
* <li>AbstractLifeCycle implementation</li>
* <li>Implementations for connector getters and setters</li>
@ -69,11 +68,13 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
private boolean _useDNS;
private boolean _forwarded;
private String _hostHeader;
private String _forwardedHostHeader = "X-Forwarded-Host";
private String _forwardedServerHeader = "X-Forwarded-Server";
private String _forwardedForHeader = "X-Forwarded-For";
private String _forwardedProtoHeader = "X-Forwarded-Proto";
private String _forwardedHostHeader = "X-Forwarded-Host";
private String _forwardedServerHeader = "X-Forwarded-Server";
private String _forwardedForHeader = "X-Forwarded-For";
private String _forwardedProtoHeader = "X-Forwarded-Proto";
private String _forwardedCipherSuiteHeader;
private String _forwardedSslSessionIdHeader;
private boolean _reuseAddress = true;
protected int _maxIdleTime = 200000;
@ -85,11 +86,11 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
private final AtomicLong _statsStartedAt = new AtomicLong(-1L);
/** connections to server */
private final CounterStatistic _connectionStats = new CounterStatistic();
private final CounterStatistic _connectionStats = new CounterStatistic();
/** requests per connection */
private final SampleStatistic _requestStats = new SampleStatistic();
private final SampleStatistic _requestStats = new SampleStatistic();
/** duration of a connection */
private final SampleStatistic _connectionDurationStats = new SampleStatistic();
private final SampleStatistic _connectionDurationStats = new SampleStatistic();
/* ------------------------------------------------------------ */
/**
@ -163,28 +164,20 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* Set the maximum Idle time for a connection, which roughly translates to
* the {@link Socket#setSoTimeout(int)} call, although with NIO
* implementations other mechanisms may be used to implement the timeout.
* The max idle time is applied:
* Set the maximum Idle time for a connection, which roughly translates to the {@link Socket#setSoTimeout(int)} call, although with NIO implementations
* other mechanisms may be used to implement the timeout. The max idle time is applied:
* <ul>
* <li>When waiting for a new request to be received on a connection</li>
* <li>When reading the headers and content of a request</li>
* <li>When writing the headers and content of a response</li>
* </ul>
* Jetty interprets this value as the maximum time between some progress
* being made on the connection. So if a single byte is read or written,
* then the timeout (if implemented by jetty) is reset. However, in many
* instances, the reading/writing is delegated to the JVM, and the semantic
* is more strictly enforced as the maximum time a single read/write
* operation can take. Note, that as Jetty supports writes of memory mapped
* file buffers, then a write may take many 10s of seconds for large content
* written to a slow device.
* Jetty interprets this value as the maximum time between some progress being made on the connection. So if a single byte is read or written, then the
* timeout (if implemented by jetty) is reset. However, in many instances, the reading/writing is delegated to the JVM, and the semantic is more strictly
* enforced as the maximum time a single read/write operation can take. Note, that as Jetty supports writes of memory mapped file buffers, then a write may
* take many 10s of seconds for large content written to a slow device.
* <p>
* Previously, Jetty supported separate idle timeouts and IO operation
* timeouts, however the expense of changing the value of soTimeout was
* significant, so these timeouts were merged. With the advent of NIO, it
* may be possible to again differentiate these values (if there is demand).
* Previously, Jetty supported separate idle timeouts and IO operation timeouts, however the expense of changing the value of soTimeout was significant, so
* these timeouts were merged. With the advent of NIO, it may be possible to again differentiate these values (if there is demand).
*
* @param maxIdleTime
* The maxIdleTime to set.
@ -278,8 +271,8 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
*/
public void setAcceptors(int acceptors)
{
if (acceptors > 2*Runtime.getRuntime().availableProcessors())
Log.warn("Acceptors should be <=2*availableProcessors: "+this);
if (acceptors > 2 * Runtime.getRuntime().availableProcessors())
Log.warn("Acceptors should be <=2*availableProcessors: " + this);
_acceptors = acceptors;
}
@ -398,12 +391,29 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
{
HttpFields httpFields = request.getConnection().getRequestFields();
// Do SSL first
if (getForwardedCipherSuiteHeader()!=null)
{
String cipher_suite=httpFields.getStringField(getForwardedCipherSuiteHeader());
if (cipher_suite!=null)
request.setAttribute("javax.servlet.request.cipher_suite",cipher_suite);
}
if (getForwardedSslSessionIdHeader()!=null)
{
String ssl_session_id=httpFields.getStringField(getForwardedSslSessionIdHeader());
if(ssl_session_id!=null)
{
request.setAttribute("javax.servlet.request.ssl_session_id", ssl_session_id);
request.setScheme(HttpSchemes.HTTPS);
}
}
// Retrieving headers from the request
String forwardedHost = getLeftMostValue(httpFields.getStringField(getForwardedHostHeader()));
String forwardedServer = getLeftMostValue(httpFields.getStringField(getForwardedServerHeader()));
String forwardedFor = getLeftMostValue(httpFields.getStringField(getForwardedForHeader()));
String forwardedProto = getLeftMostValue(httpFields.getStringField(getForwardedProtoHeader()));
String forwardedHost = getLeftMostFieldValue(httpFields,getForwardedHostHeader());
String forwardedServer = getLeftMostFieldValue(httpFields,getForwardedServerHeader());
String forwardedFor = getLeftMostFieldValue(httpFields,getForwardedForHeader());
String forwardedProto = getLeftMostFieldValue(httpFields,getForwardedProtoHeader());
if (_hostHeader != null)
{
// Update host header
@ -453,8 +463,13 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
}
/* ------------------------------------------------------------ */
protected String getLeftMostValue(String headerValue)
protected String getLeftMostFieldValue(HttpFields fields, String header)
{
if (header == null)
return null;
String headerValue = fields.getStringField(header);
if (headerValue == null)
return null;
@ -496,9 +511,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/*
* @see
* org.eclipse.jetty.server.Connector#isConfidential(org.eclipse.jetty.server
* .Request)
* @see org.eclipse.jetty.server.Connector#isConfidential(org.eclipse.jetty.server .Request)
*/
public boolean isIntegral(Request request)
{
@ -596,8 +609,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/**
* Is reverse proxy handling on?
*
* @return true if this connector is checking the
* x-forwarded-for/host/server headers
* @return true if this connector is checking the x-forwarded-for/host/server headers
*/
public boolean isForwarded()
{
@ -606,13 +618,11 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* Set reverse proxy handling.
* If set to true, then the X-Forwarded headers (or the headers set in their place)
* are looked for to set the request protocol, host, server and client ip.
* Set reverse proxy handling. If set to true, then the X-Forwarded headers (or the headers set in their place) are looked for to set the request protocol,
* host, server and client ip.
*
* @param check
* true if this connector is checking the
* x-forwarded-for/host/server headers
* true if this connector is checking the x-forwarded-for/host/server headers
* @set {@link #setForwardedForHeader(String)}
* @set {@link #setForwardedHostHeader(String)}
* @set {@link #setForwardedProtoHeader(String)}
@ -633,10 +643,8 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* Set a forced valued for the host header to control what is returned by
* {@link ServletRequest#getServerName()} and
* {@link ServletRequest#getServerPort()}. This value is only used if
* {@link #isForwarded()} is true.
* Set a forced valued for the host header to control what is returned by {@link ServletRequest#getServerName()} and {@link ServletRequest#getServerPort()}.
* This value is only used if {@link #isForwarded()} is true.
*
* @param hostHeader
* The value of the host header to force.
@ -680,8 +688,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @param forwardedServerHeader
* The header name for forwarded server (default
* x-forwarded-server)
* The header name for forwarded server (default x-forwarded-server)
* @see #setForwarded(boolean)
*/
public void setForwardedServerHeader(String forwardedServerHeader)
@ -710,7 +717,9 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
}
/* ------------------------------------------------------------ */
/** Get the forwardedProtoHeader.
/**
* Get the forwardedProtoHeader.
*
* @return the forwardedProtoHeader (default X-Forwarded-For)
* @see #setForwarded(boolean)
*/
@ -720,8 +729,11 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
}
/* ------------------------------------------------------------ */
/** Set the forwardedProtoHeader.
* @param forwardedProtoHeader the forwardedProtoHeader to set (default X-Forwarded-For)
/**
* Set the forwardedProtoHeader.
*
* @param forwardedProtoHeader
* the forwardedProtoHeader to set (default X-Forwarded-For)
* @see #setForwarded(boolean)
*/
public void setForwardedProtoHeader(String forwardedProtoHeader)
@ -729,6 +741,44 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
_forwardedProtoHeader = forwardedProtoHeader;
}
/* ------------------------------------------------------------ */
/**
* @return The header name holding a forwarded cipher suite (default null)
*/
public String getForwardedCipherSuiteHeader()
{
return _forwardedCipherSuiteHeader;
}
/* ------------------------------------------------------------ */
/**
* @param forwardedCipherSuite
* The header name holding a forwarded cipher suite (default null)
*/
public void setForwardedCipherSuiteHeader(String forwardedCipherSuite)
{
_forwardedCipherSuiteHeader = forwardedCipherSuite;
}
/* ------------------------------------------------------------ */
/**
* @return The header name holding a forwarded SSL Session ID (default null)
*/
public String getForwardedSslSessionIdHeader()
{
return _forwardedSslSessionIdHeader;
}
/* ------------------------------------------------------------ */
/**
* @param The
* header name holding a forwarded SSL Session ID (default null)
*/
public void setForwardedSslSessionIdHeader(String forwardedSslSessionId)
{
_forwardedSslSessionIdHeader = forwardedSslSessionId;
}
/* ------------------------------------------------------------ */
@Override
public String toString()
@ -738,10 +788,10 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
if (dot > 0)
name = name.substring(dot + 1);
return name + "@" + (getHost() == null?"0.0.0.0":getHost()) + ":" + (getLocalPort() <= 0?getPort():getLocalPort()) + " "+AbstractLifeCycle.getState(this);
return name + "@" + (getHost() == null?"0.0.0.0":getHost()) + ":" + (getLocalPort() <= 0?getPort():getLocalPort()) + " "
+ AbstractLifeCycle.getState(this);
}
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
@ -832,9 +882,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Get the number of requests handled by this connector since last
* call of statsReset(). If setStatsOn(false) then this is
* undefined.
* @return Get the number of requests handled by this connector since last call of statsReset(). If setStatsOn(false) then this is undefined.
*/
public int getRequests()
{
@ -852,8 +900,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Number of connections accepted by the server since statsReset()
* called. Undefined if setStatsOn(false).
* @return Number of connections accepted by the server since statsReset() called. Undefined if setStatsOn(false).
*/
public int getConnections()
{
@ -862,8 +909,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Number of connections currently open that were opened since
* statsReset() called. Undefined if setStatsOn(false).
* @return Number of connections currently open that were opened since statsReset() called. Undefined if setStatsOn(false).
*/
public int getConnectionsOpen()
{
@ -872,8 +918,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Maximum number of connections opened simultaneously since
* statsReset() called. Undefined if setStatsOn(false).
* @return Maximum number of connections opened simultaneously since statsReset() called. Undefined if setStatsOn(false).
*/
public int getConnectionsOpenMax()
{
@ -882,8 +927,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Mean duration in milliseconds of open connections since
* statsReset() called. Undefined if setStatsOn(false).
* @return Mean duration in milliseconds of open connections since statsReset() called. Undefined if setStatsOn(false).
*/
public double getConnectionsDurationMean()
{
@ -892,8 +936,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Maximum duration in milliseconds of an open connection since
* statsReset() called. Undefined if setStatsOn(false).
* @return Maximum duration in milliseconds of an open connection since statsReset() called. Undefined if setStatsOn(false).
*/
public long getConnectionsDurationMax()
{
@ -902,9 +945,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Standard deviation of duration in milliseconds of open
* connections since statsReset() called. Undefined if
* setStatsOn(false).
* @return Standard deviation of duration in milliseconds of open connections since statsReset() called. Undefined if setStatsOn(false).
*/
public double getConnectionsDurationStdDev()
{
@ -913,8 +954,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Mean number of requests per connection since statsReset() called.
* Undefined if setStatsOn(false).
* @return Mean number of requests per connection since statsReset() called. Undefined if setStatsOn(false).
*/
public double getConnectionsRequestsMean()
{
@ -923,8 +963,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Maximum number of requests per connection since statsReset()
* called. Undefined if setStatsOn(false).
* @return Maximum number of requests per connection since statsReset() called. Undefined if setStatsOn(false).
*/
public int getConnectionsRequestsMax()
{
@ -933,8 +972,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return Standard deviation of number of requests per connection since
* statsReset() called. Undefined if setStatsOn(false).
* @return Standard deviation of number of requests per connection since statsReset() called. Undefined if setStatsOn(false).
*/
public double getConnectionsRequestsStdDev()
{
@ -1027,10 +1065,8 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* Set the priority offset of the acceptor threads. The priority is adjusted
* by this amount (default 0) to either favour the acceptance of new threads
* and newly active connections or to favour the handling of already
* dispatched connections.
* Set the priority offset of the acceptor threads. The priority is adjusted by this amount (default 0) to either favour the acceptance of new threads and
* newly active connections or to favour the handling of already dispatched connections.
*
* @param offset
* the amount to alter the priority of the acceptor threads.
@ -1042,8 +1078,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @return True if the the server socket will be opened in SO_REUSEADDR
* mode.
* @return True if the the server socket will be opened in SO_REUSEADDR mode.
*/
public boolean getReuseAddress()
{
@ -1053,8 +1088,7 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
/* ------------------------------------------------------------ */
/**
* @param reuseAddress
* True if the the server socket will be opened in SO_REUSEADDR
* mode.
* True if the the server socket will be opened in SO_REUSEADDR mode.
*/
public void setReuseAddress(boolean reuseAddress)
{
@ -1092,6 +1126,5 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
{
out.append(String.valueOf(this)).append("\n");
}
}

5
test-jetty-nested/src/main/webapp/WEB-INF/jetty.xml
View File

@ -13,7 +13,10 @@
<Arg>
<New class="org.eclipse.jetty.nested.NestedConnector">
<Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
<Set name="forwarded">true</Set>
<Set name="forwardedHostHeader">x-forwarded_for</Set>
<Set name="forwardedCipherSuiteHeader">sslclientcipher</Set>
<Set name="forwardedSslSessionIdHeader">sslsessionid</Set>
</New>
</Arg>
</Call>

0
test-jetty-nested/src/main/webapp/wibble.txt
View File