http: add minimal HEAD support in the mover

some clients do send HEAD after redirect

Acked-by: Gerd Behrmann
Target: master
Require-book: no
Require-notes: no
(cherry picked from commit 8040e1e)
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>

Author: kofemann

modules/dcache/src/main/java/org/dcache/http/HttpPoolRequestHandler.java

@@ -197,6 +197,7 @@ private static ChannelFuture sendGetResponse(ChannelHandlerContext context,
         FsPath path = new FsPath(file.getProtocolInfo().getPath());
 
         HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+        response.headers().add(ACCEPT_RANGES, BYTES);
         response.setHeader(CONTENT_LENGTH, file.size());
         String digest = buildDigest(file);
         if(!digest.isEmpty()) {
@@ -211,6 +212,27 @@ private static ChannelFuture sendGetResponse(ChannelHandlerContext context,
         return context.getChannel().write(response);
     }
 
+    private static ChannelFuture sendHeadResponse(ChannelHandlerContext context,
+            MoverChannel<HttpProtocolInfo> file)
+            throws IOException {
+        FsPath path = new FsPath(file.getProtocolInfo().getPath());
+
+        HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+        response.headers().add(ACCEPT_RANGES, BYTES);
+        response.headers().add(CONTENT_LENGTH, file.size());
+        String digest = buildDigest(file);
+        if (!digest.isEmpty()) {
+            response.headers().add(DIGEST, digest);
+        }
+        response.headers().add("Content-Disposition", contentDisposition(path
+                .getName()));
+        if (file.getProtocolInfo().getLocation() != null) {
+            response.headers().add(CONTENT_LOCATION, file.getProtocolInfo().getLocation());
+        }
+
+        return context.getChannel().write(response);
+    }
+
     private static String contentDisposition(String filename)
     {
         StringBuilder sb = new StringBuilder();
@@ -581,6 +603,32 @@ protected void doOnChunk(ChannelHandlerContext context, MessageEvent event,
         }
     }
 
+    @Override
+    protected void doOnHead(ChannelHandlerContext context,
+            MessageEvent event,
+            HttpRequest request) {
+        ChannelFuture future = null;
+        MoverChannel<HttpProtocolInfo> file;
+
+        try {
+            file = open(request, false);
+            future = sendHeadResponse(context, file);
+        } catch (IOException | IllegalArgumentException e) {
+            future = conditionalSendError(context, request.getMethod(),
+                    future, BAD_REQUEST, e.getMessage());
+        } catch (URISyntaxException e) {
+            future = conditionalSendError(context, request.getMethod(),
+                    future, BAD_REQUEST, "URI not valid: " + e.getMessage());
+        } catch (RuntimeException e) {
+            future = conditionalSendError(context, request.getMethod(),
+                    future, INTERNAL_SERVER_ERROR, e.getMessage());
+        } finally {
+            if (future != null && !isKeepAlive()) {
+                future.addListener(ChannelFutureListener.CLOSE);
+            }
+        }
+    }
+
     /**
      * Get the mover channel for a certain HTTP request. The mover
      * channel is identified by UUID generated upon mover start and

modules/dcache/src/main/java/org/dcache/http/HttpRequestHandler.java

@@ -56,6 +56,8 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) {
                 doOnPost(ctx, event, request);
             } else if (request.getMethod() == HttpMethod.DELETE) {
                 doOnDelete(ctx, event, request);
+            } else if (request.getMethod() == HttpMethod.HEAD) {
+                doOnHead(ctx, event, request);
             } else {
                 unsupported(ctx, event);
             }
@@ -94,6 +96,12 @@ protected void doOnChunk(ChannelHandlerContext context, MessageEvent event,
         unsupported(context, event);
     }
 
+    protected void doOnHead(ChannelHandlerContext context, MessageEvent event,
+           HttpRequest request) {
+        _logger.info("Received a HEAD request, writing default response.");
+        unsupported(context, event);
+    }
+
     /**
      * Send an HTTP error with the given status code and message.
      *

modules/dcache/src/test/java/org/dcache/http/HttpPoolRequestHandlerTests.java

@@ -51,6 +51,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static org.hamcrest.Matchers.*;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.*;
 import static org.jboss.netty.handler.codec.http.HttpMethod.*;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
 import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
@@ -146,7 +147,7 @@ public void shouldDeliverCompleteFileIfReceivesRequestForWholeFile()
         assertThat(_response, hasHeader(CONTENT_DISPOSITION,
                 "attachment;filename=file"));
         assertThat(_response, not(hasHeader(DIGEST)));
-        assertThat(_response, not(hasHeader(ACCEPT_RANGES)));
+        assertThat(_response, hasHeader(ACCEPT_RANGES, BYTES));
         assertThat(_response, not(hasHeader(CONTENT_RANGE)));
 
         assertThat(_additionalWrites, hasSize(1));
@@ -169,7 +170,7 @@ public void shouldDeliverCompleteFileWithChecksumIfReceivesRequestForWholeFileWi
         assertThat(_response, hasHeader(CONTENT_DISPOSITION,
                 "attachment;filename=file"));
         assertThat(_response, hasHeader(DIGEST, "adler32=03da0195"));
-        assertThat(_response, not(hasHeader(ACCEPT_RANGES)));
+        assertThat(_response, hasHeader(ACCEPT_RANGES, BYTES));
         assertThat(_response, not(hasHeader(CONTENT_RANGE)));
 
         assertThat(_additionalWrites, hasSize(1));
@@ -192,7 +193,7 @@ public void shouldDeliverCompleteFileIfReceivesRequestForWholeFileWithQuestionMa
         assertThat(_response, hasHeader(CONTENT_DISPOSITION,
                 "attachment;filename=\"file?here\""));
         assertThat(_response, not(hasHeader(DIGEST)));
-        assertThat(_response, not(hasHeader(ACCEPT_RANGES)));
+        assertThat(_response, hasHeader(ACCEPT_RANGES, BYTES));
         assertThat(_response, not(hasHeader(CONTENT_RANGE)));
 
         assertThat(_additionalWrites, hasSize(1));
@@ -216,7 +217,7 @@ public void shouldDeliverCompleteFileIfReceivesRequestForWholeFileWithBackslashQ
         assertThat(_response, hasHeader(CONTENT_DISPOSITION,
                 "attachment;filename=\"file\\\\\\\"here\""));
         assertThat(_response, not(hasHeader(DIGEST)));
-        assertThat(_response, not(hasHeader(ACCEPT_RANGES)));
+        assertThat(_response, hasHeader(ACCEPT_RANGES, BYTES));
         assertThat(_response, not(hasHeader(CONTENT_RANGE)));
 
         assertThat(_additionalWrites, hasSize(1));
@@ -245,7 +246,7 @@ public void shouldDeliverCompleteFileIfReceivesRequestForWholeFileWithNonAsciiNa
         assertThat(_response, hasHeader(CONTENT_DISPOSITION,
                 "attachment;filename*=UTF-8''%E1%9A%A0%E1%9B%87%E1%9A%BB"));
         assertThat(_response, not(hasHeader(DIGEST)));
-        assertThat(_response, not(hasHeader(ACCEPT_RANGES)));
+        assertThat(_response, hasHeader(ACCEPT_RANGES, BYTES));
         assertThat(_response, not(hasHeader(CONTENT_RANGE)));
 
         assertThat(_additionalWrites, hasSize(1));
@@ -380,12 +381,16 @@ public void shouldRejectConnectRequests()
     }
 
     @Test
-    public void shouldRejectHeadRequests()
+    public void shouldAcceptHeadRequests() throws URISyntaxException
     {
-        whenClientMakes(a(HEAD).forUri("/path/to/file"));
+        givenPoolHas(file("/path/to/file").withSize(1024));
+        givenDoorHasOrganisedReadOf(file("/path/to/file").with(SOME_UUID));
+        whenClientMakes(a(HEAD)
+                .forUri("/path/to/file?dcache-http-uuid=" + SOME_UUID));
 
-        assertThat(_response.getStatus(), is(NOT_IMPLEMENTED));
+        assertThat(_response.getStatus(), is(OK));
         assertThat(_response, hasHeader(CONTENT_LENGTH));
+        assertThat(_response, hasHeader(ACCEPT_RANGES, BYTES));
     }
 
     @Test