Commit 4bca9ffb authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

crypto and web stub fixed

parent cfbabaed
...@@ -28,6 +28,8 @@ import resources.ProxyResource; ...@@ -28,6 +28,8 @@ import resources.ProxyResource;
import resources.SolutionsResource; import resources.SolutionsResource;
import resources.TasksResource; import resources.TasksResource;
import resources.TeamsResource; import resources.TeamsResource;
import resources.tasks.CryptoTaskResource;
import resources.tasks.WebTaskResource;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -95,8 +97,8 @@ public class CTFApplication extends Application<ApplicationConfiguration> { ...@@ -95,8 +97,8 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
//todo: use reflections to register tasks? //todo: use reflections to register tasks?
// jersey.register(new CryptoTaskResource()); jersey.register(new CryptoTaskResource());
// jersey.register(new WebTaskResource()); jersey.register(new WebTaskResource());
} }
private void registerAuthFeatures(Environment environment) { private void registerAuthFeatures(Environment environment) {
......
package resources.tasks; package resources.tasks;
import javax.ws.rs.GET;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
/** /**
* Created by gpietrus on 23.02.2016. * Created by gpietrus on 23.02.2016.
*/ */
@Produces(MediaType.APPLICATION_JSON)
public class CryptoTaskResource extends TaskResource { public class CryptoTaskResource extends TaskResource {
@Override @Override
@Path("/crypto/1") @Path("crypto")
@GET
public Response getTask() { public Response getTask() {
return Response.ok().entity("crypto task").build(); return Response.ok().entity("crypto task").build();
} }
......
package resources.tasks; package resources.tasks;
import javax.ws.rs.GET;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
/** /**
* Created by gpietrus on 23.02.2016. * Created by gpietrus on 23.02.2016.
*/ */
@Path("/task") @Path(value = "/task")
public abstract class TaskResource { public abstract class TaskResource {
public abstract Response getTask(); //todo: auth public abstract Response getTask(); //todo: auth
......
package resources.tasks; package resources.tasks;
import javax.ws.rs.GET;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
...@@ -8,7 +9,8 @@ import javax.ws.rs.core.Response; ...@@ -8,7 +9,8 @@ import javax.ws.rs.core.Response;
*/ */
public class WebTaskResource extends TaskResource { public class WebTaskResource extends TaskResource {
@Path("/web/1") @Path("web")
@GET
public Response getTask() { public Response getTask() {
return Response.ok().entity("web task").build(); return Response.ok().entity("web task").build();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment