Merge oublié #1

Merged
EndMove merged 7 commits from dev into main 2022-08-09 12:20:12 +02:00
3 changed files with 18 additions and 5 deletions

View File

@ -3,6 +3,7 @@ from model.Protocol import *
import traceback
import os.path
class AppController:
def __init__(self, parser):
self.parser = parser
@ -31,9 +32,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()

View File

@ -11,10 +11,15 @@ class MainWindow:
self.root.title("SecCon - © Louis SWINNEN 2022")
self.root.config(bd=5)
self.host = tk.StringVar()
self.host.set("ffe.labo.swilabus.com")
self.passw = tk.StringVar()
self.passw.set("aaaaa")
self.login = tk.StringVar()
self.login.set("aaaaa")
self.tls = tk.BooleanVar()
self.tls.set(True)
self.port = tk.IntVar()
self.port.set(8000)
self.draw_window()
def start_main_loop(self):

View File

@ -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