Commit 1cb24255 authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

flag authorization

parent 4fdffdc0
...@@ -38,13 +38,14 @@ public class TasksResource ...@@ -38,13 +38,14 @@ public class TasksResource
} }
@GET @GET
public List<Task> getTasks(@Auth User user) { public List<Task> getTasks() {
return tasksRepository.getAll(); return tasksRepository.getAll();
} }
@POST @POST
public boolean submitSolution(String flag) throws Exception { public boolean submitSolution(@Auth User user,
return flagChecker.checkFlag(flag); String flag) throws Exception {
return flagChecker.checkFlag(user.getName(), flag);
} }
} }
...@@ -41,7 +41,8 @@ public class FlagChecker { ...@@ -41,7 +41,8 @@ public class FlagChecker {
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
e.printStackTrace(); e.printStackTrace();
} }
return Hex.encodeHexString(md5.digest(combinedStrings.getBytes())); String encodedHash = Hex.encodeHexString(md5.digest(combinedStrings.getBytes()));
return encodedHash;
} }
private void acceptSolution(String username, Task task) { private void acceptSolution(String username, Task task) {
...@@ -67,8 +68,7 @@ public class FlagChecker { ...@@ -67,8 +68,7 @@ public class FlagChecker {
return false; return false;
} }
public boolean checkFlag(String flagValue) throws Exception { public boolean checkFlag(String username, String flagValue) throws Exception {
String username = "gpietrus"; //todo
String hash = calculateHashValue(username, flagValue); String hash = calculateHashValue(username, flagValue);
return compareHash(hash, username); return compareHash(hash, username);
} }
......
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