fixed password encryption; fixed GUI bugs

Author: axelguimaraes

build.gradle

@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
-    implementation group: 'org.springframework.security', name: 'spring-security-crypto', version: '4.1.3.RELEASE'
+    implementation 'com.password4j:password4j:1.6.3'
 }
 
 test {

src/main/java/edu/estg/server/ClientHandler.java

@@ -17,7 +17,7 @@ public ClientHandler(ArrayListSync<ClientHandler> clientHandlers, Socket socket,
            this.socket = socket;
            this.server = server;
            this.clientHandlers = clientHandlers;
-           this.protocol = new Protocol(this, clientHandlers, server);
+           this.protocol = new Protocol(this, server);
            this.bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
            this.bufferedWriter = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
            this.clientHandlers.add(this);

src/main/java/edu/estg/server/Protocol.java

@@ -3,8 +3,6 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import edu.estg.utils.*;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.stream.Collectors;
@@ -14,18 +12,14 @@
 public class Protocol {
     private final JsonFileHelper jsonFileHelper;
     private final Gson jsonHelper;
-    private final ArrayListSync<ClientHandler> clientHandlers;
     private final ClientHandler clientHandler;
     protected Server server;
-    private final BCryptPasswordEncoder passwordEncoder;
 
-    public Protocol(ClientHandler clientHandler, ArrayListSync<ClientHandler> clientHandlers, Server server) throws IOException {
+    public Protocol(ClientHandler clientHandler, Server server) throws IOException {
         this.clientHandler = clientHandler;
         this.server = server;
-        this.clientHandlers = clientHandlers;
         this.jsonHelper = new Gson();
         this.jsonFileHelper = new JsonFileHelper("files/");
-        this.passwordEncoder = new BCryptPasswordEncoder();
     }
 
     protected synchronized String processMessage(String requestMessage) {

src/main/java/edu/estg/userInterface/GUI/InitialFrame.java

@@ -3,9 +3,10 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.password4j.Hash;
+import com.password4j.Password;
 import edu.estg.userInterface.Client;
 import edu.estg.utils.*;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import javax.swing.*;
 import java.awt.*;
@@ -42,7 +43,6 @@ public class InitialFrame extends JFrame {
     private PassengerMenuFrame passengerMenuFrame;
     private ArrayList<LocalNode> currentLocalNodes;
     private final ArrayList<String> linesToAdd;
-    private final BCryptPasswordEncoder passwordEncoder;
 
     public InitialFrame(Client client) throws IOException {
         this.jsonHelper = new GsonBuilder().serializeNulls().create();
@@ -51,7 +51,6 @@ public InitialFrame(Client client) throws IOException {
         Request<ArrayList<LocalNode>> request = new Request<>(RequestType.GET_CURRENT_LOCAL_NODES);
         this.client.sendMessage(this.jsonHelper.toJson(request));
         this.linesToAdd = new ArrayList<>();
-        this.passwordEncoder = new BCryptPasswordEncoder();
     }
 
     private void configButtons() {
@@ -92,14 +91,15 @@ private void configButtons() {
 
 
         loginButton.addActionListener(e -> {
-            Login login = new Login(usernameLoginTextField.getText(), passwordEncoder.encode(String.valueOf(passwordLoginTextField.getPassword())));
+            Hash hash = Password.hash(String.valueOf(passwordLoginTextField.getPassword())).withArgon2();
+            Login login = new Login(usernameLoginTextField.getText(), hash.getResult());
 
             // if is local node login
             if (isLoginLocalNode.get()) {
                 Request<Login> request = new Request<>(RequestType.LOCAL_NODE_LOGIN, login);
                 this.client.sendMessage(new Gson().toJson(request));
 
-            // if is passenger login
+                // if is passenger login
             } else if (!isLoginLocalNode.get()) {
                 Request<Login> request = new Request<>(RequestType.PASSENGER_LOGIN, login);
                 this.client.sendMessage(new Gson().toJson(request));
@@ -110,19 +110,22 @@ private void configButtons() {
 
             // if is local node register
             if (isRegisterLocalNode.get()) {
-                LocalNode localNode = new LocalNode(nameRegisterTextField.getText(), usernameRegisterTextField.getText(), passwordEncoder.encode(String.valueOf(passwordRegisterTextField.getPassword())));
+                Hash hash = Password.hash(String.valueOf(passwordRegisterTextField.getPassword())).withArgon2();
+
+                LocalNode localNode = new LocalNode(nameRegisterTextField.getText(), usernameRegisterTextField.getText(), hash.getResult());
                 LocalNodeRegister localNodeRegister = new LocalNodeRegister(localNode);
                 Request<LocalNodeRegister> request = new Request<>(RequestType.LOCAL_NODE_REGISTER, localNodeRegister);
                 this.client.sendMessage(new Gson().toJson(request));
 
-            // if is passenger register
+                // if is passenger register
             } else if (!isRegisterLocalNode.get()) {
                 ArrayList<TrainLine> linesAdded = new ArrayList<>();
                 for (int i = 0; i < trainList.getSelectedValuesList().size(); i++) {
                     linesAdded.add(getTrainLineFromString(trainList.getSelectedValuesList().get(i)));
                 }
 
-                Passenger passenger = new Passenger(nameRegisterTextField.getText(), usernameRegisterTextField.getText(), passwordEncoder.encode(String.valueOf(passwordRegisterTextField.getPassword())), linesAdded);
+                Hash hash = Password.hash(String.valueOf(passwordRegisterTextField.getPassword())).withArgon2();
+                Passenger passenger = new Passenger(nameRegisterTextField.getText(), usernameRegisterTextField.getText(), hash.getResult(), linesAdded);
 
                 PassengerRegister passengerRegister = new PassengerRegister(passenger);
                 Request<PassengerRegister> request = new Request<>(RequestType.PASSENGER_REGISTER, passengerRegister);

src/main/java/edu/estg/userInterface/GUI/LocalNodeMenuFrame.java

@@ -10,6 +10,7 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
+import java.util.Objects;
 
 import static javax.swing.JOptionPane.ERROR_MESSAGE;
 import static javax.swing.JOptionPane.showMessageDialog;
@@ -84,6 +85,11 @@ public void configButtons() {
 
         sendMessageToPassengersButton.addActionListener(e -> {
             String message = JOptionPane.showInputDialog("Message:");
+            if (Objects.equals(message, "")) {
+                showMessageDialog(new JFrame(), "Please write a message!", "", ERROR_MESSAGE);
+                return;
+            }
+
             if (linesList.isSelectionEmpty()) {
                 showMessageDialog(new JFrame(), "Please select the affected line!","", ERROR_MESSAGE);
                 return;
@@ -98,6 +104,7 @@ public void configButtons() {
 
             Request<MessageToPassenger> request = new Request<>(RequestType.PASSENGER_MESSAGE_FROM_NODE, messageToPassenger);
             this.client.sendMessage(this.jsonHelper.toJson(request));
+            linesList.clearSelection();
         });
     }
 

src/main/java/edu/estg/userInterface/GUI/PassengerMenuFrame.java

@@ -80,6 +80,7 @@ public void configButtons() {
             Request<MessageFromPassenger> request = new Request<>(RequestType.PASSENGER_MESSAGE_TO_NODE, messageFromPassenger);
             this.client.sendMessage(this.jsonHelper.toJson(request));
             sendMessageTextField.setText("");
+            listLinesAssociated.clearSelection();
         });
     }