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
9c8f4d3f
Commit
9c8f4d3f
authored
Apr 01, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove salt from configuration
rename flagmessagedigest to digestmethod
parent
69d6164c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
20 deletions
+6
-20
configuration.yml
service/configuration.yml
+0
-3
ApplicationConfiguration.java
...honers/krakyournet/ctf/core/ApplicationConfiguration.java
+5
-16
MessageDigestProvider.java
...ners/krakyournet/ctf/providers/MessageDigestProvider.java
+1
-1
No files found.
service/configuration.yml
View file @
9c8f4d3f
...
...
@@ -9,9 +9,6 @@ dbHost: 92f653f4-cf83-4801-8475-cd748954c3b6.node.dockerapp.io
dbPort
:
27017
dbName
:
db
flagHashMethod
:
"
MD5"
salt
:
"
SECURE_SALT"
admins
:
-
name
:
"
gpietrus_admin"
password
:
"
41b450e73c974fca46911eba84e114f2"
#gpietrus md5
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/core/ApplicationConfiguration.java
View file @
9c8f4d3f
...
...
@@ -13,12 +13,11 @@ public class ApplicationConfiguration extends Configuration
private
String
dbHost
;
private
int
dbPort
;
private
String
dbName
;
private
String
flagHash
Method
;
private
String
digest
Method
;
private
List
<
Team
>
teams
;
private
List
<
TextTask
>
textTasks
;
private
List
<
WebTask
>
webTasks
;
private
List
<
User
>
admins
;
private
String
salt
;
public
List
<
User
>
getAdmins
()
{
...
...
@@ -30,9 +29,9 @@ public class ApplicationConfiguration extends Configuration
this
.
admins
=
admins
;
}
public
String
get
FlagHash
Method
()
public
String
get
Digest
Method
()
{
return
flagHash
Method
;
return
digest
Method
;
}
public
List
<
Team
>
getTeams
()
...
...
@@ -45,9 +44,9 @@ public class ApplicationConfiguration extends Configuration
this
.
teams
=
teams
;
}
public
void
set
FlagHashMethod
(
String
flagHash
Method
)
public
void
set
DigestMethodHashMethod
(
String
digest
Method
)
{
this
.
flagHashMethod
=
flagHash
Method
;
this
.
digestMethod
=
digest
Method
;
}
public
String
getDbHost
()
...
...
@@ -99,14 +98,4 @@ public class ApplicationConfiguration extends Configuration
{
this
.
webTasks
=
webTasks
;
}
public
String
getSalt
()
{
return
salt
;
}
public
void
setSalt
(
String
salt
)
{
this
.
salt
=
salt
;
}
}
service/src/main/java/com/telephoners/krakyournet/ctf/providers/MessageDigestProvider.java
View file @
9c8f4d3f
...
...
@@ -21,7 +21,7 @@ public class MessageDigestProvider
public
MessageDigest
getMessageDigest
()
{
try
{
return
MessageDigest
.
getInstance
(
applicationConfiguration
.
get
FlagHash
Method
());
return
MessageDigest
.
getInstance
(
applicationConfiguration
.
get
Digest
Method
());
}
catch
(
NoSuchAlgorithmException
e
)
{
e
.
printStackTrace
();
}
...
...
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