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
c99c27f1
Commit
c99c27f1
authored
Mar 22, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
inject message digest
parent
24890a47
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
12 deletions
+8
-12
TasksRepository.java
...phoners/krakyournet/ctf/repositories/TasksRepository.java
+8
-12
No files found.
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java
View file @
c99c27f1
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
import
com.google.inject.name.Named
;
import
com.telephoners.krakyournet.ctf.beans.Flag
;
import
com.telephoners.krakyournet.ctf.beans.Flag
;
import
com.telephoners.krakyournet.ctf.beans.Solution
;
import
com.telephoners.krakyournet.ctf.beans.Solution
;
import
com.telephoners.krakyournet.ctf.beans.Team
;
import
com.telephoners.krakyournet.ctf.beans.Team
;
...
@@ -14,7 +15,6 @@ import org.mongodb.morphia.Datastore;
...
@@ -14,7 +15,6 @@ import org.mongodb.morphia.Datastore;
import
javax.inject.Inject
;
import
javax.inject.Inject
;
import
javax.inject.Singleton
;
import
javax.inject.Singleton
;
import
java.security.MessageDigest
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.Optional
;
...
@@ -27,16 +27,19 @@ public class TasksRepository extends Repository<Task>
...
@@ -27,16 +27,19 @@ public class TasksRepository extends Repository<Task>
private
Datastore
datastore
;
private
Datastore
datastore
;
private
TeamsRepository
teamsRepository
;
private
TeamsRepository
teamsRepository
;
private
SolutionsRepository
solutionsRepository
;
private
SolutionsRepository
solutionsRepository
;
private
MessageDigest
messageDigest
;
@Inject
@Inject
public
TasksRepository
(
ApplicationConfiguration
applicationConfiguration
,
Datastore
datastore
,
public
TasksRepository
(
ApplicationConfiguration
applicationConfiguration
,
Datastore
datastore
,
TeamsRepository
teamsRepository
,
SolutionsRepository
solutionsRepository
)
TeamsRepository
teamsRepository
,
SolutionsRepository
solutionsRepository
,
final
@Named
(
"messageDigest"
)
MessageDigest
messageDigest
)
{
{
super
(
datastore
);
super
(
datastore
);
this
.
applicationConfiguration
=
applicationConfiguration
;
this
.
applicationConfiguration
=
applicationConfiguration
;
this
.
datastore
=
datastore
;
this
.
datastore
=
datastore
;
this
.
teamsRepository
=
teamsRepository
;
this
.
teamsRepository
=
teamsRepository
;
this
.
solutionsRepository
=
solutionsRepository
;
this
.
solutionsRepository
=
solutionsRepository
;
this
.
messageDigest
=
messageDigest
;
}
}
public
Task
getByLevel
(
int
level
)
public
Task
getByLevel
(
int
level
)
...
@@ -82,16 +85,9 @@ public class TasksRepository extends Repository<Task>
...
@@ -82,16 +85,9 @@ public class TasksRepository extends Repository<Task>
}
}
public
String
calculateHashValue
(
String
username
,
String
flagValue
)
public
String
calculateHashValue
(
String
username
,
String
flagValue
)
{
//todo
{
String
combinedStrings
=
applicationConfiguration
.
getSalt
()
+
username
+
flagValue
;
//todo
String
combinedStrings
=
applicationConfiguration
.
getSalt
()
+
username
+
flagValue
;
MessageDigest
md5
=
null
;
//todo: discuss
return
Hex
.
encodeHexString
(
messageDigest
.
digest
(
combinedStrings
.
getBytes
()));
try
{
md5
=
MessageDigest
.
getInstance
(
applicationConfiguration
.
getFlagHashMethod
());
}
catch
(
NoSuchAlgorithmException
e
)
{
e
.
printStackTrace
();
}
String
encodedHash
=
Hex
.
encodeHexString
(
md5
.
digest
(
combinedStrings
.
getBytes
()));
return
encodedHash
;
}
}
private
boolean
isAlreadySubmittedSolution
(
Solution
solution
)
private
boolean
isAlreadySubmittedSolution
(
Solution
solution
)
...
...
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