merging

src/be/jeffcheasey88/peeratcode/Configuration.java

@@ -20,6 +20,8 @@ public class Configuration {
 	private String ssl_keystore;
 	private String ssl_keystorePasswd;
 
+	private String users_files;
+
 	private String token_issuer;
 	private int token_expiration;
 
@@ -31,13 +33,15 @@ public class Configuration {
 	}
 
 	public void load() throws Exception {
-		if(!this._file.exists()) return;
+		if (!this._file.exists())
+			return;
 		BufferedReader reader = new BufferedReader(new FileReader(this._file));
 		String line;
 		while ((line = reader.readLine()) != null) {
 			String[] split = line.split("=");
 			Field field = getClass().getDeclaredField(split[0]);
-			if(field == null) continue;
+			if (field == null)
+				continue;
 			field.setAccessible(true);
 			injectValue(field, split[1]);
 		}
@@ -71,7 +75,8 @@ public class Configuration {
 			case "short":
 				field.setShort(this, Short.parseShort(value));
 				break;
-				default: throw new IllegalArgumentException(value);
+			default:
+				throw new IllegalArgumentException(value);
 			}
 			return;
 		}
@@ -85,14 +90,16 @@ public class Configuration {
 	public void save() throws Exception {
 		if (!_file.exists()) {
 			File parent = _file.getParentFile();
-			if(!parent.exists()) parent.mkdirs();
+			if (!parent.exists())
+				parent.mkdirs();
 			_file.createNewFile();
 		}
 		Field[] fields = getClass().getDeclaredFields();
 		BufferedWriter writer = new BufferedWriter(new FileWriter(_file));
 		for (Field field : fields) {
 			field.setAccessible(true);
-			if(field.getName().startsWith("_")) continue;
+			if (field.getName().startsWith("_"))
+				continue;
 			Object value = field.get(this);
 			writer.write(field.getName() + "=" + value);
 		}
@@ -143,4 +150,10 @@ public class Configuration {
 	public boolean useSsl() {
 		return this.use_ssl;
 	}
+
+	public String getUsersFiles() {
+		if (users_files == null || users_files.trim().isEmpty())
+			users_files = "/tmp/users_files";
+		return users_files;
+	}
 }

src/be/jeffcheasey88/peeratcode/Main.java

@@ -40,7 +40,8 @@ public class Main {
 
 		Class.forName("com.mysql.cj.jdbc.Driver");
 
-		Router router = new Router(new DatabaseRepository(config), config.getTokenIssuer(), config.getTokenExpiration());
+		Router router = new Router(new DatabaseRepository(config), config.getTokenIssuer(),
+				config.getTokenExpiration());
 
 		router.setDefault(new Response() {
 			@Override
@@ -56,26 +57,24 @@ public class Main {
 			@Route(path = "^(.*)$", type = "OPTIONS")
 			@Override
 			public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-				HttpUtil.responseHeaders(writer, 200,
+				HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *",
-						"Access-Control-Allow-Origin: *",
+						"Access-Control-Allow-Methods: *", "Access-Control-Allow-Headers: *");
-						"Access-Control-Allow-Methods: *",
-						"Access-Control-Allow-Headers: *");
 			}
 		});
 
-		initRoutes(router);
+		initRoutes(router, config);
 
 		startWebServer(config, router);
 	}
 
-	private static void initRoutes(Router router) {
+	private static void initRoutes(Router router, Configuration config) {
 		router.register(new ChapterElement(router.getDataBase()));
 		router.register(new ChapterList(router.getDataBase()));
 		router.register(new PuzzleElement(router.getDataBase()));
-		router.register(new Register(router.getDataBase(), router));
+		router.register(new Register(router.getDataBase(), router, config.getUsersFiles()));
 		router.register(new Login(router.getDataBase(), router));
 		router.register(new Result(router.getDataBase()));
-		router.register(new PuzzleResponse(router.getDataBase()));
+		router.register(new PuzzleResponse(router.getDataBase(), config.getUsersFiles()));
 		router.register(new Leaderboard(router.getDataBase()));
 		router.register(new PlayerDetails(router.getDataBase()));
 		router.register(new BadgeDetails(router.getDataBase()));
@@ -85,7 +84,7 @@ public class Main {
 	}
 
 	private static void startWebServer(Configuration config, Router router) throws IOException {
-		if (config.useSsl()) {
+		if (config.useSsl()) { // Not needed with the use of a proxy
 			SSLServerSocket server = null;
 			try {
 				System.setProperty("javax.net.ssl.keyStore", config.getSslKeystore());
@@ -106,8 +105,7 @@ public class Main {
 					server.close();
 				}
 			}
-		}
+		} else {
-		else {
 			try (ServerSocket server = new ServerSocket(config.getTcpPort())) {
 				while (!server.isClosed()) {
 					Socket socket = server.accept();
@@ -115,8 +113,7 @@ public class Main {
 					Client client = new Client(socket, router, rsaJsonWebKey);
 					client.start();
 				}
-			}
+			} catch (Exception e) {
-			catch (Exception e) {
 				e.printStackTrace();
 			}
 		}

src/be/jeffcheasey88/peeratcode/framework/Client.java

@@ -5,7 +5,6 @@ import java.util.Arrays;
 
 import org.jose4j.jwa.AlgorithmConstraints.ConstraintType;
 import org.jose4j.jwk.RsaJsonWebKey;
-import org.jose4j.jwk.RsaJwkGenerator;
 import org.jose4j.jws.AlgorithmIdentifiers;
 import org.jose4j.jwt.JwtClaims;
 import org.jose4j.jwt.consumer.JwtConsumer;
@@ -16,7 +15,7 @@ public class Client extends Thread{
 	private HttpReader reader;
 	private HttpWriter writer;
 	private Router router;
-	private RsaJsonWebKey key;
+	private RsaJsonWebKey key; // Really needed ?
 
 	public Client(Socket socket, Router router, RsaJsonWebKey key) throws Exception {
 		this.reader = new HttpReader(socket);
@@ -41,16 +40,13 @@ public class Client extends Thread{
 
 	private User isLogin(HttpReader reader) throws Exception {
 		String auth = HttpUtil.readAuthorization(reader);
-		if(auth == null) return null;
+		if (auth == null)
+			return null;
 		try {
-			JwtConsumer jwtConsumer = new JwtConsumerBuilder()
+			JwtConsumer jwtConsumer = new JwtConsumerBuilder().setRequireExpirationTime()
-		            .setRequireExpirationTime()
+					.setAllowedClockSkewInSeconds(30).setExpectedIssuer(this.router.getTokenIssuer())
-		            .setAllowedClockSkewInSeconds(30)
-		            .setExpectedIssuer(this.router.getTokenIssuer())
 					.setVerificationKey(this.router.getWebKey().getKey())
-		            .setJwsAlgorithmConstraints(
+					.setJwsAlgorithmConstraints(ConstraintType.PERMIT, AlgorithmIdentifiers.RSA_USING_SHA256).build();
-		                    ConstraintType.PERMIT, AlgorithmIdentifiers.RSA_USING_SHA256)
-		            .build();
 
 			JwtClaims jwtClaims = jwtConsumer.processToClaims(auth);
 			return new User(jwtClaims);

src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java

@@ -10,18 +10,21 @@ import org.json.simple.parser.JSONParser;
 
 public class HttpUtil {
 
-	private HttpUtil(){}
+	private HttpUtil() {
+	}
 
 	public static void responseHeaders(HttpWriter writer, int code, String... headers) throws Exception {
 		writer.write("HTTP/1.1 " + code + " " + codeMessage(code) + "\n");
-		for(String header : headers) writer.write(header+"\n");
+		for (String header : headers)
+			writer.write(header + "\n");
 		writer.write("\n");
 		writer.flush();
 	}
 
 	public static void skipHeaders(HttpReader reader) throws Exception {
 		String line;
-		while(((line = reader.readLine()) != null) && (line.length() > 0));
+		while (((line = reader.readLine()) != null) && (line.length() > 0))
+			;
 	}
 
 	public static List<String> readMultiPartData(HttpReader reader) throws Exception {
@@ -46,15 +49,14 @@ public class HttpUtil {
 
 	public static void switchToWebSocket(HttpReader reader, HttpWriter writer) throws Exception {
 		String key = readWebSocketKey(reader);
-		if(key == null) throw new IllegalArgumentException();
+		if (key == null)
+			throw new IllegalArgumentException();
 
 		writer.write("HTTP/1.1 101 Switching Protocols\n");
 		writer.write("Connection: Upgrade\n");
 		writer.write("Upgrade: websocket\n");
-		writer.write("Sec-WebSocket-Accept: "+
+		writer.write("Sec-WebSocket-Accept: " + printBase64Binary(MessageDigest.getInstance("SHA-1")
-				printBase64Binary(
+				.digest((key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes("UTF-8"))) + "\n");
-						MessageDigest.getInstance("SHA-1").
-							digest((key+"258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes("UTF-8")))+"\n");
 		writer.write("\n");
 		writer.flush();
 	}
@@ -69,7 +71,8 @@ public class HttpUtil {
 				continue;
 			}
 			Matcher matcher = WEBSOCKET_KEY.matcher(line);
-			if(matcher.matches()) key = matcher.group(1);
+			if (matcher.matches())
+				key = matcher.group(1);
 		}
 		return key;
 	}
@@ -99,8 +102,10 @@ public class HttpUtil {
 				Object parse;
 				try {
 					parse = new JSONParser().parse(line);
-					if(parse != null) return parse;
+					if (parse != null)
-				}catch(Exception e){}
+						return parse;
+				} catch (Exception e) {
+				}
 			}
 		}
 		return null;
@@ -123,8 +128,10 @@ public class HttpUtil {
 				byte op = (byte) 127;
 				rLength = (byte) (data & op);
 
-                if(rLength==(byte)126) rMaskIndex=4;
+				if (rLength == (byte) 126)
-                if(rLength==(byte)127) rMaskIndex=10;
+					rMaskIndex = 4;
+				if (rLength == (byte) 127)
+					rMaskIndex = 10;
 
 				byte[] masks = new byte[4];
 
@@ -147,7 +154,8 @@ public class HttpUtil {
 
 				return new String(message);
 
-            }else break;
+			} else
+				break;
 		}
 		return null;
 	}
@@ -279,7 +287,6 @@ public class HttpUtil {
 		return " ";
 	}
 
-	
 	// From javax.xml.bind.DatatypeConverter
 	private static String printBase64Binary(byte[] array) {
 		char[] arrayOfChar = new char[(array.length + 2) / 3 * 4];
@@ -288,13 +295,16 @@ public class HttpUtil {
 		return new String(arrayOfChar);
 	}
 
-	private static int _printBase64Binary(byte[] paramArrayOfbyte, int paramInt1, int paramInt2, char[] paramArrayOfchar, int paramInt3) {
+	private static int _printBase64Binary(byte[] paramArrayOfbyte, int paramInt1, int paramInt2,
+			char[] paramArrayOfchar, int paramInt3) {
 		int i = paramInt2;
 		int j;
 		for (j = paramInt1; i >= 3; j += 3) {
 			paramArrayOfchar[paramInt3++] = encode(paramArrayOfbyte[j] >> 2);
-	      paramArrayOfchar[paramInt3++] = encode((paramArrayOfbyte[j] & 0x3) << 4 | paramArrayOfbyte[j + 1] >> 4 & 0xF);
+			paramArrayOfchar[paramInt3++] = encode(
-	      paramArrayOfchar[paramInt3++] = encode((paramArrayOfbyte[j + 1] & 0xF) << 2 | paramArrayOfbyte[j + 2] >> 6 & 0x3);
+					(paramArrayOfbyte[j] & 0x3) << 4 | paramArrayOfbyte[j + 1] >> 4 & 0xF);
+			paramArrayOfchar[paramInt3++] = encode(
+					(paramArrayOfbyte[j + 1] & 0xF) << 2 | paramArrayOfbyte[j + 2] >> 6 & 0x3);
 			paramArrayOfchar[paramInt3++] = encode(paramArrayOfbyte[j + 2] & 0x3F);
 			i -= 3;
 		}
@@ -306,7 +316,8 @@ public class HttpUtil {
 		}
 		if (i == 2) {
 			paramArrayOfchar[paramInt3++] = encode(paramArrayOfbyte[j] >> 2);
-	      paramArrayOfchar[paramInt3++] = encode((paramArrayOfbyte[j] & 0x3) << 4 | paramArrayOfbyte[j + 1] >> 4 & 0xF);
+			paramArrayOfchar[paramInt3++] = encode(
+					(paramArrayOfbyte[j] & 0x3) << 4 | paramArrayOfbyte[j + 1] >> 4 & 0xF);
 			paramArrayOfchar[paramInt3++] = encode((paramArrayOfbyte[j + 1] & 0xF) << 2);
 			paramArrayOfchar[paramInt3++] = '=';
 		}
@@ -316,6 +327,7 @@ public class HttpUtil {
 	private static char encode(int paramInt) {
 		return encodeMap[paramInt & 0x3F];
 	}
+
 	private static final char[] encodeMap = initEncodeMap();
 
 	private static char[] initEncodeMap() {

src/be/jeffcheasey88/peeratcode/framework/Response.java

@@ -1,7 +1,6 @@
 package be.jeffcheasey88.peeratcode.framework;
 
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public interface Response {
 

src/be/jeffcheasey88/peeratcode/framework/Route.java

@@ -10,7 +10,9 @@ import java.lang.annotation.Target;
 public @interface Route {
 
 	String path() default "^.*$";
+
 	String type() default "GET";
+
 	boolean needLogin() default false;
 
 }

src/be/jeffcheasey88/peeratcode/framework/Router.java

@@ -41,7 +41,8 @@ public class Router{
 
 	public void register(Response response) {
 		try {
-			Method method = response.getClass().getDeclaredMethod("exec", Response.class.getDeclaredMethods()[0].getParameterTypes());
+			Method method = response.getClass().getDeclaredMethod("exec",
+					Response.class.getDeclaredMethods()[0].getParameterTypes());
 			Route route = method.getAnnotation(Route.class);
 
 			this.responses.put(response, route);
@@ -60,13 +61,15 @@ public class Router{
 			if (routes.getValue().type().equals(type)) {
 				Matcher matcher = this.patterns.get(routes.getKey()).matcher(path);
 				if (matcher.matches()) {
-					if(user == null && routes.getValue().needLogin()) return;
+					if (user == null && routes.getValue().needLogin())
+						return;
 					routes.getKey().exec(matcher, user, reader, writer);
 					return;
 				}
 			}
 		}
-		if(noFileFound != null) noFileFound.exec(null, user, reader, writer);
+		if (noFileFound != null)
+			noFileFound.exec(null, user, reader, writer);
 	}
 
 	public RsaJsonWebKey getWebKey() {

src/be/jeffcheasey88/peeratcode/model/Badge.java

@@ -9,10 +9,6 @@ public class Badge {
 	private byte[] logo;
 	private int level;
 
-	public Badge(String name, int level) {
-		this(name, null, level);
-	}
-
 	public Badge(String name, byte[] logo, int level) {
 		this.name = name;
 		this.logo = logo;
@@ -23,24 +19,11 @@ public class Badge {
 		return name;
 	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public byte[] getLogo() {
 		return logo;
 	}
 
-	public void setLogo(byte[] logo) {
-		this.logo = logo;
-	}
-
 	public int getLevel() {
 		return level;
 	}
-
-	public void setLevel(int level) {
-		this.level = level;
-	}
-
 }

src/be/jeffcheasey88/peeratcode/model/Chapter.java

@@ -1,7 +1,6 @@
 package be.jeffcheasey88.peeratcode.model;
 
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
 import java.util.List;
 
 public class Chapter {
@@ -23,18 +22,10 @@ public class Chapter {
 		return id;
 	}
 
-	public void setId(int id) {
-		this.id = id;
-	}
-
 	public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public List<Puzzle> getPuzzles() {
 		return puzzles;
 	}
@@ -53,8 +44,10 @@ public class Chapter {
 
 	@Override
 	public boolean equals(Object object) {
-		if(this == object) return true;
+		if (this == object)
-		if(!(object instanceof Chapter)) return false;
+			return true;
+		if (!(object instanceof Chapter))
+			return false;
 		return this.id == (((Chapter) object).id);
 	}
 

src/be/jeffcheasey88/peeratcode/model/Completion.java

@@ -12,10 +12,6 @@ public class Completion {
 		this(playerId, puzzleId, -1, 1, fileName, score, null);
 	}
 
-	public Completion(int playerId, int puzzleId, int idCompletion, int tries, String fileName, int score) {
-		this(playerId, puzzleId, idCompletion, tries, fileName, score, null);
-	}
-
 	public Completion(int playerId, int puzzleId, int idCompletion, int tries, String fileName, int score,
 			byte[] file) {
 		this.playerId = playerId;
@@ -42,6 +38,7 @@ public class Completion {
 		this.tries++;
 		updateScore();
 	}
+
 	private void updateScore() {
 		if (tries > 1) {
 			score = score * (1 - ((tries - 1) / 10));

src/be/jeffcheasey88/peeratcode/model/Group.java

@@ -1,11 +1,19 @@
 package be.jeffcheasey88.peeratcode.model;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
-public class Group {
+public class Group implements Comparable<Group> {
 	private String name;
 	private int linkToChapter;
 	private int linkToPuzzle;
+	private List<Player> players;
 
 	public Group(JSONObject json) {
 		this.name = (String) json.get("name");
@@ -19,35 +27,112 @@ public class Group {
 		this.linkToPuzzle = initPuzz;
 	}
 
-	public String getName() {
+	public void addPlayer(Player newPlayer) {
-		return name;
+		if (newPlayer != null) {
+			if (players == null)
+				players = new ArrayList<Player>();
+
+			int pPosition = players.indexOf(newPlayer);
+			if (pPosition < 0) {
+				players.add(newPlayer);
+			} else {
+				players.get(pPosition).addScore(newPlayer.getTotalScore(), newPlayer.getTotalTries());
+			}
+		}
 	}
 
-	public void setName(String name) {
+	public int getScore() {
-		this.name = name;
+		int score = 0;
+
+		if (players != null) {
+			for (Player p : players) {
+				score = score + p.getTotalScore();
+			}
+		}
+		return score;
+	}
+
+	public int getTries() {
+		int tries = 0;
+
+		if (players != null) {
+			for (Player p : players) {
+				tries = tries + p.getTotalTries();
+			}
+		}
+		return tries;
+	}
+
+	public String getName() {
+		return name;
 	}
 
 	public int getLinkToChapter() {
 		return linkToChapter;
 	}
 
-	public void setLinkToChapter(int linkToChapter) {
-		this.linkToChapter = linkToChapter;
-	}
-
 	public int getLinkToPuzzle() {
 		return linkToPuzzle;
 	}
 
-	public void setLinkToPuzzle(int linkToPuzzle) {
+	public JSONObject toJson() {
-		this.linkToPuzzle = linkToPuzzle;
+		return this.toJson(null);
 	}
 
-	public JSONObject toJson() {
+	public JSONObject toJson(Integer rank) {
 		JSONObject groupJSON = new JSONObject();
 		groupJSON.put("name", name);
-		if (linkToChapter > 0) groupJSON.put("chapter", linkToChapter);
+		if (rank != null)
-		if (linkToPuzzle > 0) groupJSON.put("puzzle", linkToPuzzle);
+			groupJSON.put("rank", rank);
+		else if (linkToChapter > 0)
+			groupJSON.put("chapter", linkToChapter);
+		else if (linkToPuzzle > 0)
+			groupJSON.put("puzzle", linkToPuzzle);
+		if (players != null) {
+			JSONArray groupsPlayerJSON = new JSONArray();
+			for (Player p : players) {
+				JSONObject playerJSON = new JSONObject();
+				playerJSON.put("pseudo", p.getPseudo());
+				playerJSON.put("score", p.getTotalScore());
+				playerJSON.put("completion", p.getTotalCompletion());
+				playerJSON.put("tries", p.getTotalTries());
+				groupsPlayerJSON.add(playerJSON);
+			}
+			groupJSON.put("players", groupsPlayerJSON);
+		}
 		return groupJSON;
 	}
+
+	@Override
+	public int compareTo(Group arg0) {
+		int comparo = arg0.getScore() - getScore();
+		if (comparo == 0) {
+			comparo = players.size() - arg0.players.size();
+			if (comparo == 0) {
+				comparo = getTries() - arg0.getTries();
+				if (comparo == 0) {
+					comparo = name.compareTo(arg0.name);
+				}
+			}
+		}
+		return comparo;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Group other = (Group) obj;
+		return Objects.equals(name, other.name);
+	}
+
 }

src/be/jeffcheasey88/peeratcode/model/Player.java

@@ -9,8 +9,6 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
 public class Player implements Comparable<Player> {
-	public static final String PATH_TO_CODE = "/home/%s/peer-at-source/";
-
 	private String pseudo;
 	private String email;
 	private String firstname;
@@ -38,6 +36,18 @@ public class Player implements Comparable<Player> {
 		totalTries = 0;
 	}
 
+	public Player(String pseudo, int score, int tries) {
+		// For groups leaderboard
+		this.pseudo = pseudo;
+		totalScore = score;
+		totalTries = tries;
+		if (totalTries > 0)
+			totalCompletion = totalTries;
+		else
+			totalCompletion = 0;
+		email = ""; // TO make compareTo and equals works as usual
+	}
+
 	public String getPseudo() {
 		return this.pseudo;
 	}
@@ -62,11 +72,6 @@ public class Player implements Comparable<Player> {
 		return groups;
 	}
 
-	/**
-	 * SEE SET_TAGS IN PUZZLE
-	 * 
-	 * @return DEATH
-	 */
 	public JSONArray getJsonGroups() {
 		if (groups != null) {
 			JSONArray groupsJSON = new JSONArray();
@@ -94,10 +99,6 @@ public class Player implements Comparable<Player> {
 		avatar = newAvatar;
 	}
 
-	public String getPathToSourceCode() {
-		return String.format(PATH_TO_CODE, pseudo);
-	}
-
 	public int getRank() {
 		return rank;
 	}
@@ -114,6 +115,12 @@ public class Player implements Comparable<Player> {
 		this.totalScore = totalScore;
 	}
 
+	public void addScore(int addScore, int tries) {
+		totalScore = totalScore + addScore;
+		totalTries = totalTries + tries;
+		totalCompletion++;
+	}
+
 	public int getTotalCompletion() {
 		return totalCompletion;
 	}
@@ -134,11 +141,6 @@ public class Player implements Comparable<Player> {
 		return badges;
 	}
 
-	/**
-	 * SEE SET_TAGS IN PUZZLE
-	 * 
-	 * @return DEATH
-	 */
 	public JSONArray getJsonBadges() {
 		if (badges == null)
 			return null;

src/be/jeffcheasey88/peeratcode/model/Puzzle.java

@@ -18,10 +18,8 @@ public class Puzzle {
 	private Set<String> tags;
 	private int depend;
 
-	public Puzzle(int id, String name, String content, byte[] soluce, String verify, int scoreMax, String tags){
+	public Puzzle(int id, String name, String content, byte[] soluce, String verify, int scoreMax, String tags,
-		this(id, name, content, soluce, verify, scoreMax, tags, -1);	
+			int depend) {
-	}
-	public Puzzle(int id, String name, String content, byte[] soluce, String verify, int scoreMax, String tags, int depend){
 		this.id = id;
 		this.name = name;
 		this.content = content;
@@ -36,56 +34,29 @@ public class Puzzle {
 		return id;
 	}
 
-	public void setId(int id) {
-		this.id = id;
-	}
-
 	public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public String getContent() {
 		return content;
 	}
 
-	public void setContent(String content) {
-		this.content = content;
-	}
-	
 	public byte[] getSoluce() {
 		return this.soluce;
 	}
 
-	public void setSoluce(byte[] array){
-		this.soluce = array;
-	}
-	
-	public String getVerify(){
-		return this.verify;
-	}
-	
-	public void setVerify(String regex){
-		this.verify = regex;
-	}
-	
 	public int getScoreMax() {
 		return this.scoreMax;
 	}
 
-	public void setScoreMax(int max){
-		this.scoreMax = max;
-	}
-	
 	public Set<String> getTags() {
 		return this.tags;
 	}
 
 	/**
 	 * DO NOT EVER EVER SHOW TO MISTER LUDWIG XD
+	 * 
 	 * @return DEATH
 	 */
 	public JSONArray getJsonTags() {
@@ -111,14 +82,12 @@ public class Puzzle {
 		return this.depend;
 	}
 
-	public void setDepend(int depend){
-		this.depend = depend;
-	}
-
 	@Override
 	public boolean equals(Object object) {
-		if(this == object) return true;
+		if (this == object)
-		if(!(object instanceof Puzzle)) return false;
+			return true;
+		if (!(object instanceof Puzzle))
+			return false;
 		return this.id == (((Puzzle) object).id);
 	}
 

src/be/jeffcheasey88/peeratcode/repository/DatabaseQuery.java

@@ -5,29 +5,55 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 public enum DatabaseQuery {
+	// PUZZLES
+	SPECIFIC_PUZZLE_QUERY(
+			"SELECT p.*, np.origin, GROUP_CONCAT(t.name) AS tags FROM puzzles p LEFT JOIN nextPart np ON p.id_puzzle = np.next LEFT JOIN containsTags ct ON ct.fk_puzzle = p.id_puzzle LEFT JOIN tags t ON t.id_tag = ct.fk_tag WHERE p.id_puzzle = ? GROUP BY p.id_puzzle"),
+	PUZZLES_IN_CHAPTER_QUERY(
+			"SELECT p.*, GROUP_CONCAT(t.name) AS tags FROM puzzles p LEFT JOIN containsTags ct ON ct.fk_puzzle = p.id_puzzle LEFT JOIN tags t ON t.id_tag = ct.fk_tag WHERE fk_chapter = ? GROUP BY p.id_puzzle"),
 
-	SPECIFIC_PUZZLE_QUERY("SELECT p.*, np.origin, GROUP_CONCAT(t.name) AS tags FROM puzzles p LEFT JOIN nextPart np ON p.id_puzzle = np.next LEFT JOIN containsTags ct ON ct.fk_puzzle = p.id_puzzle LEFT JOIN tags t ON t.id_tag = ct.fk_tag WHERE p.id_puzzle = ? GROUP BY p.id_puzzle"),
+	// CHAPTERS
 	SPECIFIC_CHAPTER_QUERY("SELECT * FROM chapters WHERE id_chapter = ?"),
-	PUZZLES_IN_CHAPTER_QUERY("SELECT p.*, GROUP_CONCAT(t.name) AS tags FROM puzzles p LEFT JOIN containsTags ct ON ct.fk_puzzle = p.id_puzzle LEFT JOIN tags t ON t.id_tag = ct.fk_tag WHERE fk_chapter = ? GROUP BY p.id_puzzle"),
 	ALL_CHAPTERS_QUERY("SELECT * FROM chapters WHERE id_chapter > 0"),
-	ALL_GROUPS("SELCT * FROM groups"),
+
-	ALL_PLAYERS_FOR_LEADERBOARD("select p.*, scores.*, g.* from players p ,(SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group  WHERE p.id_player = scores.fk_player ORDER BY g.fk_chapter, g.fk_puzzle"),
+	// GROUPS
+	ALL_GROUPS("SELCT * FROM groups"), INSERT_GROUP("INSERT INTO groups (name, fk_chapter, fk_puzzle) VALUES (?,?,?)"),
+	UPDATE_COMPLETION(
+			"UPDATE completions SET tries = ?, filename = ?, score = ? WHERE fk_puzzle = ? AND fk_player = ?"),
+
+	// LEADERBOARD
+	ALL_PLAYERS_FOR_LEADERBOARD(
+			"select p.*, scores.*, g.* from players p ,(SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group  WHERE p.id_player = scores.fk_player ORDER BY g.fk_chapter, g.fk_puzzle"),
+	ALL_GROUP_FOR_CHAPTER_LEADERBOARD(
+			"SELECT g.*, pl.pseudo, co.score, co.tries FROM groups g LEFT JOIN containsGroups cg ON g.id_group = cg.fk_group LEFT JOIN players pl ON cg.fk_player = pl.id_player LEFT JOIN completions co ON pl.id_player = co.fk_player WHERE fk_chapter = ? AND (co.fk_puzzle IN (SELECT id_puzzle FROM puzzles puz WHERE puz.fk_chapter = g.fk_chapter) OR co.score IS NULL);"),
+
+	// REGISTER
 	CHECK_PSEUDO_AVAILABLE_QUERY("SELECT * FROM players WHERE pseudo = ?"),
 	CHECK_EMAIL_AVAILABLE_QUERY("SELECT * FROM players WHERE email = ?"),
-	REGISTER_QUERY("INSERT INTO players (pseudo, email, passwd, firstname, lastname, description, avatar) VALUES (?, ?, ?, ?, ?, ?, ?)"),
+	REGISTER_QUERY(
-	REGISTER_PLAYER_IN_EXISTING_GROUP("INSERT INTO containsGroups (fk_player, fk_group) VALUES (?, (SELECT id_group FROM groups WHERE name = ?));"),
+			"INSERT INTO players (pseudo, email, passwd, firstname, lastname, description, avatar) VALUES (?, ?, ?, ?, ?, ?, ?)"),
+	REGISTER_PLAYER_IN_EXISTING_GROUP(
+			"INSERT INTO containsGroups (fk_player, fk_group) VALUES (?, (SELECT id_group FROM groups WHERE name = ?));"),
+
+	// LOGIN
 	CHECK_PASSWORD("SELECT id_player, passwd FROM players WHERE pseudo=?"),
+
+	// COMPLETIONS
+	GET_COMPLETION(
+			"SELECT id_completion, tries, fileName, score FROM completions WHERE fk_puzzle = ? AND fk_player = ?"),
+	INSERT_COMPLETION(
+			"INSERT INTO completions (fk_puzzle, fk_player, tries, code, fileName, score) values (?, ?, ?, ?, ?, ?)"),
 	SCORE("SELECT score FROM completions WHERE fk_player = ? AND fk_puzzle = ?"),
-	GET_COMPLETION("SELECT id_completion, tries, fileName, score FROM completions WHERE fk_puzzle = ? AND fk_player = ?"),
+
+	// PLAYERS
 	GET_PLAYER_SIMPLE("SELECT pseudo, email, firstname, lastname, description FROM players WHERE id_player = ?"),
-	GET_PLAYER_DETAILS("SELECT p.*, scores.score, scores.completions, scores.tries, scores.rank, g.* FROM players p, (SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group WHERE p.id_player = scores.fk_player AND "),
+	GET_PLAYER_DETAILS(
+			"SELECT p.*, scores.score, scores.completions, scores.tries, scores.rank, g.* FROM players p, (SELECT fk_player, SUM(c.score) AS score, COUNT(c.id_completion) AS completions, SUM(c.tries) AS tries, rank() over(ORDER BY score DESC) AS rank FROM completions c GROUP BY c.fk_player) AS scores LEFT JOIN containsGroups cg ON scores.fk_player = cg.fk_player LEFT JOIN groups g ON cg.fk_group = g.id_group WHERE p.id_player = scores.fk_player AND "),
 	GET_PLAYER_DETAILS_BY_ID(GET_PLAYER_DETAILS, " p.id_player = ? ORDER BY g.fk_chapter, g.fk_puzzle;"),
 	GET_PLAYER_DETAILS_BY_PSEUDO(GET_PLAYER_DETAILS, "p.pseudo = ? ORDER BY g.fk_chapter, g.fk_puzzle;"),
-	GET_BADGE("SELECT * FROM badges WHERE id_badge = ?"),
+
-	GET_BADGES_OF_PLAYER("SELECT * FROM badges b LEFT JOIN containsBadges cb ON cb.fk_badge = b.id_badge WHERE cb.fk_player = ?"),
+	// BADGES
-	INSERT_COMPLETION("INSERT INTO completions (fk_puzzle, fk_player, tries, code, fileName, score) values (?, ?, ?, ?, ?, ?)"),
+	GET_BADGE("SELECT * FROM badges WHERE id_badge = ?"), GET_BADGES_OF_PLAYER(
-	INSERT_GROUP("INSERT INTO groups (name, fk_chapter, fk_puzzle) VALUES (?,?,?)"),
+			"SELECT * FROM badges b LEFT JOIN containsBadges cb ON cb.fk_badge = b.id_badge WHERE cb.fk_player = ?");
-	UPDATE_COMPLETION("UPDATE completions SET tries = ?, filename = ?, score = ? WHERE fk_puzzle = ? AND fk_player = ?");
 
 	private String request;
 

src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java

@@ -82,6 +82,9 @@ public class DatabaseRepository {
 	private Group makeGroup(ResultSet result) throws SQLException {
 		return new Group(result.getString("name"), result.getInt("fk_chapter"), result.getInt("fk_puzzle"));
 	}
+	private Player makeGroupPlayer(ResultSet result) throws SQLException {
+		return new Player(result.getString("pseudo"), result.getInt("score"), result.getInt("tries"));
+	}
 
 	private Badge makeBadge(ResultSet rs) throws SQLException {
 		return new Badge(rs.getString("name"), rs.getBytes("logo"), rs.getInt("level"));
@@ -92,7 +95,8 @@ public class DatabaseRepository {
 		ResultSetMetaData rsmd = rs.getMetaData();
 		int columns = rsmd.getColumnCount();
 		for (int x = 1; x <= columns; x++) {
-			if(columnName.equals(rsmd.getColumnName(x))) return true;
+			if (columnName.equals(rsmd.getColumnName(x)))
+				return true;
 		}
 		return false;
 	}
@@ -238,6 +242,33 @@ public class DatabaseRepository {
 		return null;
 	}
 
+	public SortedSet<Group> getAllGroupForChapterLeaderboard(int chapterId) {
+		try {
+			ensureConnection();
+			PreparedStatement groupsStmt = DatabaseQuery.ALL_GROUP_FOR_CHAPTER_LEADERBOARD.prepare(this.con);
+			groupsStmt.setInt(1, chapterId);
+			ResultSet result = groupsStmt.executeQuery();
+			List<Group> groups = new ArrayList<Group>();
+			Group tmpGroup;
+			while (result.next()) {
+				tmpGroup = makeGroup(result);
+				if (tmpGroup != null) {
+					int gPosition = groups.indexOf(tmpGroup);
+					if (gPosition < 0) {
+						tmpGroup.addPlayer(makeGroupPlayer(result));
+						groups.add(tmpGroup);
+					} else {
+						groups.get(gPosition).addPlayer(makeGroupPlayer(result));
+					}
+				}
+			}
+			return new TreeSet<Group>(groups);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
 	public Badge getBadge(int badgeId) {
 		try {
 			ensureConnection();
@@ -380,7 +411,8 @@ public class DatabaseRepository {
 					ResultSet inserted = playerStatement.getGeneratedKeys();
 					if (inserted.next()) {
 						int newPlayerId = inserted.getInt(1);
-						try (PreparedStatement containsGroupsStatement = con.prepareStatement(DatabaseQuery.REGISTER_PLAYER_IN_EXISTING_GROUP.toString())) {
+						try (PreparedStatement containsGroupsStatement = con
+								.prepareStatement(DatabaseQuery.REGISTER_PLAYER_IN_EXISTING_GROUP.toString())) {
 							containsGroupsStatement.setInt(1, newPlayerId);
 							containsGroupsStatement.setString(2, sgroup);
 							containsGroupsStatement.executeUpdate();
@@ -390,8 +422,7 @@ public class DatabaseRepository {
 						}
 					}
 				}
-			}
+			} catch (SQLException e) {
-			catch (SQLException e) {
 				con.rollback();
 				con.setAutoCommit(true);
 			}
@@ -462,7 +493,8 @@ public class DatabaseRepository {
 			statement.setInt(2, group.getLinkToChapter());
 			statement.setInt(3, group.getLinkToPuzzle());
 			return statement.executeUpdate() >= 0;
-		}catch(Exception e){}
+		} catch (Exception e) {
+		}
 		return false;
 	}
 

src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java

@@ -1,5 +1,10 @@
 package be.jeffcheasey88.peeratcode.routes;
 
+import java.util.Base64;
+import java.util.regex.Matcher;
+
+import org.json.simple.JSONObject;
+
 import be.jeffcheasey88.peeratcode.framework.HttpReader;
 import be.jeffcheasey88.peeratcode.framework.HttpUtil;
 import be.jeffcheasey88.peeratcode.framework.HttpWriter;
@@ -9,11 +14,6 @@ import be.jeffcheasey88.peeratcode.framework.User;
 import be.jeffcheasey88.peeratcode.model.Badge;
 import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
 
-import org.json.simple.JSONObject;
-
-import java.util.Base64;
-import java.util.regex.Matcher;
-
 public class BadgeDetails implements Response {
 
 	private final DatabaseRepository databaseRepo;
@@ -22,22 +22,22 @@ public class BadgeDetails implements Response {
 		this.databaseRepo = databaseRepo;
 	}
 
-	@Route(path = "^\\/badge\\/([0-9]+)$")
+	@Route(path = "^\\/badge\\/([0-9]+)$", needLogin = true)
 	@Override
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 		if (matcher.groupCount() > 0) {
 			int badgeId = Integer.parseInt(matcher.group(1));
 			Badge badge = databaseRepo.getBadge(badgeId);
 			JSONObject badgeJSON = new JSONObject();
 			if (badge != null) {
 				badgeJSON.put("name", badge.getName());
-				if(badge.getLogo() != null) badgeJSON.put("logo", Base64.getEncoder().encodeToString(badge.getLogo()));
+				if (badge.getLogo() != null)
+					badgeJSON.put("logo", Base64.getEncoder().encodeToString(badge.getLogo()));
 				badgeJSON.put("level", badge.getLevel());
 			}
+			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 			writer.write(badgeJSON.toJSONString().replace("\\", ""));
-		}
+		} else {
-		else {
 			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 		}
 	}

src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java

@@ -1,5 +1,10 @@
 package be.jeffcheasey88.peeratcode.routes;
 
+import java.util.regex.Matcher;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
 import be.jeffcheasey88.peeratcode.framework.HttpReader;
 import be.jeffcheasey88.peeratcode.framework.HttpUtil;
 import be.jeffcheasey88.peeratcode.framework.HttpWriter;
@@ -10,11 +15,6 @@ import be.jeffcheasey88.peeratcode.model.Chapter;
 import be.jeffcheasey88.peeratcode.model.Puzzle;
 import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.regex.Matcher;
-
 public class ChapterElement implements Response {
 
 	private final DatabaseRepository databaseRepo;
@@ -23,27 +23,32 @@ public class ChapterElement implements Response {
 		this.databaseRepo = databaseRepo;
 	}
 
-	@Route(path = "^\\/chapter\\/([0-9]+)$")
+	@Route(path = "^\\/chapter\\/([0-9]+)$", needLogin = true)
 	@Override
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 		Chapter chapter = databaseRepo.getChapter(extractId(matcher));
 		if (chapter != null) {
 			JSONObject chapterJSON = new JSONObject();
 			chapterJSON.put("id", chapter.getId());
 			chapterJSON.put("name", chapter.getName());
-			if (chapter.getStartDate() != null) chapterJSON.put("startDate", chapter.getStartDate().toString());
+			if (chapter.getStartDate() != null)
-			if (chapter.getEndDate() != null) chapterJSON.put("endDate", chapter.getEndDate().toString());
+				chapterJSON.put("startDate", chapter.getStartDate().toString());
+			if (chapter.getEndDate() != null)
+				chapterJSON.put("endDate", chapter.getEndDate().toString());
 			JSONArray puzzles = new JSONArray();
 			for (Puzzle puzzle : chapter.getPuzzles()) {
 				JSONObject puzzleJSON = new JSONObject();
 				puzzleJSON.put("id", puzzle.getId());
 				puzzleJSON.put("name", puzzle.getName());
-				if (puzzle.getTags() != null) puzzleJSON.put("tags", puzzle.getJsonTags());
+				if (puzzle.getTags() != null)
+					puzzleJSON.put("tags", puzzle.getJsonTags());
 				puzzles.add(puzzleJSON);
 			}
 			chapterJSON.put("puzzles", puzzles);
+			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 			writer.write(chapterJSON.toJSONString());
+		} else {
+			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 		}
 	}
 

src/be/jeffcheasey88/peeratcode/routes/ChapterList.java

@@ -23,10 +23,9 @@ public class ChapterList implements Response {
 		this.databaseRepo = databaseRepo;
 	}
 
-	@Route(path = "^\\/chapters$")
+	@Route(path = "^\\/chapters$", needLogin = true)
 	@Override
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 		List<Chapter> allChapters = databaseRepo.getAllChapters();
 		if (allChapters != null) {
 			JSONArray chaptersJSON = new JSONArray();
@@ -34,11 +33,16 @@ public class ChapterList implements Response {
 				JSONObject chapterJSON = new JSONObject();
 				chapterJSON.put("id", chapter.getId());
 				chapterJSON.put("name", chapter.getName());
-				if (chapter.getStartDate() != null) chapterJSON.put("startDate", chapter.getStartDate().toString());
+				if (chapter.getStartDate() != null)
-				if (chapter.getEndDate() != null) chapterJSON.put("endDate", chapter.getEndDate().toString());
+					chapterJSON.put("startDate", chapter.getStartDate().toString());
+				if (chapter.getEndDate() != null)
+					chapterJSON.put("endDate", chapter.getEndDate().toString());
 				chaptersJSON.add(chapterJSON);
 			}
+			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 			writer.write(chaptersJSON.toJSONString());
+		} else {
+			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 		}
 	}
 

src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java

@@ -1,5 +1,6 @@
 package be.jeffcheasey88.peeratcode.routes;
 
+import java.io.IOException;
 import java.util.Base64;
 import java.util.SortedSet;
 import java.util.regex.Matcher;
@@ -13,6 +14,8 @@ import be.jeffcheasey88.peeratcode.framework.HttpWriter;
 import be.jeffcheasey88.peeratcode.framework.Response;
 import be.jeffcheasey88.peeratcode.framework.Route;
 import be.jeffcheasey88.peeratcode.framework.User;
+import be.jeffcheasey88.peeratcode.model.Chapter;
+import be.jeffcheasey88.peeratcode.model.Group;
 import be.jeffcheasey88.peeratcode.model.Player;
 import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
 
@@ -24,18 +27,59 @@ public class Leaderboard implements Response {
 		this.databaseRepo = databaseRepo;
 	}
 
-	@Route(path = "^\\/leaderboard$")
+	@Route(path = "^\\/leaderboard\\/?(\\d+)?$")
 	@Override
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
 		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
+		if (matcher.group(1) != null) {
+			groupsLeaderboard(Integer.parseInt(matcher.group(1)), writer);
+		} else {
+			playersLeaderboard(writer);
+		}
+	}
+
+	private void groupsLeaderboard(int chapterId, HttpWriter writer) throws IOException {
+		Chapter chInfo = databaseRepo.getChapter(chapterId);
+
+		SortedSet<Group> allGroupsForChapter = databaseRepo.getAllGroupForChapterLeaderboard(chapterId);
+		JSONObject leaderboardJSON = new JSONObject();
+		if (chInfo.getStartDate() != null)
+			leaderboardJSON.put("start_date", chInfo.getStartDate().toString());
+		if (chInfo.getEndDate() != null)
+			leaderboardJSON.put("end_date", chInfo.getEndDate().toString());
+		JSONArray groupsJSON = new JSONArray();
+		if (allGroupsForChapter != null) {
+			int rank = 1;
+			int sameRankCount = 1;
+			Group previousGroup = null;
+			for (Group g : allGroupsForChapter) {
+				if (previousGroup != null) {
+					if (g.compareTo(previousGroup) == 0) {
+						sameRankCount++;
+					} else {
+						rank = rank + sameRankCount;
+						sameRankCount = 1;
+					}
+				}
+				groupsJSON.add(g.toJson(rank));
+				previousGroup = g;
+			}
+		}
+		leaderboardJSON.put("groups", groupsJSON);
+		writer.write(leaderboardJSON.toJSONString().replace("\\", ""));
+	}
+
+	private void playersLeaderboard(HttpWriter writer) throws IOException {
 		SortedSet<Player> allPlayers = databaseRepo.getAllPlayerForLeaderboard();
 		JSONArray playersJSON = new JSONArray();
 		if (allPlayers != null) {
 			for (Player player : allPlayers) {
 				JSONObject playerJSON = new JSONObject();
 				playerJSON.put("pseudo", player.getPseudo());
-				if (player.getGroups() != null) playerJSON.put("groups", player.getJsonGroups());
+				if (player.getGroups() != null)
-				if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
+					playerJSON.put("groups", player.getJsonGroups());
+				if (player.getAvatar() != null)
+					playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
 				playerJSON.put("rank", player.getRank());
 				playerJSON.put("score", player.getTotalScore());
 				playerJSON.put("completions", player.getTotalCompletion());

src/be/jeffcheasey88/peeratcode/routes/Login.java

@@ -1,12 +1,7 @@
 package be.jeffcheasey88.peeratcode.routes;
 
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import org.jose4j.jwk.RsaJsonWebKey;
-import org.jose4j.jws.AlgorithmIdentifiers;
-import org.jose4j.jws.JsonWebSignature;
-import org.jose4j.jwt.JwtClaims;
 import org.json.simple.JSONObject;
 
 import be.jeffcheasey88.peeratcode.framework.HttpReader;
@@ -41,14 +36,13 @@ public class Login implements Response {
 			String password = (String) informations.get("passwd");
 			int id;
 			if ((id = databaseRepo.login(pseudo, password)) >= 0) {
-				HttpUtil.responseHeaders(writer, 200,
+				HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *",
-						"Access-Control-Allow-Origin: *",
 						"Access-Control-Expose-Headers: Authorization",
 						"Authorization: Bearer " + this.router.createAuthUser(id));
-				return;
 			}
+		} else {
+			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 		}
-		HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
 	}
 
 }

src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java

@@ -22,7 +22,7 @@ public class PlayerDetails implements Response {
 		this.databaseRepo = databaseRepo;
 	}
 
-	@Route(path = "^\\/player\\/?(.+)?$")
+	@Route(path = "^\\/player\\/?(.+)?$", needLogin = true)
 	@Override
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
 		Player player;
@@ -33,19 +33,22 @@ public class PlayerDetails implements Response {
 		}
 		JSONObject playerJSON = new JSONObject();
 		if (player != null) {
-			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 			playerJSON.put("pseudo", player.getPseudo());
 			playerJSON.put("email", player.getEmail());
 			playerJSON.put("firstname", player.getFirstname());
 			playerJSON.put("lastname", player.getLastname());
 			playerJSON.put("description", player.getDescription());
-			if (player.getGroups() != null) playerJSON.put("groups", player.getJsonGroups());
+			if (player.getGroups() != null)
+				playerJSON.put("groups", player.getJsonGroups());
 			playerJSON.put("rank", player.getRank());
 			playerJSON.put("score", player.getTotalScore());
 			playerJSON.put("completions", player.getTotalCompletion());
 			playerJSON.put("tries", player.getTotalTries());
-			if (player.getBadges() != null) playerJSON.put("badges", player.getJsonBadges());
+			if (player.getBadges() != null)
-			if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
+				playerJSON.put("badges", player.getJsonBadges());
+			if (player.getAvatar() != null)
+				playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
+			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 			writer.write(playerJSON.toJSONString().replace("\\", ""));
 		} else {
 			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");

src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java

@@ -1,11 +1,7 @@
 package be.jeffcheasey88.peeratcode.routes;
 
-import java.nio.charset.Charset;
-import java.util.Set;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import org.jose4j.json.internal.json_simple.JSONArray;
 import org.json.simple.JSONObject;
 
 import be.jeffcheasey88.peeratcode.framework.HttpReader;
@@ -25,20 +21,25 @@ public class PuzzleElement implements Response {
 		this.databaseRepo = databaseRepo;
 	}
 
-	@Route(path = "^\\/puzzle\\/([0-9]+)$")
+	@Route(path = "^\\/puzzle\\/([0-9]+)$", needLogin = true)
 	@Override
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
-		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *", "Content-Type: application/json");
 		Puzzle puzzle = databaseRepo.getPuzzle(extractId(matcher));
 		if (puzzle != null) {
 			JSONObject puzzleJSON = new JSONObject();
 			puzzleJSON.put("id", puzzle.getId());
 			puzzleJSON.put("name", puzzle.getName());
 			puzzleJSON.put("content", puzzle.getContent());
-			if (puzzle.getTags() != null) puzzleJSON.put("tags", puzzle.getJsonTags());
+			if (puzzle.getTags() != null)
-			if (puzzle.getDepend() > 0)	puzzleJSON.put("depend", puzzle.getDepend());
+				puzzleJSON.put("tags", puzzle.getJsonTags());
+			if (puzzle.getDepend() > 0)
+				puzzleJSON.put("depend", puzzle.getDepend());
+			HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *", "Content-Type: application/json");
 			writer.write(puzzleJSON.toJSONString());
 		}
+		else {
+			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
+		}
 	}
 
 	private int extractId(Matcher matcher) {

src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java

@@ -22,9 +22,11 @@ import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
 
 public class PuzzleResponse implements Response {
 	private final DatabaseRepository databaseRepo;
+	private final String usersFilesPath;
 
-	public PuzzleResponse(DatabaseRepository databaseRepo) {
+	public PuzzleResponse(DatabaseRepository databaseRepo, String initUsersFilesPath) {
 		this.databaseRepo = databaseRepo;
+		usersFilesPath = initUsersFilesPath;
 	}
 
 	@Route(path = "^\\/puzzleResponse\\/([0-9]+)$", type = "POST", needLogin = true)
@@ -45,14 +47,15 @@ public class PuzzleResponse implements Response {
 			HttpUtil.responseHeaders(writer, 406, "Access-Control-Allow-Origin: *", "Content-Type: application/json");
 			responseJSON.put("tries", completion.getTries());
 		} else {
-			HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
+			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 			return;
 		}
 		writer.write(responseJSON.toJSONString());
 	}
 
 	private void saveSourceCode(ReceivedResponse received, Player player) throws IOException {
-		Path path = Paths.get(String.format("%s/puz%04d-%s", player.getPathToSourceCode(), received.getPuzzleId(), received.getFileName()));
+		Path path = Paths.get(String.format("%s/%s/puz%04d-%s", usersFilesPath, player.getPseudo(),
+				received.getPuzzleId(), received.getFileName()));
 		Files.write(path, received.getSourceCode());
 
 	}

src/be/jeffcheasey88/peeratcode/routes/Register.java

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.json.simple.JSONObject;
 
@@ -15,17 +14,18 @@ import be.jeffcheasey88.peeratcode.framework.Response;
 import be.jeffcheasey88.peeratcode.framework.Route;
 import be.jeffcheasey88.peeratcode.framework.Router;
 import be.jeffcheasey88.peeratcode.framework.User;
-import be.jeffcheasey88.peeratcode.model.Player;
 import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
 
 public class Register implements Response {
 
 	private DatabaseRepository databaseRepo;
 	private Router router;
+	private String usersFilesPath;
 
-	public Register(DatabaseRepository databaseRepo, Router router) {
+	public Register(DatabaseRepository databaseRepo, Router router, String initUsersFilesPath) {
 		this.databaseRepo = databaseRepo;
 		this.router = router;
+		usersFilesPath = initUsersFilesPath;
 	}
 
 	@Route(path = "^\\/register$", type = "POST")
@@ -60,27 +60,28 @@ public class Register implements Response {
 				int id;
 				if ((id = databaseRepo.register(pseudo, email, password, firstname, lastname, description, group,
 						avatar)) >= 0) {
-					HttpUtil.responseHeaders(writer, 200,
+					HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *",
-							"Access-Control-Allow-Origin: *",
 							"Access-Control-Expose-Headers: Authorization",
 							"Authorization: Bearer " + this.router.createAuthUser(id));
 					createFolderToSaveSourceCode(pseudo);
 					return;
 				}
 			} else {
-				HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
+				HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 				JSONObject error = new JSONObject();
 				error.put("username_valid", pseudoAvailable);
 				error.put("email_valid", emailAvailable);
 				writer.write(error.toJSONString());
 				return;
 			}
+		} else {
+			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 		}
-		HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
 	}
 
 	private void createFolderToSaveSourceCode(String pseudo) throws IOException {
-		Files.createDirectories(Paths.get(String.format(Player.PATH_TO_CODE, pseudo)));
+
+		Files.createDirectories(Paths.get(String.format("%s/%s", usersFilesPath, pseudo)));
 	}
 
 }

src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java

@@ -26,7 +26,8 @@ public class GroupList implements Response{
 	public void exec(Matcher matcher, User user, HttpReader reader, HttpWriter writer) throws Exception {
 		HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
 		JSONArray result = new JSONArray();
-		for(Group group : this.repo.getAllGroups()) result.add(group.toJson());
+		for (Group group : this.repo.getAllGroups())
+			result.add(group.toJson());
 		writer.write(result.toJSONString());
 	}