HorlogeSkynet/ACMS
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix/authentication_prompt' into dev

Browse Source
This commit is contained in:
HorlogeSkynet
2017-03-05 20:45:24 +01:00
parent 7647c153d7 e1e0e11564
commit 55a4c35ac9
2 changed files with 7 additions and 7 deletions
Client
client.py
Server
server.py

4
Client/client.py

@ -19,7 +19,7 @@ from tkinter.messagebox import showwarning, showinfo
__author__ = "HorlogeSkynet"
__copyright__ = "Copyright 2017, ACMS"
__license__ = "GPLv3"
__version__ = "0.1.6"
__version__ = "0.1.8"
__status__ = "Development"
__date__ = "02/22/2017"
@ -234,7 +234,7 @@ if __name__ == '__main__':
print('\n')
command = ' '
if not command:
if not command or not command.rstrip():
continue
else:

10
Server/server.py

@ -22,7 +22,7 @@ from fileCommands import listFiles, changeDirectory, makeDirectory, moveFile, re
__authors__ = "HorlogeSkynet, Tatyik"
__copyright__ = "Copyright 2017, ACMS"
__license__ = "GPLv3"
__version__ = "0.1.10"
__version__ = "0.1.12"
__status__ = "Development"
__date__ = "02/22/2017"
@ -62,8 +62,8 @@ class ClientThread(threading.Thread):
sendData(self.sock, 'LOGIN_ERROR')
continue
login = login.split(':')
if len(login) < 2:
login = login.split(':', 1)
if len(login) != 2:
sendData(self.sock, 'LOGIN_ERROR')
continue
@ -80,8 +80,8 @@ class ClientThread(threading.Thread):
sendData(self.sock, 'LOGIN_ERROR')
continue
password = password.split(':')
if len(password) < 2:
password = password.split(':', 1)
if len(password) != 2:
sendData(self.sock, 'PASSWORD_ERROR')
continue