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
d052c8fa
Commit
d052c8fa
authored
Apr 01, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code inspection fixes
parent
a1ccd8aa
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
22 additions
and
60 deletions
+22
-60
Task.java
...ava/com/telephoners/krakyournet/ctf/beans/tasks/Task.java
+4
-4
Test.java
.../main/java/com/telephoners/krakyournet/ctf/core/Test.java
+0
-25
ApplicationModule.java
...elephoners/krakyournet/ctf/modules/ApplicationModule.java
+1
-1
DatastoreProvider.java
...ephoners/krakyournet/ctf/providers/DatastoreProvider.java
+1
-1
MessageDigestProvider.java
...ners/krakyournet/ctf/providers/MessageDigestProvider.java
+1
-1
Repository.java
.../telephoners/krakyournet/ctf/repositories/Repository.java
+1
-2
SolutionsRepository.java
...ers/krakyournet/ctf/repositories/SolutionsRepository.java
+2
-2
TasksRepository.java
...phoners/krakyournet/ctf/repositories/TasksRepository.java
+1
-1
TeamsRepository.java
...phoners/krakyournet/ctf/repositories/TeamsRepository.java
+2
-2
UsersRepository.java
...phoners/krakyournet/ctf/repositories/UsersRepository.java
+1
-1
SolutionsResource.java
...ephoners/krakyournet/ctf/resources/SolutionsResource.java
+3
-3
TaskResource.java
...m/telephoners/krakyournet/ctf/resources/TaskResource.java
+1
-13
TasksResource.java
.../telephoners/krakyournet/ctf/resources/TasksResource.java
+1
-1
TeamsResource.java
.../telephoners/krakyournet/ctf/resources/TeamsResource.java
+1
-1
UtilResource.java
...m/telephoners/krakyournet/ctf/resources/UtilResource.java
+1
-1
home.html
service/src/main/resources/assets/home.html
+1
-1
No files found.
service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/Task.java
View file @
d052c8fa
...
@@ -16,12 +16,12 @@ import java.util.List;
...
@@ -16,12 +16,12 @@ import java.util.List;
public
abstract
class
Task
public
abstract
class
Task
{
{
@Id
@Id
pr
otected
ObjectId
id
;
pr
ivate
ObjectId
id
;
@PublicProperty
@PublicProperty
pr
otected
String
name
;
pr
ivate
String
name
;
@PublicProperty
@PublicProperty
pr
otected
int
level
;
pr
ivate
int
level
;
pr
otected
List
<
Flag
>
flags
;
pr
ivate
List
<
Flag
>
flags
;
public
Task
(
String
name
,
int
level
,
List
<
Flag
>
flags
)
public
Task
(
String
name
,
int
level
,
List
<
Flag
>
flags
)
{
{
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/core/Test.java
deleted
100644 → 0
View file @
a1ccd8aa
package
com
.
telephoners
.
krakyournet
.
ctf
.
core
;
/**
* Created by gpietrus on 21.02.2016.
*/
public
class
Test
{
private
String
value
;
private
String
asdf
;
public
String
getValue
()
{
return
value
;
}
public
void
setValue
(
String
value
)
{
this
.
value
=
value
;
}
public
String
getAsdf
()
{
return
asdf
;
}
public
void
setAsdf
(
String
asdf
)
{
this
.
asdf
=
asdf
;
}
}
service/src/main/java/com/telephoners/krakyournet/ctf/modules/ApplicationModule.java
View file @
d052c8fa
...
@@ -7,7 +7,7 @@ import org.mongodb.morphia.Datastore;
...
@@ -7,7 +7,7 @@ import org.mongodb.morphia.Datastore;
public
class
ApplicationModule
extends
AbstractModule
public
class
ApplicationModule
extends
AbstractModule
{
{
private
ApplicationConfiguration
applicationConfiguration
;
private
final
ApplicationConfiguration
applicationConfiguration
;
public
ApplicationModule
(
ApplicationConfiguration
applicationConfiguration
)
public
ApplicationModule
(
ApplicationConfiguration
applicationConfiguration
)
{
{
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/providers/DatastoreProvider.java
View file @
d052c8fa
...
@@ -9,7 +9,7 @@ import javax.inject.Inject;
...
@@ -9,7 +9,7 @@ import javax.inject.Inject;
public
class
DatastoreProvider
public
class
DatastoreProvider
{
{
private
ApplicationConfiguration
applicationConfiguration
;
private
final
ApplicationConfiguration
applicationConfiguration
;
@Inject
@Inject
public
DatastoreProvider
(
ApplicationConfiguration
applicationConfiguration
)
public
DatastoreProvider
(
ApplicationConfiguration
applicationConfiguration
)
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/providers/MessageDigestProvider.java
View file @
d052c8fa
...
@@ -10,7 +10,7 @@ import java.security.NoSuchAlgorithmException;
...
@@ -10,7 +10,7 @@ import java.security.NoSuchAlgorithmException;
@Singleton
@Singleton
public
class
MessageDigestProvider
public
class
MessageDigestProvider
{
{
private
ApplicationConfiguration
applicationConfiguration
;
private
final
ApplicationConfiguration
applicationConfiguration
;
@Inject
@Inject
public
MessageDigestProvider
(
ApplicationConfiguration
applicationConfiguration
)
public
MessageDigestProvider
(
ApplicationConfiguration
applicationConfiguration
)
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/Repository.java
View file @
d052c8fa
...
@@ -8,7 +8,7 @@ import java.util.List;
...
@@ -8,7 +8,7 @@ import java.util.List;
public
abstract
class
Repository
<
T
>
public
abstract
class
Repository
<
T
>
{
{
protected
Datastore
datastore
;
protected
final
Datastore
datastore
;
@Inject
@Inject
public
Repository
(
Datastore
datastore
)
public
Repository
(
Datastore
datastore
)
...
@@ -23,7 +23,6 @@ public abstract class Repository<T>
...
@@ -23,7 +23,6 @@ public abstract class Repository<T>
public
List
<
T
>
getAll
()
public
List
<
T
>
getAll
()
{
{
//todo: unchecked cast
return
datastore
.
createQuery
(
getRepositoryType
()).
asList
();
return
datastore
.
createQuery
(
getRepositoryType
()).
asList
();
}
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/SolutionsRepository.java
View file @
d052c8fa
...
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
...
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
@Singleton
@Singleton
public
class
SolutionsRepository
extends
Repository
<
Solution
>
public
class
SolutionsRepository
extends
Repository
<
Solution
>
{
{
private
TasksRepository
tasksRepository
;
private
final
TasksRepository
tasksRepository
;
@Inject
@Inject
public
SolutionsRepository
(
TasksRepository
tasksRepository
,
public
SolutionsRepository
(
TasksRepository
tasksRepository
,
...
@@ -49,7 +49,7 @@ public class SolutionsRepository extends Repository<Solution>
...
@@ -49,7 +49,7 @@ public class SolutionsRepository extends Repository<Solution>
));
));
}
}
p
ublic
boolean
isAlreadySubmittedSolution
(
Solution
solution
)
p
rivate
boolean
isAlreadySubmittedSolution
(
Solution
solution
)
{
{
return
!
datastore
.
find
(
Solution
.
class
)
return
!
datastore
.
find
(
Solution
.
class
)
.
filter
(
"flag.value"
,
solution
.
getFlag
().
getValue
())
.
filter
(
"flag.value"
,
solution
.
getFlag
().
getValue
())
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java
View file @
d052c8fa
...
@@ -12,7 +12,7 @@ import java.util.List;
...
@@ -12,7 +12,7 @@ import java.util.List;
@Singleton
@Singleton
public
class
TasksRepository
extends
Repository
<
Task
>
public
class
TasksRepository
extends
Repository
<
Task
>
{
{
private
Datastore
datastore
;
private
final
Datastore
datastore
;
@Inject
@Inject
public
TasksRepository
(
Datastore
datastore
)
public
TasksRepository
(
Datastore
datastore
)
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TeamsRepository.java
View file @
d052c8fa
...
@@ -12,8 +12,8 @@ import javax.inject.Singleton;
...
@@ -12,8 +12,8 @@ import javax.inject.Singleton;
public
class
TeamsRepository
extends
Repository
<
Team
>
public
class
TeamsRepository
extends
Repository
<
Team
>
{
{
private
Datastore
datastore
;
private
final
Datastore
datastore
;
private
UsersRepository
usersRepository
;
private
final
UsersRepository
usersRepository
;
@Inject
@Inject
public
TeamsRepository
(
Datastore
datastore
,
public
TeamsRepository
(
Datastore
datastore
,
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/UsersRepository.java
View file @
d052c8fa
...
@@ -12,7 +12,7 @@ import org.mongodb.morphia.Datastore;
...
@@ -12,7 +12,7 @@ import org.mongodb.morphia.Datastore;
@Singleton
@Singleton
public
class
UsersRepository
extends
Repository
<
User
>
public
class
UsersRepository
extends
Repository
<
User
>
{
{
private
MessageDigestProvider
messageDigestProvider
;
private
final
MessageDigestProvider
messageDigestProvider
;
@Inject
@Inject
public
UsersRepository
(
Datastore
datastore
,
MessageDigestProvider
messageDigestProvider
)
public
UsersRepository
(
Datastore
datastore
,
MessageDigestProvider
messageDigestProvider
)
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/SolutionsResource.java
View file @
d052c8fa
...
@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
...
@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
@Produces
(
MediaType
.
APPLICATION_JSON
)
@Produces
(
MediaType
.
APPLICATION_JSON
)
public
class
SolutionsResource
public
class
SolutionsResource
{
{
private
TeamsRepository
teamsRepository
;
private
final
TeamsRepository
teamsRepository
;
private
SolutionsRepository
solutionsRepository
;
private
final
SolutionsRepository
solutionsRepository
;
private
TasksRepository
tasksRepository
;
private
final
TasksRepository
tasksRepository
;
@Inject
@Inject
public
SolutionsResource
(
SolutionsRepository
solutionsRepository
,
TasksRepository
tasksRepository
,
public
SolutionsResource
(
SolutionsRepository
solutionsRepository
,
TasksRepository
tasksRepository
,
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/TaskResource.java
View file @
d052c8fa
...
@@ -2,15 +2,8 @@ package com.telephoners.krakyournet.ctf.resources;
...
@@ -2,15 +2,8 @@ package com.telephoners.krakyournet.ctf.resources;
import
com.telephoners.krakyournet.ctf.beans.User
;
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.beans.tasks.TextTask
;
import
com.telephoners.krakyournet.ctf.beans.tasks.WebTask
;
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.http.HttpEntity
;
import
org.apache.http.client.methods.CloseableHttpResponse
;
import
org.apache.http.client.methods.HttpGet
;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.HttpClients
;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Singleton
;
import
javax.inject.Singleton
;
...
@@ -18,18 +11,13 @@ import javax.ws.rs.GET;
...
@@ -18,18 +11,13 @@ import javax.ws.rs.GET;
import
javax.ws.rs.Path
;
import
javax.ws.rs.Path
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.PathParam
;
import
javax.ws.rs.core.Response
;
import
javax.ws.rs.core.Response
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStreamReader
;
import
java.util.stream.Collectors
;
@Singleton
@Singleton
@Path
(
value
=
"/task"
)
@Path
(
value
=
"/task"
)
public
class
TaskResource
public
class
TaskResource
{
{
private
final
TasksRepository
tasksRepository
;
protected
TasksRepository
tasksRepository
;
@Inject
@Inject
public
TaskResource
(
TasksRepository
tasksRepository
)
public
TaskResource
(
TasksRepository
tasksRepository
)
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/TasksResource.java
View file @
d052c8fa
...
@@ -16,7 +16,7 @@ import java.util.List;
...
@@ -16,7 +16,7 @@ import java.util.List;
@Produces
(
MediaType
.
APPLICATION_JSON
)
@Produces
(
MediaType
.
APPLICATION_JSON
)
public
class
TasksResource
public
class
TasksResource
{
{
private
TasksRepository
tasksRepository
;
private
final
TasksRepository
tasksRepository
;
@Inject
@Inject
public
TasksResource
(
TasksRepository
tasksRepository
)
public
TasksResource
(
TasksRepository
tasksRepository
)
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/TeamsResource.java
View file @
d052c8fa
...
@@ -16,7 +16,7 @@ import java.util.List;
...
@@ -16,7 +16,7 @@ import java.util.List;
@Produces
(
MediaType
.
APPLICATION_JSON
)
@Produces
(
MediaType
.
APPLICATION_JSON
)
public
class
TeamsResource
public
class
TeamsResource
{
{
private
TeamsRepository
teamsRepository
;
private
final
TeamsRepository
teamsRepository
;
@Inject
@Inject
public
TeamsResource
(
TeamsRepository
teamsRepository
)
{
public
TeamsResource
(
TeamsRepository
teamsRepository
)
{
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/resources/UtilResource.java
View file @
d052c8fa
...
@@ -24,7 +24,7 @@ import java.io.IOException;
...
@@ -24,7 +24,7 @@ import java.io.IOException;
public
class
UtilResource
public
class
UtilResource
{
{
private
TeamsRepository
teamsRepository
;
private
final
TeamsRepository
teamsRepository
;
@Inject
@Inject
public
UtilResource
(
TeamsRepository
teamsRepository
)
public
UtilResource
(
TeamsRepository
teamsRepository
)
...
...
service/src/main/resources/assets/home.html
View file @
d052c8fa
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
</div>
</div>
<div
style=
"text-align:center;width:100%"
>
made with
<i
class=
"fa fa-heart"
></i>
by
<a
<div
style=
"text-align:center;width:100%"
>
made with
<i
class=
"fa fa-heart"
></i>
by
<a
href=
"http://telephoners.agh.edu.pl"
id=
"telephoners"
><img
href=
"http://telephoners.agh.edu.pl"
id=
"telephoners"
><img
src=
"/statics/img/logo_telephoners.svg"
></img></a></div>
src=
"/statics/img/logo_telephoners.svg"
></a></div>
\ No newline at end of file
\ 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