Author: fhanik
Date: Tue Mar 1 18:13:38 2011
New Revision: 1075956
URL: http://svn.apache.org/viewvc?rev=1075956&view=rev
Log:
Simple implementation of a forced and blocking renegotiation with a SSL client
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
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=1075956&r1=1075955&r2=1075956&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Tue Mar
1 18:13:38 2011
@@ -16,7 +16,9 @@
*/
package org.apache.tomcat.util.net;
+import java.io.EOFException;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
@@ -209,6 +211,58 @@ public class SecureNioChannel extends Ni
}
/**
+ * Force a blocking handshake to take place for this key.
+ * This requires that both network and application buffers have been
emptied out prior to this call taking place, or a
+ * IOException will be thrown.
+ * @param timeout - timeout in milliseconds for each socket operation
+ * @throws IOException - if an IO exception occurs or if application or
network buffers contain data
+ * @throws SocketTimeoutException - if a socket operation timed out
+ */
+ public void rehandshake(long timeout) throws IOException {
+ //validate the network buffers are empty
+ if (netInBuffer.position() > 0) throw new IOException("Network input
buffer still contains data. Handshake will fail.");
+ if (netOutBuffer.position() > 0) throw new IOException("Network output
buffer still contains data. Handshake will fail.");
+ if (getBufHandler().getReadBuffer().position()>0) throw new
IOException("Aplication input buffer still contains data. Data would have been
lost.");
+ if (getBufHandler().getWriteBuffer().position()>0) throw new
IOException("Aplication output buffer still contains data. Data would have been
lost.");
+ reset();
+ boolean isReadable = true;
+ boolean isWriteable = true;
+ boolean handshaking = true;
+ Selector selector = null;
+ SelectionKey key = null;
+ try {
+ while (handshaking) {
+ int hsStatus = this.handshake(isReadable, isWriteable);
+ switch (hsStatus) {
+ case -1 : throw new EOFException("EOF during handshake.");
+ case 0 : handshaking = false; break;
+ default : {
+ long now = System.currentTimeMillis();
+ if (selector==null) {
+ selector = Selector.open();
+ key = getIOChannel().register(selector, hsStatus);
+ } else {
+ key.interestOps(hsStatus);
+ }
+ int keyCount = selector.select(timeout);
+ if (keyCount == 0 && ((System.currentTimeMillis()-now)
>= timeout)) {
+ throw new SocketTimeoutException("Handshake
operation timed out.");
+ }
+ isReadable = key.isReadable();
+ isWriteable = key.isWritable();
+ }
+ }
+ }
+ } finally {
+ if (key!=null) try {key.cancel();} catch (Exception ignore) {}
+ if (selector!=null) try {selector.close();} catch (Exception
ignore) {}
+ }
+
+ }
+
+
+
+ /**
* Executes all the tasks needed on the same thread.
* @return HandshakeStatus
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
