Fix OPENDJ-306: Misleading access log error message when client resets the ...

Matthew Swift

06.15.2011 3c685926df93073d5c5088434132a6f3f844ba32

Fix OPENDJ-306: Misleading access log error message when client resets the connection.

If an IO error occurs and no request is in the process of being read then treat the error as a connection reset, otherwise treat the error as an IO error as opposed to a protocol error.

 opends/src/messages/messages/protocol.properties

@@ -1428,3 +1428,6 @@
Server was closed while waiting for a response
INFO_ERGONOMIC_SIZING_OF_REQUEST_HANDLER_THREADS_1512=Connection handler '%s' \
 does not specify the number of request handler threads: defaulting to %d threads
MILD_ERR_LDAP_CLIENT_IO_ERROR_DURING_READ_1513=An IO error occurred while \
 reading a request from the client: %s
MILD_ERR_LDAP_CLIENT_IO_ERROR_BEFORE_READ_1514=Connection reset by client

 opends/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReader.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 */
package org.opends.server.protocols.asn1;

@@ -330,9 +331,18 @@
    }

    byteBuffer.clear();
    int read = byteChannel.read(byteBuffer);
    byteBuffer.flip();
    return read;
    try
    {
      int read = byteChannel.read(byteBuffer);
      return read;
    }
    finally
    {
      // Make sure that the buffer is flipped even if the read fails in order to
      // ensure that subsequent calls which query the remaining data return
      // valid results.
      byteBuffer.flip();
    }
  }

  /**
@@ -362,6 +372,16 @@
  }

  /**
   * Returns {@code true} if this ASN.1 reader contains unread data.
   *
   * @return {@code true} if this ASN.1 reader contains unread data.
   */
  public boolean hasRemainingData()
  {
    return (saveBufferReader.remaining() != 0) || (byteBuffer.remaining() != 0);
  }

  /**
   * {@inheritDoc}
   */
  public int peekLength() throws ASN1Exception {

 opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java

@@ -1587,9 +1587,25 @@
      {
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
      Message m =
        ERR_LDAP_CLIENT_DECODE_LDAP_MESSAGE_FAILED.get(String.valueOf(e));
      disconnect(DisconnectReason.PROTOCOL_ERROR, true, m);

      if (asn1Reader.hasRemainingData())
      {
        // The connection failed, but there was an unread partial message so
        // interpret this as an IO error.
        Message m = ERR_LDAP_CLIENT_IO_ERROR_DURING_READ.get(String
            .valueOf(e));
        disconnect(DisconnectReason.IO_ERROR, true, m);
      }
      else
      {
        // The connection failed and there was no unread data, so interpret this
        // as indicating that the client aborted (reset) the connection. This
        // happens when a client configures closes a connection which has been
        // configured with SO_LINGER set to 0.
        Message m = ERR_LDAP_CLIENT_IO_ERROR_BEFORE_READ.get();
        disconnect(DisconnectReason.CLIENT_DISCONNECT, true, m);
      }

      return -1;
    }
  }