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
cf82dbe7
Commit
cf82dbe7
authored
Feb 22, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implement simple getUserTaskFlag endpoint
parent
00c79cfe
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
5 deletions
+30
-5
TasksResource.java
service/src/main/java/api/TasksResource.java
+18
-4
TasksRepository.java
service/src/main/java/repositories/TasksRepository.java
+12
-1
No files found.
service/src/main/java/api/TasksResource.java
View file @
cf82dbe7
...
...
@@ -6,13 +6,12 @@ import objects.User;
import
repositories.TasksRepository
;
import
javax.inject.Inject
;
import
javax.ws.rs.GET
;
import
javax.ws.rs.POST
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.*
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.Optional
;
/**
* Created by gpietrus on 16.02.16.
...
...
@@ -39,6 +38,21 @@ public class TasksResource
return
tasksRepository
.
getUserFlagsHashes
(
user
.
getName
()).
keySet
();
}
//todo: merge with upper
//todo: user argument
//todo: pass username in header via proxy?
//todo: post
@GET
@Path
(
"flags/{task_id}"
)
public
Response
getUserTaskFlag
(
final
@PathParam
(
"task_id"
)
String
taskId
)
{
String
temporaryUserName
=
"gpietrus1"
;
Optional
<
String
>
userTaskFlag
=
tasksRepository
.
getUserTaskFlag
(
temporaryUserName
,
taskId
);
//todo
if
(
userTaskFlag
.
isPresent
())
{
return
Response
.
ok
().
entity
(
userTaskFlag
.
get
()).
build
();
}
return
Response
.
status
(
Response
.
Status
.
BAD_REQUEST
).
build
();
}
@POST
public
boolean
submitSolution
(
@Auth
User
user
,
String
flag
)
throws
Exception
{
...
...
service/src/main/java/repositories/TasksRepository.java
View file @
cf82dbe7
...
...
@@ -10,7 +10,10 @@ import org.bson.Document;
import
javax.inject.Inject
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
java.util.*
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -90,6 +93,14 @@ public class TasksRepository implements Repository {
public
boolean
checkFlag
(
String
username
,
String
flagValue
)
throws
Exception
{
return
compareHash
(
flagValue
,
username
);
}
public
Optional
<
String
>
getUserTaskFlag
(
String
username
,
String
taskId
)
{
//todo: taskId, level, name? discuss
return
getUserFlagsHashes
(
username
).
entrySet
().
stream
()
.
filter
(
taskEntry
->
taskEntry
.
getValue
().
getName
().
equals
(
taskId
))
.
map
(
taskEntry
->
calculateHashValue
(
username
,
taskEntry
.
getValue
().
getFlag
().
getValue
()))
.
findFirst
();
}
}
//todo: generify!
\ No newline at end of file
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