Commit 9c8f4d3f authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

remove salt from configuration

rename flagmessagedigest to digestmethod
parent 69d6164c
...@@ -9,9 +9,6 @@ dbHost: 92f653f4-cf83-4801-8475-cd748954c3b6.node.dockerapp.io ...@@ -9,9 +9,6 @@ dbHost: 92f653f4-cf83-4801-8475-cd748954c3b6.node.dockerapp.io
dbPort: 27017 dbPort: 27017
dbName: db dbName: db
flagHashMethod: "MD5"
salt: "SECURE_SALT"
admins: admins:
- name: "gpietrus_admin" - name: "gpietrus_admin"
password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5 password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
......
...@@ -13,12 +13,11 @@ public class ApplicationConfiguration extends Configuration ...@@ -13,12 +13,11 @@ public class ApplicationConfiguration extends Configuration
private String dbHost; private String dbHost;
private int dbPort; private int dbPort;
private String dbName; private String dbName;
private String flagHashMethod; private String digestMethod;
private List<Team> teams; private List<Team> teams;
private List<TextTask> textTasks; private List<TextTask> textTasks;
private List<WebTask> webTasks; private List<WebTask> webTasks;
private List<User> admins; private List<User> admins;
private String salt;
public List<User> getAdmins() public List<User> getAdmins()
{ {
...@@ -30,9 +29,9 @@ public class ApplicationConfiguration extends Configuration ...@@ -30,9 +29,9 @@ public class ApplicationConfiguration extends Configuration
this.admins = admins; this.admins = admins;
} }
public String getFlagHashMethod() public String getDigestMethod()
{ {
return flagHashMethod; return digestMethod;
} }
public List<Team> getTeams() public List<Team> getTeams()
...@@ -45,9 +44,9 @@ public class ApplicationConfiguration extends Configuration ...@@ -45,9 +44,9 @@ public class ApplicationConfiguration extends Configuration
this.teams = teams; this.teams = teams;
} }
public void setFlagHashMethod(String flagHashMethod) public void setDigestMethodHashMethod(String digestMethod)
{ {
this.flagHashMethod = flagHashMethod; this.digestMethod = digestMethod;
} }
public String getDbHost() public String getDbHost()
...@@ -99,14 +98,4 @@ public class ApplicationConfiguration extends Configuration ...@@ -99,14 +98,4 @@ public class ApplicationConfiguration extends Configuration
{ {
this.webTasks = webTasks; this.webTasks = webTasks;
} }
public String getSalt()
{
return salt;
}
public void setSalt(String salt)
{
this.salt = salt;
}
} }
...@@ -21,7 +21,7 @@ public class MessageDigestProvider ...@@ -21,7 +21,7 @@ public class MessageDigestProvider
public MessageDigest getMessageDigest() public MessageDigest getMessageDigest()
{ {
try { try {
return MessageDigest.getInstance(applicationConfiguration.getFlagHashMethod()); return MessageDigest.getInstance(applicationConfiguration.getDigestMethod());
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
e.printStackTrace(); e.printStackTrace();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment