From 78196f209cf9d6035729be43fa28f00d18c4212c Mon Sep 17 00:00:00 2001 From: EndMove Date: Sat, 26 Feb 2022 18:26:12 +0100 Subject: [PATCH 1/6] Update Python client (fix bugs) --- controller/AppController.py | 3 ++- net/UnicastConnection.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/controller/AppController.py b/controller/AppController.py index 7b3376a..21acc5e 100644 --- a/controller/AppController.py +++ b/controller/AppController.py @@ -31,9 +31,10 @@ class AppController: if message_id == Protocol.PARSE_SIGNOK: self.window_controller.switch_connected_mode() self.show_message("Connection done", False) + self.on_filelist() elif message_id == Protocol.PARSE_SIGNERROR: self.show_message("Error during SIGN_IN / SIGN_UP", True) - self.on_filelist() + self.connection.close() except Exception as ex: print(ex) traceback.print_exc() diff --git a/net/UnicastConnection.py b/net/UnicastConnection.py index a11ea9a..e854269 100644 --- a/net/UnicastConnection.py +++ b/net/UnicastConnection.py @@ -107,5 +107,11 @@ class UnicastConnection: def close(self): self.sock.close() + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.is_connected = False + self.is_tls = False + self.ssock = None + self.ca_path = None + self.ssl_info = None -- 2.45.2 From ba002a4392b303b6adbd72bc3e16d2313412b1ae Mon Sep 17 00:00:00 2001 From: EndMove Date: Sat, 5 Mar 2022 15:05:52 +0100 Subject: [PATCH 2/6] Add default login value --- gui/MainWindow.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gui/MainWindow.py b/gui/MainWindow.py index 16dfef2..e73ae59 100644 --- a/gui/MainWindow.py +++ b/gui/MainWindow.py @@ -11,10 +11,14 @@ class MainWindow: self.root.title("SecCon - © Louis SWINNEN 2022") self.root.config(bd=5) self.host = tk.StringVar() + self.host.set("127.0.0.1") self.passw = tk.StringVar() + self.passw.set("aaaaa") self.login = tk.StringVar() + self.login.set("aa") self.tls = tk.BooleanVar() self.port = tk.IntVar() + self.port.set(8500) self.draw_window() def start_main_loop(self): -- 2.45.2 From 63772e7d11f1ebc8faf7fef6e98077396642cd4c Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Tue, 8 Mar 2022 16:30:16 +0100 Subject: [PATCH 3/6] =?UTF-8?q?TLS=20:=20Ajout=20fichier=20cl=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/AppController.py | 9 +++++---- ffe.labo.swilabus.com.p12 | Bin 0 -> 4469 bytes 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 ffe.labo.swilabus.com.p12 diff --git a/controller/AppController.py b/controller/AppController.py index 7b3376a..fcd96ee 100644 --- a/controller/AppController.py +++ b/controller/AppController.py @@ -3,6 +3,7 @@ from model.Protocol import * import traceback import os.path + class AppController: def __init__(self, parser): self.parser = parser @@ -19,8 +20,8 @@ class AppController: print("[AppController::on_sign]") try: if not self.connection.is_connected: - print("[AppController::on_sign] connecting ... calling UnicastConnection::connect") - self.connect(host, port, tls) + print("[AppController::on_sign] connecting ... calling UnicastConnection::connect") + self.connect(host, port, tls) if not register: message = self.parser.build_SIGNIN(login, passw) else: @@ -41,7 +42,7 @@ class AppController: def get_filename_size_from_item(self, item): tokens = item.split('!') if len(tokens) == 2: - return (tokens[0],tokens[1]) + return (tokens[0], tokens[1]) else: return None @@ -117,7 +118,7 @@ class AppController: elif message_id == Protocol.PARSE_REMOVEFILEERROR: self.show_message("Error while erasing file.", True) - def show_message(self,message, is_error): + def show_message(self, message, is_error): self.window_controller.show_message(message, is_error) def connect(self, host, port, tls): diff --git a/ffe.labo.swilabus.com.p12 b/ffe.labo.swilabus.com.p12 new file mode 100644 index 0000000000000000000000000000000000000000..98ca601f97c230174c70b91ba7f73a9920b34370 GIT binary patch literal 4469 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 H0s;sCd`WKS literal 0 HcmV?d00001 -- 2.45.2 From d687732fad30d4b566348bb603a14b7cb0822420 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Thu, 10 Mar 2022 14:22:34 +0100 Subject: [PATCH 4/6] =?UTF-8?q?TLS=20:=20Changement=20h=C3=B4te=20par=20d?= =?UTF-8?q?=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ffe.labo.swilabus.com.p12 | Bin 4469 -> 0 bytes gui/MainWindow.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 ffe.labo.swilabus.com.p12 diff --git a/ffe.labo.swilabus.com.p12 b/ffe.labo.swilabus.com.p12 deleted file mode 100644 index 98ca601f97c230174c70b91ba7f73a9920b34370..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4469 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 H0s;sCd`WKS diff --git a/gui/MainWindow.py b/gui/MainWindow.py index e73ae59..4200ab9 100644 --- a/gui/MainWindow.py +++ b/gui/MainWindow.py @@ -11,14 +11,14 @@ class MainWindow: self.root.title("SecCon - © Louis SWINNEN 2022") self.root.config(bd=5) self.host = tk.StringVar() - self.host.set("127.0.0.1") + self.host.set("ffe.labo.swilabus.com") self.passw = tk.StringVar() self.passw.set("aaaaa") self.login = tk.StringVar() self.login.set("aa") self.tls = tk.BooleanVar() self.port = tk.IntVar() - self.port.set(8500) + self.port.set(8000) self.draw_window() def start_main_loop(self): -- 2.45.2 From c44aa83c642e2411cc426281801505b6bcda008d Mon Sep 17 00:00:00 2001 From: EndMove Date: Thu, 10 Mar 2022 14:43:35 +0100 Subject: [PATCH 5/6] Default TLS//SSL enabled --- gui/MainWindow.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/MainWindow.py b/gui/MainWindow.py index 4200ab9..b5ccf23 100644 --- a/gui/MainWindow.py +++ b/gui/MainWindow.py @@ -17,6 +17,7 @@ class MainWindow: self.login = tk.StringVar() self.login.set("aa") self.tls = tk.BooleanVar() + self.tls.set(True) self.port = tk.IntVar() self.port.set(8000) self.draw_window() -- 2.45.2 From d0e4fdbf6ca5692c801026d72258805b183c0f04 Mon Sep 17 00:00:00 2001 From: EndMove Date: Tue, 15 Mar 2022 09:56:35 +0100 Subject: [PATCH 6/6] Update with the good username --- gui/MainWindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/MainWindow.py b/gui/MainWindow.py index b5ccf23..13b66de 100644 --- a/gui/MainWindow.py +++ b/gui/MainWindow.py @@ -15,7 +15,7 @@ class MainWindow: self.passw = tk.StringVar() self.passw.set("aaaaa") self.login = tk.StringVar() - self.login.set("aa") + self.login.set("aaaaa") self.tls = tk.BooleanVar() self.tls.set(True) self.port = tk.IntVar() -- 2.45.2