Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
CTF
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grzegorz
CTF
Commits
8b9ef287
Commit
8b9ef287
authored
Feb 22, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add TaskUserPair
parent
cf82dbe7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
7 deletions
+46
-7
TasksResource.java
service/src/main/java/api/TasksResource.java
+15
-7
TaskUserPair.java
service/src/main/java/helpers/TaskUserPair.java
+31
-0
No files found.
service/src/main/java/api/TasksResource.java
View file @
8b9ef287
package
api
;
package
api
;
import
helpers.TaskUserPair
;
import
io.dropwizard.auth.Auth
;
import
io.dropwizard.auth.Auth
;
import
objects.Task
;
import
objects.Task
;
import
objects.User
;
import
objects.User
;
import
repositories.TasksRepository
;
import
repositories.TasksRepository
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.validation.Valid
;
import
javax.ws.rs.*
;
import
javax.ws.rs.*
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
...
@@ -39,20 +41,26 @@ public class TasksResource
...
@@ -39,20 +41,26 @@ public class TasksResource
}
}
//todo: merge with upper
//todo: merge with upper
//todo: user argument
//todo: pass username in header via proxy?
//todo: pass username in header via proxy?
//todo: post
@POST
@GET
//todo: authorization
@Path
(
"
flags/{task_id}
"
)
@Path
(
"
/flags/user_task_flag
"
)
public
Response
getUserTaskFlag
(
final
@PathParam
(
"task_id"
)
String
taskId
)
{
@Consumes
(
MediaType
.
APPLICATION_JSON
)
String
temporaryUserName
=
"gpietrus1"
;
public
Response
getUserTaskFlag
(
@Valid
final
TaskUserPair
taskUserPair
)
{
Optional
<
String
>
userTaskFlag
=
tasksRepository
.
getUserTaskFlag
(
t
emporaryUserName
,
taskId
);
//todo
Optional
<
String
>
userTaskFlag
=
tasksRepository
.
getUserTaskFlag
(
t
askUserPair
.
getUsername
(),
taskUserPair
.
getTaskId
()
);
//todo
if
(
userTaskFlag
.
isPresent
())
{
if
(
userTaskFlag
.
isPresent
())
{
return
Response
.
ok
().
entity
(
userTaskFlag
.
get
()).
build
();
return
Response
.
ok
().
entity
(
userTaskFlag
.
get
()).
build
();
}
}
return
Response
.
status
(
Response
.
Status
.
BAD_REQUEST
).
build
();
return
Response
.
status
(
Response
.
Status
.
BAD_REQUEST
).
build
();
}
}
// example json:
// {
// "username": "gpietrus2",
// "taskId": "abb6b014-1ee0-4f53-b8df-c7029335c070"
// }
@POST
@POST
public
boolean
submitSolution
(
@Auth
User
user
,
public
boolean
submitSolution
(
@Auth
User
user
,
String
flag
)
throws
Exception
{
String
flag
)
throws
Exception
{
...
...
service/src/main/java/helpers/TaskUserPair.java
0 → 100644
View file @
8b9ef287
package
helpers
;
import
org.hibernate.validator.constraints.NotEmpty
;
/**
* Created by gpietrus on 22.02.2016.
*/
public
class
TaskUserPair
{
@NotEmpty
private
String
taskId
;
@NotEmpty
private
String
username
;
public
String
getTaskId
()
{
return
taskId
;
}
public
void
setTaskId
(
String
taskId
)
{
this
.
taskId
=
taskId
;
}
public
String
getUsername
()
{
return
username
;
}
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment