fix(http): fix HTTP protocol errors following non-successful requests

core/src/main/java/io/questdb/cairo/TableNameRegistryStore.java

@@ -487,7 +487,7 @@ private void reloadFromTablesFile(
                     tableNameToTableTokenMap.put(tableName, token);
                     if (!Chars.startsWith(token.getDirName(), token.getTableName())) {
                         // This table is renamed, log system to real table name mapping
-                        LOG.info().$("table dir name does not match logical name [table=").utf8(tableName).$(", dirName=").utf8(dirName).I$();
+                        LOG.debug().$("table dir name does not match logical name [table=").utf8(tableName).$(", dirName=").utf8(dirName).I$();
                     }
                     dirNameToTableTokenMap.put(token.getDirName(), ReverseTableMapItem.of(token));
                 }

core/src/main/java/io/questdb/cutlass/http/HttpConnectionContext.java

@@ -65,6 +65,7 @@ public class HttpConnectionContext extends IOContext<HttpConnectionContext> impl
     private final MultipartParserState multipartParserState = new MultipartParserState();
     private final NetworkFacade nf;
     private final int recvBufferSize;
+    private final RejectProcessor rejectProcessor = new RejectProcessor();
     private final HttpResponseSink responseSink;
     private final RetryAttemptAttributes retryAttemptAttributes = new RetryAttemptAttributes();
     private final RescheduleContext retryRescheduleContext = retry -> {
@@ -302,12 +303,17 @@ public HttpConnectionContext of(int fd, @NotNull IODispatcher<HttpConnectionCont
         return this;
     }
 
-    public boolean rejectRequest(int code, CharSequence userMessage, CharSequence cookieName, CharSequence cookieValue) throws PeerDisconnectedException, PeerIsSlowToReadException {
-        reset();
+    public HttpRequestProcessor rejectRequest(int code, CharSequence userMessage) {
+        return rejectRequest(code, userMessage, null, null);
+    }
+
+    public HttpRequestProcessor rejectRequest(int code, CharSequence userMessage, CharSequence cookieName, CharSequence cookieValue) {
         LOG.error().$(userMessage).$(" [code=").$(code).I$();
-        simpleResponse().sendStatusWithCookie(code, userMessage, cookieName, cookieValue);
-        dispatcher.registerChannel(this, IOOperation.READ);
-        return false;
+        rejectProcessor.rejectCode = code;
+        rejectProcessor.rejectMessage = userMessage;
+        rejectProcessor.rejectCookieName = cookieName;
+        rejectProcessor.rejectCookieValue = cookieValue;
+        return rejectProcessor;
     }
 
     public void reset() {
@@ -331,6 +337,7 @@ public void reset() {
         this.totalReceived = 0;
         this.chunkedContentParser.clear();
         this.recvPos = recvBuffer;
+        this.rejectProcessor.clear();
         clearSuspendEvent();
     }
 
@@ -579,7 +586,7 @@ private boolean consumeMultipart(
     ) throws PeerDisconnectedException, PeerIsSlowToReadException, ServerDisconnectException, QueryPausedException {
         if (newRequest) {
             if (!headerParser.hasBoundary()) {
-                return rejectRequest("Bad request. Form data in multipart POST expected.");
+                return failRequest("Bad request. Form data in multipart POST expected.");
             }
             processor.onHeadersReady(this);
             multipartContentParser.of(headerParser.getBoundary());
@@ -757,6 +764,11 @@ private void failProcessor(HttpRequestProcessor processor, HttpException e, int
         }
     }
 
+    private boolean failRequest(String errorMessage) throws ServerDisconnectException {
+        LOG.error().$(errorMessage).$(". Disconnecting [fd=").$(getFd()).I$();
+        throw new ServerDisconnectException();
+    }
+
     private HttpRequestProcessor getHttpRequestProcessor(HttpRequestProcessorSelector selector) {
         HttpRequestProcessor processor;
         final Utf8Sequence url = headerParser.getUrl();
@@ -805,7 +817,7 @@ private boolean handleClientRecv(HttpRequestProcessorSelector selector, Reschedu
             if (url == null) {
                 throw HttpException.instance("missing URL");
             }
-            HttpRequestProcessor processor = getHttpRequestProcessor(selector);
+            HttpRequestProcessor processor = isRequestBeingRejected() ? rejectProcessor : getHttpRequestProcessor(selector);
             int contentLength = headerParser.getContentLength();
             final boolean chunked = Utf8s.equalsNcAscii("chunked", headerParser.getHeader(HEADER_TRANSFER_ENCODING));
             final boolean multipartRequest = Utf8s.equalsNcAscii("multipart/form-data", headerParser.getContentType())
@@ -817,40 +829,48 @@ private boolean handleClientRecv(HttpRequestProcessorSelector selector, Reschedu
             }
 
             try {
-                if (newRequest && processor.requiresAuthentication() && !configureSecurityContext()) {
-                    return rejectUnauthenticatedRequest();
-                }
+                if (newRequest) {
+                    if (processor.requiresAuthentication() && !configureSecurityContext()) {
+                        processor = rejectUnauthorized(null);
+                    }
 
-                if (newRequest && configuration.areCookiesEnabled()) {
-                    if (!processor.processCookies(this, securityContext)) {
-                        return false;
+                    if (configuration.areCookiesEnabled()) {
+                        if (!processor.processCookies(this, securityContext)) {
+                            processor = rejectProcessor;
+                        }
                     }
-                }
 
-                try {
-                    securityContext.checkEntityEnabled();
-                } catch (CairoException e) {
-                    return rejectForbiddenRequest(e.getFlyweightMessage());
+                    try {
+                        securityContext.checkEntityEnabled();
+                    } catch (CairoException e) {
+                        processor = rejectForbiddenRequest(e.getFlyweightMessage());
+                    }
                 }
 
                 if (chunked) {
-                    if (multipartProcessor) {
-                        busyRecv = consumeChunked(processor, headerEnd, read, newRequest);
-                    } else {
+                    if (!multipartProcessor) {
                         // bad request - regular request for processor that expects multipart
-                        busyRecv = rejectRequest("Bad request. Chunked requests are not supported by the handler.");
+                        processor = rejectRequest(HTTP_NOT_FOUND, "method (chunked POST) not supported");
+                    }
+                    busyRecv = consumeChunked(processor, headerEnd, read, newRequest);
+                } else if (multipartRequest) {
+                    if (!multipartProcessor) {
+                        // bad request - multipart request for processor that doesn't expect multipart
+                        processor = rejectRequest(HTTP_NOT_FOUND, "method (multipart POST) not supported");
                     }
-                } else if (multipartRequest && !multipartProcessor) {
-                    // bad request - multipart request for processor that doesn't expect multipart
-                    busyRecv = rejectRequest("Bad request. Non-multipart GET expected.");
-                } else if (multipartProcessor && multipartRequest) {
                     busyRecv = consumeMultipart(socket, processor, headerEnd, read, newRequest, rescheduleContext);
-                } else if (contentLength > -1 && multipartProcessor) {
+                } else if (contentLength > -1) {
+                    if (!multipartProcessor) {
+                        processor = rejectRequest(HTTP_NOT_FOUND, "method (POST) not supported");
+                    }
                     busyRecv = consumeContent(contentLength, socket, processor, headerEnd, read, newRequest);
-                } else if (multipartProcessor) {
-                    // bad request - regular request for processor that expects multipart
-                    busyRecv = rejectRequest("Bad request. Multipart POST expected.");
                 } else {
+                    if (multipartProcessor) {
+                        // bad request - regular request for processor that expects multipart
+                        rejectRequest(HTTP_BAD_REQUEST, "Bad request. Multipart POST expected.");
+                        processor = rejectProcessor;
+                    }
+
                     // Do not expect any more bytes to be sent to us before
                     // we respond back to client. We will disconnect the client when
                     // they abuse protocol. In addition, we will not call processor
@@ -914,6 +934,10 @@ private boolean handleClientRecv(HttpRequestProcessorSelector selector, Reschedu
         return busyRecv;
     }
 
+    private boolean isRequestBeingRejected() {
+        return rejectProcessor.rejectCode != 0;
+    }
+
     private boolean handleClientSend() {
         if (resumeProcessor != null) {
             try {
@@ -968,20 +992,12 @@ private boolean parseMultipartResult(
         return false;
     }
 
-    private boolean rejectForbiddenRequest(CharSequence userMessage) throws PeerDisconnectedException, PeerIsSlowToReadException {
+    private HttpRequestProcessor rejectForbiddenRequest(CharSequence userMessage) throws PeerDisconnectedException, PeerIsSlowToReadException {
         return rejectRequest(HTTP_FORBIDDEN, userMessage, null, null);
     }
 
-    private boolean rejectRequest(CharSequence userMessage) throws PeerDisconnectedException, PeerIsSlowToReadException {
-        return rejectRequest(HTTP_NOT_FOUND, userMessage, null, null);
-    }
-
-    private boolean rejectUnauthenticatedRequest() throws PeerDisconnectedException, PeerIsSlowToReadException {
-        reset();
-        LOG.error().$("rejecting unauthenticated request [fd=").$(getFd()).I$();
-        simpleResponse().sendStatusWithHeader(HTTP_UNAUTHORIZED, "WWW-Authenticate: Basic realm=\"questdb\", charset=\"UTF-8\"");
-        dispatcher.registerChannel(this, IOOperation.READ);
-        return false;
+    private HttpRequestProcessor rejectUnauthorized(CharSequence userMessage) throws PeerDisconnectedException, PeerIsSlowToReadException {
+        return rejectRequest(HTTP_UNAUTHORIZED, userMessage, null, null);
     }
 
     private void shiftReceiveBufferUnprocessedBytes(long start, int receivedBytes) {
@@ -990,4 +1006,44 @@ private void shiftReceiveBufferUnprocessedBytes(long start, int receivedBytes) {
         Vect.memcpy(recvBuffer, start, receivedBytes);
         LOG.debug().$("peer is slow, waiting for bigger part to parse [multipart]").$();
     }
+
+    private class RejectProcessor implements HttpRequestProcessor, HttpMultipartContentListener {
+        private int rejectCode;
+        private CharSequence rejectCookieName = null;
+        private CharSequence rejectCookieValue = null;
+        private CharSequence rejectMessage = null;
+
+        public void clear() {
+            rejectCode = 0;
+            rejectCookieName = null;
+            rejectCookieValue = null;
+            rejectMessage = null;
+        }
+
+        @Override
+        public void onChunk(long lo, long hi) {
+        }
+
+        @Override
+        public void onPartBegin(HttpRequestHeader partHeader) {
+        }
+
+        @Override
+        public void onPartEnd() {
+        }
+
+        @Override
+        public void onRequestComplete(
+                HttpConnectionContext context
+        ) throws PeerDisconnectedException, PeerIsSlowToReadException {
+            if (rejectCode == HTTP_UNAUTHORIZED) {
+                // Special case, include WWW-Authenticate header
+                context.simpleResponse().sendStatusWithHeader(HTTP_UNAUTHORIZED, "WWW-Authenticate: Basic realm=\"questdb\", charset=\"UTF-8\"");
+            } else {
+                simpleResponse().sendStatusWithCookie(rejectCode, rejectMessage, rejectCookieName, rejectCookieValue);
+            }
+            reset();
+            dispatcher.registerChannel(HttpConnectionContext.this, IOOperation.READ);
+        }
+    }
 }

core/src/main/java/io/questdb/cutlass/http/HttpHeaderParser.java

@@ -104,6 +104,7 @@ public void clear() {
         this.isStatusCode = true;
         this.isStatusText = true;
         this.needProtocol = true;
+        this.contentLength = -1;
         // do not clear the pool
         // this.pool.clear();
     }

core/src/main/java/io/questdb/cutlass/http/HttpResponseSink.java

@@ -595,8 +595,6 @@ public String status(CharSequence httpProtocolVersion, int code, CharSequence co
                 } else {
                     putAscii("Content-Length: ").put(contentLength).putEOL();
                 }
-            }
-            if (contentType != null) {
                 putAscii("Content-Type: ").put(contentType).putEOL();
             }
 
@@ -774,7 +772,7 @@ public void sendStatus(int code, CharSequence message, CharSequence header, Char
 
         public void sendStatus(int code) throws PeerDisconnectedException, PeerIsSlowToReadException {
             buffer.clearAndPrepareToWriteToBuffer();
-            headerImpl.status(httpVersion, code, CONTENT_TYPE_HTML, -2L);
+            headerImpl.status(httpVersion, code, null, -2L);
             prepareHeaderSink();
             flushSingle();
         }