From 9326b09d0c75d6be6d0fd59a57db543c1b719394 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Thu, 10 Mar 2022 18:41:52 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20syst=C3=A8me=20de=20contexte=20+?= =?UTF-8?q?=20Ajout=20commande=20SignupRule.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/client/Context.java | 30 ++++++++++ .../protocol/ProtocolReader.java | 46 +++++++++++---- .../protocol/rules/reader/FilelistRule.java | 9 ++- .../protocol/rules/reader/HelloRule.java | 10 ++-- .../protocol/rules/reader/SavefileRule.java | 19 +++++- .../protocol/rules/reader/SendOkRule.java | 9 ++- .../protocol/rules/reader/SigninRule.java | 26 ++++++--- .../protocol/rules/reader/SignupRule.java | 58 +++++++++++++++++++ .../java/lightcontainer/storage/AppData.java | 8 ++- .../lightcontainer/storage/JsonAdapter.java | 2 +- app/src/main/resources/rules.txt | 4 +- .../storage/JsonAdapterTests.java | 2 +- .../storage/RepositoryTests.java | 2 +- 13 files changed, 186 insertions(+), 39 deletions(-) create mode 100644 app/src/main/java/lightcontainer/domains/client/Context.java create mode 100644 app/src/main/java/lightcontainer/protocol/rules/reader/SignupRule.java diff --git a/app/src/main/java/lightcontainer/domains/client/Context.java b/app/src/main/java/lightcontainer/domains/client/Context.java new file mode 100644 index 0000000..174539a --- /dev/null +++ b/app/src/main/java/lightcontainer/domains/client/Context.java @@ -0,0 +1,30 @@ +package lightcontainer.domains.client; + +import lightcontainer.storage.AppData; +import lightcontainer.storage.User; +import lightcontainer.utils.AES_GCM; + +import java.security.NoSuchAlgorithmException; +import java.util.LinkedList; + +public class Context { + + private AppData appData; + + + public Context(AppData appData) { + this.appData = appData; + } + + + public boolean createUser(String login, String password) { + try { + String key = AES_GCM.generateSecretKey(); + return this.appData.addUser(login, password, key); + } catch (NoSuchAlgorithmException e) { + return false; + } + } + + +} diff --git a/app/src/main/java/lightcontainer/protocol/ProtocolReader.java b/app/src/main/java/lightcontainer/protocol/ProtocolReader.java index 6d37951..b8f1899 100644 --- a/app/src/main/java/lightcontainer/protocol/ProtocolReader.java +++ b/app/src/main/java/lightcontainer/protocol/ProtocolReader.java @@ -1,15 +1,19 @@ package lightcontainer.protocol; +import lightcontainer.domains.client.Context; + import java.io.InputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; public abstract class ProtocolReader { + private final String name; // Variables private final Pattern rulePattern; // Constructor - protected ProtocolReader(String pattern) { + protected ProtocolReader(String name, String pattern) { + this.name = name; this.rulePattern = Pattern.compile(pattern); } @@ -42,6 +46,7 @@ public abstract class ProtocolReader { /** * Récupérer la commande à envoyer + * * @return Commande */ public ProtocolWriter.ProtocolResult getResultCommand() { @@ -50,8 +55,9 @@ public abstract class ProtocolReader { /** * Mettre la commande à envoyer + * * @param resultCommand Commande à envoyer - * @param receiver Le receveur de cette commande + * @param receiver Le receveur de cette commande */ public void setResultCommand(ProtocolWriter.ProtocolResult resultCommand, ResultCmdReceiver receiver) { this.resultCommand = resultCommand; @@ -61,32 +67,52 @@ public abstract class ProtocolReader { /** * Permet de lire un fichier. Cad reçevoir le contenu d'un fichier provenant du réseau. * Redéfinissez cette méthode pour l'utiliser + * * @param reader Buffer rempli du fichier */ - public void read(InputStream reader) {} + public void read(InputStream reader) { + } } /** * Permet de lancer la décomposition d'une commande pour en extraire les données + * * @param data Contenu de la commande */ - public T execute(String data) { + public T execute(Context context, String data) { Matcher ruleMatcher = this.rulePattern.matcher(data); + // Vérifier que c'est le bon protocle + String name = ruleMatcher.group(1); - if (ruleMatcher.matches()) { - String[] groups = new String[ruleMatcher.groupCount()]; + if (name != null && name.equals(this.name)) { + // Vérifier que la commande match + if (ruleMatcher.matches()) { + String[] groups = new String[ruleMatcher.groupCount()]; - for (int i = 1; i <= groups.length; ++i) - groups[i - 1] = ruleMatcher.group(i); + for (int i = 1; i <= groups.length; ++i) + groups[i - 1] = ruleMatcher.group(i + 1); - return onExecuted(groups); + return onExecuted(context, groups); + } else { + return onError(); + } } return null; } /** * Cette méthode est appelée lors de l'exécution de la règle + * * @param data Paramètres pour créer la commande. */ - protected abstract T onExecuted(String... data); + protected abstract T onExecuted(Context context, String... data); + + /** + * Cette méthode est appelée lors d'une erreur de la règle + */ + protected T onError() { + return null; + } + + } diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/FilelistRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/FilelistRule.java index 3b292be..5736642 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/FilelistRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/FilelistRule.java @@ -1,5 +1,6 @@ package lightcontainer.protocol.rules.reader; +import lightcontainer.domains.client.Context; import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; import lightcontainer.protocol.ProtocolWriter; @@ -8,13 +9,15 @@ import lightcontainer.protocol.rules.writer.SignOkRule; public class FilelistRule extends ProtocolReader { // Constants - private static final String PATTERN = "^FILELIST\r\n$"; + private static final String PATTERN = "^(FILELIST)\r\n$"; + + private static final String NAME = "FILELIST"; private ProtocolRepository protocolRep; // Constructor public FilelistRule(ProtocolRepository protocolRep) { - super(PATTERN); + super(NAME, PATTERN); this.protocolRep = protocolRep; } @@ -25,7 +28,7 @@ public class FilelistRule extends ProtocolReader { * @param data Paramètres pour créer la commande. */ @Override - protected FilelistRule.Result onExecuted(String... data) { + protected FilelistRule.Result onExecuted(Context context, String... data) { FilelistRule.Result result = new Result(); result.setResultCommand(this.protocolRep.executeWriter(FilesRule.NAME, "endbenja.txt!500"), ResultCmdReceiver.CLIENT); return result; diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java index 407e2dc..bc8ae07 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java @@ -1,5 +1,6 @@ package lightcontainer.protocol.rules.reader; +import lightcontainer.domains.client.Context; import lightcontainer.protocol.ProtocolReader; import java.io.BufferedReader; @@ -8,7 +9,9 @@ import java.util.List; public class HelloRule extends ProtocolReader { - private static final String PATTERN = "^HELLO ([A-Za-z0-9]{5,20}) ([0-9]{1,5})\r\n$"; + private static final String PATTERN = "^(HELLO) ([A-Za-z0-9]{5,20}) ([0-9]{1,5})\r\n$"; + + private static final String NAME = "HELLO"; // Index du domain dans le tableau de donnée private static final int DOMAIN = 0; @@ -17,7 +20,7 @@ public class HelloRule extends ProtocolReader { private static final int PORT = 1; public HelloRule() { - super(PATTERN); + super(NAME, PATTERN); } @@ -39,12 +42,11 @@ public class HelloRule extends ProtocolReader { return port; } - } @Override - protected HelloRule.Result onExecuted(String... data) { + protected HelloRule.Result onExecuted(Context context, String... data) { String domain = data[DOMAIN]; int port = Integer.parseInt(data[PORT]); diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java index 444a916..d1988d6 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java @@ -1,5 +1,6 @@ package lightcontainer.protocol.rules.reader; +import lightcontainer.domains.client.Context; import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; import lightcontainer.protocol.rules.writer.SaveFileErrorRule; @@ -12,7 +13,10 @@ import java.io.InputStream; public class SavefileRule extends ProtocolReader { // Constants - private static final String PATTERN = "^SAVEFILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$"; + private static final String PATTERN = "^(SAVEFILE) ([^ !]{1,20}) ([0-9]{1,10})\r\n$"; + + private static final String NAME = "SAVEFILE"; + private static final int FILE_NAME = 0; // Index file name. private static final int FILE_SIZE = 1; // Index file size. @@ -20,7 +24,7 @@ public class SavefileRule extends ProtocolReader { // Constructor public SavefileRule(ProtocolRepository protocolRep) { - super(PATTERN); + super(NAME, PATTERN); this.protocolRep = protocolRep; } @@ -58,9 +62,18 @@ public class SavefileRule extends ProtocolReader { * @param data Paramètres pour créer la commande. */ @Override - protected SavefileRule.Result onExecuted(String... data) { + protected SavefileRule.Result onExecuted(Context context, String... data) { SavefileRule.Result result = new SavefileRule.Result(data[FILE_NAME], Integer.parseInt(data[FILE_SIZE])); return result; } + + @Override + protected ProtocolReader.ProtocolResult onError() { + ProtocolReader.ProtocolResult result = new ProtocolReader.ProtocolResult(); + // Commande renvoyée en cas d'erreur + result.setResultCommand(protocolRep.executeWriter(SaveFileErrorRule.NAME), ResultCmdReceiver.CLIENT); + + return result; + } } diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java index 8243e43..741ca56 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java @@ -1,5 +1,6 @@ package lightcontainer.protocol.rules.reader; +import lightcontainer.domains.client.Context; import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; import lightcontainer.protocol.ProtocolWriter; @@ -9,19 +10,21 @@ public class SendOkRule extends ProtocolReader { // Constants - private static final String PATTERN = "^SEND_OK\r\n$"; + private static final String PATTERN = "^(SEND_OK)\r\n$"; + + private static final String NAME = "SEND_OK"; private ProtocolRepository protocolRep; // Constructor public SendOkRule(ProtocolRepository protocolRep) { - super(PATTERN); + super(NAME, PATTERN); this.protocolRep = protocolRep; } @Override - protected ProtocolReader.ProtocolResult onExecuted(String... data) { + protected ProtocolReader.ProtocolResult onExecuted(Context context, String... data) { ProtocolReader.ProtocolResult result = new ProtocolReader.ProtocolResult(); result.setResultCommand(protocolRep.executeWriter(SaveFileOkRule.NAME), ResultCmdReceiver.CLIENT); return result; diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/SigninRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/SigninRule.java index 4e498dd..1ba8ea7 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/SigninRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/SigninRule.java @@ -1,7 +1,9 @@ package lightcontainer.protocol.rules.reader; +import lightcontainer.domains.client.Context; import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; +import lightcontainer.protocol.rules.writer.SaveFileErrorRule; import lightcontainer.protocol.rules.writer.SignErrorRule; import lightcontainer.protocol.rules.writer.SignOkRule; @@ -9,7 +11,10 @@ import java.io.InputStream; public class SigninRule extends ProtocolReader { // Constants - private static final String PATTERN = "^SIGNIN ([A-Za-z0-9]{2,20}) ([^ !]{5,50})\r\n$"; + private static final String PATTERN = "^(SIGNIN) ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$"; + + private static final String NAME = "SIGNIN"; + private static final int LOGIN = 0; // Index du domain dans le tableau de données private static final int PASSWORD = 1; // Index du port dans le tableau de données @@ -17,7 +22,7 @@ public class SigninRule extends ProtocolReader { // Constructor public SigninRule(ProtocolRepository protocolRep) { - super(PATTERN); + super(NAME, PATTERN); this.protocolRep = protocolRep; } @@ -41,17 +46,12 @@ public class SigninRule extends ProtocolReader { } public boolean checkCredentials() { - return getLogin().equals("aa") && getPassword().equals("aaaaa"); - } - - @Override - public void read(InputStream reader) { - + return getLogin().equals("aaaaa") && getPassword().equals("aaaaa"); } } @Override - protected SigninRule.Result onExecuted(String... data) { + protected SigninRule.Result onExecuted(Context context, String... data) { SigninRule.Result result = new SigninRule.Result(data[LOGIN], data[PASSWORD]); // TODO : Création d'une règle d'écriture SIGN_OK et SIGN_ERROR proprement @@ -62,4 +62,12 @@ public class SigninRule extends ProtocolReader { } return result; } + + @Override + protected ProtocolReader.ProtocolResult onError() { + ProtocolReader.ProtocolResult result = new ProtocolReader.ProtocolResult(); + + result.setResultCommand(protocolRep.executeWriter(SignErrorRule.NAME), ResultCmdReceiver.CLIENT); + return result; + } } diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/SignupRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/SignupRule.java new file mode 100644 index 0000000..4e4af6a --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/SignupRule.java @@ -0,0 +1,58 @@ +package lightcontainer.protocol.rules.reader; + +import lightcontainer.domains.client.Context; +import lightcontainer.interfaces.ProtocolRepository; +import lightcontainer.protocol.ProtocolReader; +import lightcontainer.protocol.rules.writer.SignErrorRule; + +public class SignupRule extends ProtocolReader { + // Constants + private static final String PATTERN = "^(SIGNUP) ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$"; + private static final String NAME = "SIGNUP"; + private static final int LOGIN = 0; + private static final int PASSWORD = 1; + + private ProtocolRepository protocolRep; + + public SignupRule(ProtocolRepository protocolRep) { + super(NAME, PATTERN); + this.protocolRep = protocolRep; + } + + public class Result extends ProtocolResult { + //Variables + private final String login; + private final String password; + + public Result(String login, String password) { + this.login = login; + this.password = password; + } + + public String getLogin() { + return login; + } + + public String getPassword() { + return password; + } + + + } + + @Override + protected SignupRule.Result onExecuted(Context context, String... data) { + SignupRule.Result result = new SignupRule.Result(data[LOGIN], data[PASSWORD]); + + if () + return null; + } + + @Override + protected ProtocolReader.ProtocolResult onError() { + ProtocolReader.ProtocolResult result = new ProtocolReader.ProtocolResult(); + + result.setResultCommand(protocolRep.executeWriter(SignErrorRule.NAME), ResultCmdReceiver.CLIENT); + return result; + } +} diff --git a/app/src/main/java/lightcontainer/storage/AppData.java b/app/src/main/java/lightcontainer/storage/AppData.java index 2a693b2..caec68e 100644 --- a/app/src/main/java/lightcontainer/storage/AppData.java +++ b/app/src/main/java/lightcontainer/storage/AppData.java @@ -67,13 +67,16 @@ public class AppData { return this.users.get(userName); } + + + /** * Use this method when a user signs up. * - * @param user The user to add. * @return True if the user was added. False if a user with the same name already exists. */ - public boolean addUser(User user) { + public boolean addUser(String login, String password, String key) { + User user = new User(login, password, key, new HashMap<>()); if (this.users.containsKey(user.getName())) { return false; } else { @@ -149,4 +152,5 @@ public class AppData { return this.users.get(user.getName()).addStorage(file, storage); } } + } diff --git a/app/src/main/java/lightcontainer/storage/JsonAdapter.java b/app/src/main/java/lightcontainer/storage/JsonAdapter.java index aaecc55..dcf09c3 100644 --- a/app/src/main/java/lightcontainer/storage/JsonAdapter.java +++ b/app/src/main/java/lightcontainer/storage/JsonAdapter.java @@ -98,7 +98,7 @@ public class JsonAdapter implements Adapter { AppData appData = AppData.getInstance(); appData.setAppConfig(appConfig); for (User user : users) { - appData.addUser(user); + appData.addUser(user.getName(), user.getPassword(), user.getAesKey()); } this.appData = appData; return this.appData; diff --git a/app/src/main/resources/rules.txt b/app/src/main/resources/rules.txt index 8be9487..529cae7 100644 --- a/app/src/main/resources/rules.txt +++ b/app/src/main/resources/rules.txt @@ -29,8 +29,8 @@ ffe_retrievefile = ^RETRIEVEFILE ([A-Za-z0-9.]{50,200})\r\n$ sbe_retrieveresult = ^(RETRIEVE_OK ([A-Za-z0-9.]{50,200} [0-9]{1,10} [A-Za-z0-9.]{50,200})\r\n)|(RETRIEVE_ERROR\r\n)$ //Client to FileFrontEnd -client_signin = ^SIGNIN ([A-Za-z0-9]{2,20}) ([^ !]{5,50})\r\n$ -client_signup = ^SIGNUP ([A-Za-z0-9]{2,20}) ([^ !]{5,50})\r\n$ +client_signin = ^SIGNIN ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$ +client_signup = ^SIGNUP ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$ ffe_signresult = ^(SIGN_OK|SIGN_ERROR)\r\n$ client_filelist = ^FILELIST\r\n$ ffe_filelistresult = ^FILES( ([^ !]{1,20})!([0-9]{1,10})){0,50}$ diff --git a/app/src/test/java/lightcontainer/storage/JsonAdapterTests.java b/app/src/test/java/lightcontainer/storage/JsonAdapterTests.java index bd9006a..dc87270 100644 --- a/app/src/test/java/lightcontainer/storage/JsonAdapterTests.java +++ b/app/src/test/java/lightcontainer/storage/JsonAdapterTests.java @@ -29,7 +29,7 @@ public class JsonAdapterTests { files.put(file1.getName(), file1); User user1 = new User("User1", "Password", "djdjjdj", files); appData.setAppConfig(appConfig); - appData.addUser(user1); + //appData.addUser(user1); JsonAdapter jsonAdapter = new JsonAdapter(appData); //WHEN the adapter converts AppData to Json String jsonAppData = jsonAdapter.toString(); diff --git a/app/src/test/java/lightcontainer/storage/RepositoryTests.java b/app/src/test/java/lightcontainer/storage/RepositoryTests.java index ed90a68..abb3f15 100644 --- a/app/src/test/java/lightcontainer/storage/RepositoryTests.java +++ b/app/src/test/java/lightcontainer/storage/RepositoryTests.java @@ -45,7 +45,7 @@ public class RepositoryTests { files.put(file1.getName(), file1); User user1 = new User("User1", "Password", "djdjjdj", files); appData.setAppConfig(appConfig); - appData.addUser(user1); + //appData.addUser(user1); JsonAdapter jsonAdapter = new JsonAdapter(appData); //WHEN Repository calls save method String filePath = "src/test/resources/test.json";