From 56d3468df81f89947360e953b151e4532d7a74d5 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Tue, 22 Feb 2022 09:30:33 +0100 Subject: [PATCH 1/2] Regex : Client to FileFrontEnd --- .../lightcontainer/protocol/Protocol.java | 70 ++++++++----------- .../lightcontainer/protocol/SbeHello.java | 16 +++++ app/src/main/resources/rules.txt | 18 ++++- 3 files changed, 63 insertions(+), 41 deletions(-) create mode 100644 app/src/main/java/lightcontainer/protocol/SbeHello.java diff --git a/app/src/main/java/lightcontainer/protocol/Protocol.java b/app/src/main/java/lightcontainer/protocol/Protocol.java index e7449f3..07bb621 100644 --- a/app/src/main/java/lightcontainer/protocol/Protocol.java +++ b/app/src/main/java/lightcontainer/protocol/Protocol.java @@ -7,15 +7,14 @@ import java.util.regex.Pattern; /** * Protocol - * + *

* Class allowing to define new rules for the LightContainer protocol, * also provides utility functions to work with regexes and the command to compare. * - * @version 1.0 - * @since 1.0 - * - * @see Pattern - * @author Jérémi NIHART + * @author Jérémi NIHART + * @version 1.0 + * @see Pattern + * @since 1.0 */ public abstract class Protocol { // Variables @@ -25,9 +24,10 @@ public abstract class Protocol { /** * Protocol constructor - * @param rule Command (e.g: LOGIN). - * @param regex Regex to compile and use for this command (e.g: LOGIN ([A-Z0-9a-z]{1,20})). - * Do not forget to define the groups in the regex. + * + * @param rule Command (e.g: LOGIN). + * @param regex Regex to compile and use for this command (e.g: LOGIN ([A-Z0-9a-z]{1,20})). + * Do not forget to define the groups in the regex. */ protected Protocol(String rule, String regex) { this.rule = rule; @@ -37,9 +37,8 @@ public abstract class Protocol { /** * Retrieve, the name of the Rule. * - * @return Name of this rule. - * - * @since 1.0 + * @return Name of this rule. + * @since 1.0 */ public String getRule() { return this.rule; @@ -48,17 +47,16 @@ public abstract class Protocol { /** * Check if a command matches the rule with the rule matcher. * - * @return True : if the command match with the rule. - * False though. - * @param cmd Command to verify with the rule matcher. - * - * @since 1.0 + * @param cmd Command to verify with the rule matcher. + * @return True : if the command match with the rule. + * False though. + * @since 1.0 */ protected boolean matcherCheck(String cmd) { Matcher ruleMatcher = this.rulePattern.matcher(cmd); if (ruleMatcher.matches()) { this.groups = new ArrayList<>(); - for (int i=1; i <= ruleMatcher.groupCount(); i++) this.groups.add(ruleMatcher.group(i)); + for (int i = 1; i <= ruleMatcher.groupCount(); i++) this.groups.add(ruleMatcher.group(i)); return true; } return false; @@ -66,14 +64,12 @@ public abstract class Protocol { /** * Get a list of all the groups extracted from the previously matched command with {@link #matcherCheck(String)}. - * + * * Requires to have run {@link #matcherCheck(String)} * - * @return String list containing all the groups extrapolated from the command. - * - * @since 1.0 - * - * @see Protocol#matcherCheck(String) + * @return String list containing all the groups extrapolated from the command. + * @see Protocol#matcherCheck(String) + * @since 1.0 */ protected List matcherGetGroups() { return this.groups; @@ -81,26 +77,23 @@ public abstract class Protocol { /** * Execute the rule on a command. - * + *

* This function allows you to check a command and process those groups (parameters) * use the utility functions of {@link Protocol} to facilitate processing, see @see. * - * @param cmd Command on which to execute the rule. - * - * @since 1.0 - * - * @see Protocol#execute(String) - * @see #matcherCheck(String) - * @see #matcherGetGroups() + * @param cmd Command on which to execute the rule. + * @see Protocol#execute(String) + * @see #matcherCheck(String) + * @see #matcherGetGroups() + * @since 1.0 */ public abstract void execute(String cmd); /** * Retrieve, the hashcode of the rule. * - * @return Rule hashcode. - * - * @since 1.0 + * @return Rule hashcode. + * @since 1.0 */ @Override public int hashCode() { @@ -110,10 +103,9 @@ public abstract class Protocol { /** * Compare the equality of two rules. * - * @return True : if the rules are equals - * False if not. - * - * @since 1.0 + * @return True : if the rules are equals + * False if not. + * @since 1.0 */ @Override public boolean equals(final Object obj) { diff --git a/app/src/main/java/lightcontainer/protocol/SbeHello.java b/app/src/main/java/lightcontainer/protocol/SbeHello.java new file mode 100644 index 0000000..af30e5b --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/SbeHello.java @@ -0,0 +1,16 @@ +package lightcontainer.protocol; + +public class SbeHello extends Protocol { + + + protected SbeHello() { + super("HELLO", "^(HELLO)\\s([A-Za-z0-9.]{5,20})\\s((6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([0-5][0-9]{4})|([0-9]{1,4}))\\r\\n$"); + } + + @Override + public void execute(String cmd) { + if (matcherCheck(cmd)) { + + } + } +} diff --git a/app/src/main/resources/rules.txt b/app/src/main/resources/rules.txt index 2cfa297..511bc2b 100644 --- a/app/src/main/resources/rules.txt +++ b/app/src/main/resources/rules.txt @@ -21,9 +21,23 @@ login = [A-Za-z0-9]{2,20} sbe_hello = ^(HELLO)\s([A-Za-z0-9.]{5,20})\s((6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([0-5][0-9]{4})|([0-9]{1,4}))\r\n$ //TODO \r\n -> à tester pour voir si déjà dans le flux ou doit être construit //FileFrontEnd to StorBackEnd -ffe_sendfile = ^(SENDFILE)\s([A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200})\r\n(.*)$ +ffe_sendfile = ^(SENDFILE)\s([A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200})\r\n$ sbe_sendresult = ^(SEND_OK|SEND_ERROR)\r\n$ ffe_erasefile = ^(ERASEFILE)\s([A-Za-z0-9.]{50,200})\r\n$ sbe_eraseresult = ^(ERASE_OK|ERASE_ERROR)\r\n$ ffe_retrievefile = ^(RETRIEVEFILE)\s([A-Za-z0-9.]{50,200})\r\n$ -sbe_retrieveresult = ^(RETRIEVE_OK)\s([A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200})\r\n(.*)|(RETRIEVE_ERROR)$ \ No newline at end of file +sbe_retrieveresult = ^((RETRIEVE_OK)\s([A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200})\r\n)|((RETRIEVE_ERROR)\r\n)$ + +//Client to FileFrontEnd +client_signin = ^(SIGNIN)\s([A-Za-z0-9]{2,20})\s([^\s!]{5,50})\r\n$ +client_signup = ^(SIGNUP)\s([A-Za-z0-9]{2,20})\s([^\s!]{5,50})\r\n$ +ffe_signresult = ^(SIGN_OK|SIGN_ERROR)\r\n$ +client_filelist = ^(FILELIST)\r\n$ +ffe_filelistresult = ^(FILES)\s(([^\s!]{1,20}![0-9]{1,10}){0,50})\r\n$ +client_savefile = ^(SAVE_FILE)\s([^\s!]{1,20})\s([0-9]{1,10})\r\n$ +ffe_savefileresult = ^(SAVEFILE_OK|SAVEFILE_ERROR)\r\n$ +client_getfile = ^(GETFILE)\s([^\s!]{1,20})\r\n$ +ffe_getfileresult = ^((GETFILE_OK)\s(^\s!]{1,20})\s([0-9]{1,10})\r\n)|((GETFILE_ERROR)\r\n)$ +client_removefile = ^(REMOVEFILE)\s([^\s!]{1,20})\r\n$ +ffe_removefileresult = ^(REMOVEFILE_OK|REMOVEFILE_ERROR)\r\n$ +client_signout = ^(SIGNOUT)\r\n$ \ No newline at end of file From ec8a58044d02abb39ab3aac6d77547c18f9fba72 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Tue, 22 Feb 2022 11:13:46 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Regex=20:=20Client=20to=20FileFrontEnd=20im?= =?UTF-8?q?pl=C3=A9mentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/ClientFileList.java | 12 ++++++ .../protocol/ClientGetFile.java | 12 ++++++ .../protocol/ClientRemoveFile.java | 13 +++++++ .../protocol/ClientSaveFile.java | 12 ++++++ .../lightcontainer/protocol/ClientSignIn.java | 13 +++++++ .../protocol/ClientSignOut.java | 12 ++++++ .../lightcontainer/protocol/ClientSignUp.java | 12 ++++++ .../protocol/SbeEraseResult.java | 12 ++++++ .../lightcontainer/protocol/SbeHello.java | 2 +- .../protocol/SbeRetrieveResult.java | 12 ++++++ .../protocol/SbeSendResult.java | 13 +++++++ app/src/main/resources/rules.txt | 38 +++++++++---------- 12 files changed, 143 insertions(+), 20 deletions(-) create mode 100644 app/src/main/java/lightcontainer/protocol/ClientFileList.java create mode 100644 app/src/main/java/lightcontainer/protocol/ClientGetFile.java create mode 100644 app/src/main/java/lightcontainer/protocol/ClientRemoveFile.java create mode 100644 app/src/main/java/lightcontainer/protocol/ClientSaveFile.java create mode 100644 app/src/main/java/lightcontainer/protocol/ClientSignIn.java create mode 100644 app/src/main/java/lightcontainer/protocol/ClientSignOut.java create mode 100644 app/src/main/java/lightcontainer/protocol/ClientSignUp.java create mode 100644 app/src/main/java/lightcontainer/protocol/SbeEraseResult.java create mode 100644 app/src/main/java/lightcontainer/protocol/SbeRetrieveResult.java create mode 100644 app/src/main/java/lightcontainer/protocol/SbeSendResult.java diff --git a/app/src/main/java/lightcontainer/protocol/ClientFileList.java b/app/src/main/java/lightcontainer/protocol/ClientFileList.java new file mode 100644 index 0000000..c88f72f --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientFileList.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class ClientFileList extends Protocol{ + protected ClientFileList() { + super("FILELIST", "^FILELIST\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/ClientGetFile.java b/app/src/main/java/lightcontainer/protocol/ClientGetFile.java new file mode 100644 index 0000000..4b0fa24 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientGetFile.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class ClientGetFile extends Protocol{ + protected ClientGetFile() { + super("GETFILE","^GETFILE ([^ !]{1,20})\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/ClientRemoveFile.java b/app/src/main/java/lightcontainer/protocol/ClientRemoveFile.java new file mode 100644 index 0000000..dd5375b --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientRemoveFile.java @@ -0,0 +1,13 @@ +package lightcontainer.protocol; + +public class ClientRemoveFile extends Protocol{ + + protected ClientRemoveFile() { + super("REMOVEFILE", "^REMOVEFILE ([^ !]{1,20})\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/ClientSaveFile.java b/app/src/main/java/lightcontainer/protocol/ClientSaveFile.java new file mode 100644 index 0000000..a3b7b11 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientSaveFile.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class ClientSaveFile extends Protocol { + protected ClientSaveFile() { + super("SAVEFILE", "^SAVE_FILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/ClientSignIn.java b/app/src/main/java/lightcontainer/protocol/ClientSignIn.java new file mode 100644 index 0000000..43edf56 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientSignIn.java @@ -0,0 +1,13 @@ +package lightcontainer.protocol; + +public class ClientSignIn extends Protocol { + + protected ClientSignIn() { + super("SIGNIN", "^(SIGNIN) ([A-Za-z0-9]{2,20}) ([^ !]{5,50})\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/ClientSignOut.java b/app/src/main/java/lightcontainer/protocol/ClientSignOut.java new file mode 100644 index 0000000..909b047 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientSignOut.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class ClientSignOut extends Protocol { + protected ClientSignOut() { + super("SIGNOUT", "^SIGNOUT\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/ClientSignUp.java b/app/src/main/java/lightcontainer/protocol/ClientSignUp.java new file mode 100644 index 0000000..91c67d3 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/ClientSignUp.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class ClientSignUp extends Protocol{ + protected ClientSignUp() { + super("SIGNUP","^(SIGNUP) ([A-Za-z0-9]{2,20}) ([^ !]{5,50})\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/SbeEraseResult.java b/app/src/main/java/lightcontainer/protocol/SbeEraseResult.java new file mode 100644 index 0000000..301edd8 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/SbeEraseResult.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class SbeEraseResult extends Protocol { + protected SbeEraseResult() { + super("ERASERESULT", "^(ERASE_OK|ERASE_ERROR)\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/SbeHello.java b/app/src/main/java/lightcontainer/protocol/SbeHello.java index af30e5b..6cd750a 100644 --- a/app/src/main/java/lightcontainer/protocol/SbeHello.java +++ b/app/src/main/java/lightcontainer/protocol/SbeHello.java @@ -4,7 +4,7 @@ public class SbeHello extends Protocol { protected SbeHello() { - super("HELLO", "^(HELLO)\\s([A-Za-z0-9.]{5,20})\\s((6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([0-5][0-9]{4})|([0-9]{1,4}))\\r\\n$"); + super("HELLO", "^(HELLO) ([A-Za-z0-9.]{5,20}) ([\\d]{0,5})\r\n$"); } @Override diff --git a/app/src/main/java/lightcontainer/protocol/SbeRetrieveResult.java b/app/src/main/java/lightcontainer/protocol/SbeRetrieveResult.java new file mode 100644 index 0000000..091cca2 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/SbeRetrieveResult.java @@ -0,0 +1,12 @@ +package lightcontainer.protocol; + +public class SbeRetrieveResult extends Protocol { + protected SbeRetrieveResult() { + super("RETTRIEVERESULT", "^((RETRIEVE_OK) ([A-Za-z0-9.]{50,200} [0-9]{1,10} [A-Za-z0-9.]{50,200})\r\n)|((RETRIEVE_ERROR)\r\n)$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/java/lightcontainer/protocol/SbeSendResult.java b/app/src/main/java/lightcontainer/protocol/SbeSendResult.java new file mode 100644 index 0000000..48279e1 --- /dev/null +++ b/app/src/main/java/lightcontainer/protocol/SbeSendResult.java @@ -0,0 +1,13 @@ +package lightcontainer.protocol; + +public class SbeSendResult extends Protocol { + + protected SbeSendResult() { + super("SENDRESULT", "^(SEND_OK|SEND_ERROR)\r\n$"); + } + + @Override + public void execute(String cmd) { + + } +} diff --git a/app/src/main/resources/rules.txt b/app/src/main/resources/rules.txt index 511bc2b..e5d69af 100644 --- a/app/src/main/resources/rules.txt +++ b/app/src/main/resources/rules.txt @@ -4,40 +4,40 @@ port = (6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([1-5][0-9 size = [0-9]{1,10} line = \r\n visiblechar = \p{Print} -passchar = [^\s!] +passchar = [^ !] binary = . -password = [^\s!]{5,50} -bl = \s +password = [^ !]{5,50} +bl = //espace letter = [A-Za-z] digit_letter = [A-Za-z0-9] -filename = [^\s!]{1,20} +filename = [^ !]{1,20} domain = [A-Za-z0-9.]{5,20} hash_filename = [A-Za-z0-9.]{50,200} hash_filecontent = [A-Za-z0-9.]{50,200} -file_info = [A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200} +file_info = [A-Za-z0-9.]{50,200} [0-9]{1,10} [A-Za-z0-9.]{50,200} login = [A-Za-z0-9]{2,20} //StorBackEnd to FileFrontEnd -sbe_hello = ^(HELLO)\s([A-Za-z0-9.]{5,20})\s((6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([0-5][0-9]{4})|([0-9]{1,4}))\r\n$ //TODO \r\n -> à tester pour voir si déjà dans le flux ou doit être construit +sbe_hello = ^HELLO ([A-Za-z0-9.]{5,20}) ([\d]{0,5})\r\n$ //TODO \r\n -> à tester pour voir si déjà dans le flux ou doit être construit //FileFrontEnd to StorBackEnd -ffe_sendfile = ^(SENDFILE)\s([A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200})\r\n$ +ffe_sendfile = ^SENDFILE ([A-Za-z0-9.]{50,200} [0-9]{1,10} [A-Za-z0-9.]{50,200})\r\n$ sbe_sendresult = ^(SEND_OK|SEND_ERROR)\r\n$ -ffe_erasefile = ^(ERASEFILE)\s([A-Za-z0-9.]{50,200})\r\n$ +ffe_erasefile = ^ERASEFILE ([A-Za-z0-9.]{50,200})\r\n$ sbe_eraseresult = ^(ERASE_OK|ERASE_ERROR)\r\n$ -ffe_retrievefile = ^(RETRIEVEFILE)\s([A-Za-z0-9.]{50,200})\r\n$ -sbe_retrieveresult = ^((RETRIEVE_OK)\s([A-Za-z0-9.]{50,200}\s[0-9]{1,10}\s[A-Za-z0-9.]{50,200})\r\n)|((RETRIEVE_ERROR)\r\n)$ +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)\s([A-Za-z0-9]{2,20})\s([^\s!]{5,50})\r\n$ -client_signup = ^(SIGNUP)\s([A-Za-z0-9]{2,20})\s([^\s!]{5,50})\r\n$ +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$ ffe_signresult = ^(SIGN_OK|SIGN_ERROR)\r\n$ -client_filelist = ^(FILELIST)\r\n$ -ffe_filelistresult = ^(FILES)\s(([^\s!]{1,20}![0-9]{1,10}){0,50})\r\n$ -client_savefile = ^(SAVE_FILE)\s([^\s!]{1,20})\s([0-9]{1,10})\r\n$ +client_filelist = ^FILELIST\r\n$ +ffe_filelistresult = ^FILES(( [^ !]{1,20})!([0-9]{1,10})){0,50}$ +client_savefile = ^SAVE_FILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$ ffe_savefileresult = ^(SAVEFILE_OK|SAVEFILE_ERROR)\r\n$ -client_getfile = ^(GETFILE)\s([^\s!]{1,20})\r\n$ -ffe_getfileresult = ^((GETFILE_OK)\s(^\s!]{1,20})\s([0-9]{1,10})\r\n)|((GETFILE_ERROR)\r\n)$ -client_removefile = ^(REMOVEFILE)\s([^\s!]{1,20})\r\n$ +client_getfile = ^GETFILE ([^ !]{1,20})\r\n$ +ffe_getfileresult = ^(GETFILE_OK (^ !]{1,20}) ([0-9]{1,10})\r\n)|(GETFILE_ERROR\r\n)$ +client_removefile = ^REMOVEFILE ([^ !]{1,20})\r\n$ ffe_removefileresult = ^(REMOVEFILE_OK|REMOVEFILE_ERROR)\r\n$ -client_signout = ^(SIGNOUT)\r\n$ \ No newline at end of file +client_signout = ^SIGNOUT\r\n$ \ No newline at end of file