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
72a4b117
Commit
72a4b117
authored
Mar 22, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor flags per user
parent
3c69ee50
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
14 deletions
+9
-14
TasksRepository.java
...phoners/krakyournet/ctf/repositories/TasksRepository.java
+6
-10
TasksResource.java
.../telephoners/krakyournet/ctf/resources/TasksResource.java
+3
-4
No files found.
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java
View file @
72a4b117
...
@@ -56,18 +56,14 @@ public class TasksRepository extends Repository<Task>
...
@@ -56,18 +56,14 @@ public class TasksRepository extends Repository<Task>
.
asList
();
.
asList
();
}
}
//todo: refactor?
public
Map
<
Integer
,
List
<
String
>>
getUserFlagsHashes
(
String
username
)
public
Map
<
List
<
String
>,
Integer
>
getUserFlagsHashes
(
String
username
)
{
{
return
this
.
getAll
().
stream
()
return
getAll
().
stream
()
.
collect
(
Collectors
.
toMap
(
.
collect
(
Collectors
.
toMap
(
task
->
{
Task:
:
getLevel
,
List
<
String
>
collect
=
task
.
getFlags
().
stream
()
task
->
task
.
getFlags
().
stream
()
.
map
(
flag
->
calculateHashValue
(
username
,
flag
.
getValue
()))
.
map
(
flag
->
calculateHashValue
(
username
,
flag
.
getValue
()))
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
())
return
collect
;
},
Task:
:
getLevel
));
));
}
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/TasksResource.java
View file @
72a4b117
...
@@ -4,7 +4,6 @@ import com.telephoners.krakyournet.ctf.beans.User;
...
@@ -4,7 +4,6 @@ import com.telephoners.krakyournet.ctf.beans.User;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.repositories.TasksRepository
;
import
com.telephoners.krakyournet.ctf.repositories.TasksRepository
;
import
io.dropwizard.auth.Auth
;
import
io.dropwizard.auth.Auth
;
import
org.apache.commons.collections.MapUtils
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Singleton
;
import
javax.inject.Singleton
;
...
@@ -15,7 +14,6 @@ import javax.ws.rs.Produces;
...
@@ -15,7 +14,6 @@ import javax.ws.rs.Produces;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
@Singleton
@Singleton
@Path
(
value
=
"/tasks"
)
@Path
(
value
=
"/tasks"
)
...
@@ -41,8 +39,9 @@ public class TasksResource
...
@@ -41,8 +39,9 @@ public class TasksResource
public
Response
getUserFlags
(
@Auth
User
user
,
final
@PathParam
(
"username"
)
String
username
)
public
Response
getUserFlags
(
@Auth
User
user
,
final
@PathParam
(
"username"
)
String
username
)
{
{
if
(
user
.
isAdmin
())
{
if
(
user
.
isAdmin
())
{
Map
<
List
<
String
>,
Integer
>
userFlagsHashes
=
tasksRepository
.
getUserFlagsHashes
(
username
);
return
Response
.
ok
()
return
Response
.
ok
().
entity
(
MapUtils
.
invertMap
(
userFlagsHashes
)).
build
();
.
entity
(
tasksRepository
.
getUserFlagsHashes
(
username
))
.
build
();
}
}
return
Response
.
status
(
Response
.
Status
.
UNAUTHORIZED
).
build
();
return
Response
.
status
(
Response
.
Status
.
UNAUTHORIZED
).
build
();
}
}
...
...
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