headers handling

service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/TaskRequestContext.java

@@ -2,12 +2,15 @@ package com.telephoners.krakyournet.ctf.beans.tasks;
 
 import com.telephoners.krakyournet.ctf.beans.User;
 
+import java.util.Map;
+
 public class TaskRequestContext
 {
     private String httpMethod; //todo: use class
     private User user;
     private String path;
     private String body;
+    private Map<String, String> headers;
 
     public TaskRequestContext withHttpMethod(String httpMethod)
     {
@@ -32,6 +35,11 @@ public class TaskRequestContext
         return this;
     }
 
+    public TaskRequestContext withHeaders(Map<String, String> headers) {
+        this.headers = headers;
+        return this;
+    }
+
     public String getHttpMethod()
     {
         return httpMethod;
@@ -51,4 +59,9 @@ public class TaskRequestContext
     {
         return body;
     }
+
+    public Map<String, String> getHeaders()
+    {
+        return headers;
+    }
 }

service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/TaskResponse.java

 package com.telephoners.krakyournet.ctf.beans.tasks;
 
+import java.util.Map;
+
 public class TaskResponse
 {
     private String text;
-    private String kynHeader;
+    private Map<String, String> headers;
 
-    public TaskResponse(String text, String kynHeader)
+    public TaskResponse(String text, Map<String,String> headers)
     {
         this.text = text;
-        this.kynHeader = kynHeader;
+        this.headers = headers;
     }
 
     public String getText()
     {
-
         return text;
     }
 
-    public String getKynHeader()
+    public Map<String, String> getHeaders()
     {
-        return kynHeader;
+        return headers;
     }
 }
\ No newline at end of file

service/src/main/java/com/telephoners/krakyournet/ctf/resources/TaskResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
+import com.google.common.collect.Sets;
 import com.telephoners.krakyournet.ctf.beans.User;
 import com.telephoners.krakyournet.ctf.beans.tasks.Task;
 import com.telephoners.krakyournet.ctf.beans.tasks.TaskRequestContext;
@@ -17,15 +18,20 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 @Singleton
 @Path(value = "/task")
 public class TaskResource
 {
     private final TasksRepository tasksRepository;
-    private static final String KYN_HEADER_NAME = "KYN_2016"; //todo, move to configuration
+    private static final Set<String> PROXIED_HEADERS = Sets.newHashSet("KYN_2016", "EY_HEADER", "Content-Type"); //todo: move to conf
 
     @Inject
     public TaskResource(TasksRepository tasksRepository)
@@ -55,6 +61,16 @@ public class TaskResource
     }
     */
 
+    private Map<String, String> extractProxiedHeaders(MultivaluedMap<String, String> headers) {
+        return headers.entrySet()
+                .stream()
+                .filter(header -> PROXIED_HEADERS.contains(header.getKey()))
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        entry -> entry.getValue().get(0) //todo: check
+                ));
+    }
+
     @Path("{task_level}/{path: .*}")
     @GET
     public Response getTaskGet(@Auth User user,
@@ -67,15 +83,23 @@ public class TaskResource
         if(query != null) {
             fullPath += query;
         }
+        Map<String, String> headers = extractProxiedHeaders(containerRequestContext.getHeaders());//todo: inline
         TaskRequestContext taskRequestContext = new TaskRequestContext()
                 .withHttpMethod("POST")
                 .withUser(user)
-                .withPath(fullPath);
-
+                .withPath(fullPath)
+                .withHeaders(headers);
 
         TaskResponse taskResponse = getTaskResponse(taskLevel, taskRequestContext);
-        //todo: headers
-        return Response.ok().entity(taskResponse.getText()).build();
+
+
+        Response.ResponseBuilder responseBuilder = Response.ok()
+                .entity(taskResponse.getText());
+
+        taskResponse.getHeaders().entrySet()
+                .stream()
+                .forEach(headerEntry -> responseBuilder.header(headerEntry.getKey(), headerEntry.getValue()));
+        return responseBuilder.build();
     }
 
     @Path("{task_level}/{path: .*}")
@@ -92,13 +116,25 @@ public class TaskResource
         }
         String body = StreamUtils.readStream(containerRequestContext.getEntityStream());
         //todo: TaskContextFrom
+
+        Map<String, String> headers = extractProxiedHeaders(containerRequestContext.getHeaders());//todo: inline
+
         TaskRequestContext taskRequestContext = new TaskRequestContext()
                 .withHttpMethod("POST")
                 .withUser(user)
                 .withPath(fullPath)
-                .withBody(body);
+                .withBody(body)
+                .withHeaders(headers);
+
         TaskResponse taskResponse = getTaskResponse(taskLevel, taskRequestContext);
-        //todo: hedaers
-        return Response.ok().entity(taskResponse.getText()).build();
+
+        Response.ResponseBuilder responseBuilder = Response.ok()
+                .entity(taskResponse.getText());
+
+        taskResponse.getHeaders().entrySet()
+                .stream()
+                .forEach(headerEntry -> responseBuilder.header(headerEntry.getKey(), headerEntry.getValue()));
+
+        return responseBuilder.build();
     }
 }