Author: markt
Date: Fri Jun 19 13:24:27 2015
New Revision: 1686409
URL: http://svn.apache.org/r1686409
Log:
Rename since it is going to be used to extract more than just the SNI
information
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
- copied, changed from r1686374,
tomcat/trunk/java/org/apache/tomcat/util/net/SNIExtractor.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/SNIExtractor.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1686409&r1=1686408&r2=1686409&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Fri Jun
19 13:24:27 2015
@@ -36,7 +36,7 @@ import javax.net.ssl.SSLException;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteBufferUtils;
-import org.apache.tomcat.util.net.SNIExtractor.SNIResult;
+import org.apache.tomcat.util.net.TLSClientHelloExtractor.SNIResult;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -314,7 +314,7 @@ public class SecureNio2Channel extends N
return 1;
}
- SNIExtractor extractor = new SNIExtractor(netInBuffer);
+ TLSClientHelloExtractor extractor = new
TLSClientHelloExtractor(netInBuffer);
while (extractor.getResult() == SNIResult.UNDERFLOW &&
netInBuffer.capacity() < endpoint.getSniParseLimit()) {
@@ -326,7 +326,7 @@ public class SecureNio2Channel extends N
netInBuffer = ByteBufferUtils.expand(netInBuffer, newLimit);
sc.read(netInBuffer);
- extractor = new SNIExtractor(netInBuffer);
+ extractor = new TLSClientHelloExtractor(netInBuffer);
}
String hostName = null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1686409&r1=1686408&r2=1686409&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Fri Jun
19 13:24:27 2015
@@ -33,7 +33,7 @@ import javax.net.ssl.SSLException;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteBufferUtils;
-import org.apache.tomcat.util.net.SNIExtractor.SNIResult;
+import org.apache.tomcat.util.net.TLSClientHelloExtractor.SNIResult;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -252,7 +252,7 @@ public class SecureNioChannel extends Ni
private int processSNI() throws IOException {
// Read some data into the network input buffer so we can peek at it.
sc.read(netInBuffer);
- SNIExtractor extractor = new SNIExtractor(netInBuffer);
+ TLSClientHelloExtractor extractor = new
TLSClientHelloExtractor(netInBuffer);
while (extractor.getResult() == SNIResult.UNDERFLOW &&
netInBuffer.capacity() < endpoint.getSniParseLimit()) {
@@ -264,7 +264,7 @@ public class SecureNioChannel extends Ni
netInBuffer = ByteBufferUtils.expand(netInBuffer, newLimit);
sc.read(netInBuffer);
- extractor = new SNIExtractor(netInBuffer);
+ extractor = new TLSClientHelloExtractor(netInBuffer);
}
String hostName = null;
Copied:
tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java (from
r1686374, tomcat/trunk/java/org/apache/tomcat/util/net/SNIExtractor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/SNIExtractor.java&r1=1686374&r2=1686409&rev=1686409&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SNIExtractor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
Fri Jun 19 13:24:27 2015
@@ -26,10 +26,10 @@ import org.apache.tomcat.util.res.String
/**
* This class extracts the SNI host name from a TLS client-hello message.
*/
-public class SNIExtractor {
+public class TLSClientHelloExtractor {
- private static final Log log = LogFactory.getLog(SNIExtractor.class);
- private static final StringManager sm =
StringManager.getManager(SNIExtractor.class);
+ private static final Log log =
LogFactory.getLog(TLSClientHelloExtractor.class);
+ private static final StringManager sm =
StringManager.getManager(TLSClientHelloExtractor.class);
private final SNIResult result;
private final String sniValue;
@@ -45,7 +45,7 @@ public class SNIExtractor {
*
* @param netInBuffer The buffer containing the TLS data to process
*/
- public SNIExtractor(ByteBuffer netInBuffer) {
+ public TLSClientHelloExtractor(ByteBuffer netInBuffer) {
// TODO: Detect use of http on a secure connection and provide a simple
// error page.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
