Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Commit for issue#39 #83

Closed
wants to merge 1 commit into from
Closed

Commit for issue#39 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 41 additions & 75 deletions cnew.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

sess = PromptSession()
sepr = chr(969696)
websocket = None
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid such cross-type object initialization as far as possible.

helper_display = HelperDisplay()


Expand All @@ -29,7 +30,7 @@ def decrjson(self, data):
return self.suit.decrypt(data.encode("utf8")).decode("utf8")


async def consumer_handler(cphrsuit, websocket, username, chatroom, servaddr):
async def consumer_handler(cphrsuit, username, chatroom, servaddr):
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The websocket object must be passed here as a parameter.

async for recvdata in websocket:
try:
if recvdata.split(sepr)[0] == "SNCTRYZERO" and recvdata.split(sepr)[1] == "USERJOINED" and recvdata.split(sepr)[3] == chatroom:
Expand All @@ -46,7 +47,7 @@ async def consumer_handler(cphrsuit, websocket, username, chatroom, servaddr):
pass


async def producer_handler(cphrsuit, websocket, username, chatroom, servaddr):
async def producer_handler(cphrsuit, username, chatroom, servaddr):
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The websocket object must be passed here as a parameter.

try:
footelem = HTML("<b>[" + chatroom + "]</b>" + " <b>" + username.strip() + "</b> > End-to-end encryption enabled on '" + servaddr + "' - Hit Ctrl+C to EXIT")
while True:
Expand All @@ -61,33 +62,14 @@ async def producer_handler(cphrsuit, websocket, username, chatroom, servaddr):
except EOFError:
raise KeyboardInterrupt


async def chk_username_presence(web_socket, user_name, chat_room):
await web_socket.send("CHKUSR"+sepr+user_name+sepr+chat_room)
async for recvdata in web_socket:
return recvdata


async def hello(servaddr, username, chatroom, password):
async with websockets.connect(servaddr) as websocket:
try:
chkUserPresence = await chk_username_presence(websocket,username, chatroom)
if chkUserPresence == "False":
cphrsuit = fernetst(password.encode("utf8"))
prod = asyncio.get_event_loop().create_task(producer_handler(cphrsuit, websocket, str(username), str(chatroom), str(servaddr)))
cons = asyncio.get_event_loop().create_task(consumer_handler(cphrsuit, websocket, str(username), str(chatroom), str(servaddr)))
await websocket.send(username+sepr+chatroom)
await prod
await cons
asyncio.get_event_loop().run_forever()
else:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>Username already exist in chatroom</red>"))
await websocket.close()
sys.exit()
except Exception as EXPT:
if websocket.closed:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>A connection to the server was lost</red>".format(EXPT)))
raise KeyboardInterrupt
cphrsuit = fernetst(password.encode("utf8"))
prod = asyncio.get_event_loop().create_task(producer_handler(cphrsuit, websocket, str(username), str(chatroom), str(servaddr)))
cons = asyncio.get_event_loop().create_task(consumer_handler(cphrsuit, websocket, str(username), str(chatroom), str(servaddr)))
await websocket.send(username+sepr+chatroom)
await prod
await cons
asyncio.get_event_loop().run_forever()


def obtntime():
Expand All @@ -100,37 +82,30 @@ def obtntime():
if int(timesecs) < 10: timesecs = "0" + timesecs
return timehour + ":" + timemint + ":" + timesecs


def randgene():
numb = 8
randstrg = "".join(secrets.choice("ABCDEF" + "0123456789") for i in range(numb))
return randstrg


def chekroom(strg):
if len(strg) != 8:
return False
else:
try:
geee = int(strg, 16)
return strg.isupper()
except ValueError:
return False


def chekpass(pswd):
async def chekroom(username,chatroom,password,servaddr):
if len(chatroom)!=8:
return "False"
try:
suit = Fernet(pswd)
return True
except:
return False

geee = int(chatroom,16)
except ValueError:
return "False"
global websocket
websocket = await websockets.connect(servaddr)
await websocket.send('CHKUSR'+sepr+username+sepr+chatroom+sepr+password)
response = await websocket.recv()
return response

def formusnm(username):
if len(username) < 10: return username + " " * (10 - len(username))
elif len(username) > 10: return username[0:10]
else: return username

async def askserver(username,servaddr):
global websocket
websocket = await websockets.connect(servaddr)
await websocket.send('NEW'+sepr+username)
response = await websocket.recv()
return response

@click.command()
@click.option("-u", "--username", "username", help="Enter the username that you would identify yourself with", required=True)
Expand All @@ -146,35 +121,26 @@ def mainfunc(username, password, chatroom, servaddr):
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen>Attempted connection to '" + servaddr + "' at " + str(time.ctime()) + "</seagreen>"))
if username.strip() != "":
if chatroom is None:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>A new chatroom was generated</green>"))
chatroom = randgene()
# if i don't have chatroom, no password will be supplied
output = asyncio.get_event_loop().run_until_complete(askserver(username, servaddr))
chatroom = output.split(sepr)[0]
password = output.split(sepr)[1]
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen>Chatroom identity : " + chatroom + "</seagreen>"))
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen>Chatroom password : " + password + "</seagreen>"))
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen>Share the chatroom identity and password to add members!</seagreen>"))
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen>Your conversations are protected with end-to-end encryption</seagreen>"))
else:
if chekroom(chatroom) is True:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>A valid chatroom identity was entered</green>"))
elif not chatroom.isupper():
if not chatroom.isupper():
chatroom = chatroom.upper()
if chekroom(chatroom):
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>A valid chatroom identity was entered</green>"))
else:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>An invalid chatroom identity was entered</red>"))
sys.exit()
else:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>An invalid chatroom identity was entered</red>"))
sys.exit()
if password is None:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>A new password was generated</green>"))
password = Fernet.generate_key().decode("utf8")
else:
if chekpass(password) is True:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>A valid chatroom password was entered</green>"))
else:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>An invalid chatroom password was entered</red>"))
isValid = asyncio.get_event_loop().run_until_complete(chekroom(username,chatroom,password,servaddr))
if isValid == "True":
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>A valid credential was entered</green>"))
elif isValid == "False":
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <green>An invalid credential was entered</green>"))
sys.exit()
else:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>An invalid username was entered</red>"))
sys.exit()
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen><b>Identity</b> " + chatroom + " > <b>Password</b> " + password + "</seagreen>"))
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <seagreen>Share the chatroom identity, password and server address to invite members</seagreen>"))
asyncio.get_event_loop().run_until_complete(hello(servaddr, username, chatroom, password))
except KeyboardInterrupt as EXPT:
print_formatted_text(HTML("[" + obtntime() + "] " + "SNCTRYZERO > <red>Leaving SNCTRYZERO...</red>"))
Expand Down
67 changes: 50 additions & 17 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,25 @@
from prompt_toolkit import print_formatted_text, HTML
from websockets.exceptions import ConnectionClosedError
from utils.helper_display import HelperDisplay
from cryptography.fernet import Fernet, InvalidToken


USERS = {}
CHATROOM = {}
sepr = chr(969696)
current_rooms=[]
helper_display = HelperDisplay()

class fernetst():
def __init__(self, pswd):
self.suit = Fernet(pswd)

def encrjson(self, data):
return self.suit.encrypt(data.encode("utf8")).decode("utf8")

def decrjson(self, data):
return self.suit.decrypt(data.encode("utf8")).decode("utf8")


def obtntime():
timestmp = time.localtime()
Expand Down Expand Up @@ -46,35 +59,55 @@ async def send_chatroommembers_list(websoc):
await websoc.send(users_list)

async def chatroom(websocket, path):
isInvalid = False
if not websocket in USERS:
USERS[websocket] = ""
try:
async for mesgjson in websocket:
if sepr in mesgjson and websocket in USERS:
if (mesgjson.split(sepr)[0] == "CHKUSR") & (len(mesgjson.split(sepr)) == 3) :
result = str(chk_username_presence(mesgjson))
await websocket.send(result)
if(result == "True"):
await websocket.close()
USERS.pop(websocket)
elif USERS[websocket] == "":
USERS[websocket] = [mesgjson.split(sepr)[0], mesgjson.split(sepr)[1]]
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>USERJOINED</b> > <green>" + mesgjson.split(sepr)[0] + "@" + mesgjson.split(sepr)[1] + "</green>"))
await notify_mesej("SNCTRYZERO" + sepr + "USERJOINED" + sepr + mesgjson.split(sepr)[0] + sepr + mesgjson.split(sepr)[1] + sepr + str(getallus(mesgjson.split(sepr)[1])))
if USERS[websocket] == "":
if mesgjson.split(sepr)[0] == 'NEW':
new_room = randgene()
current_rooms.append(new_room)
USERS[websocket] = [mesgjson.split(sepr)[1], new_room]
password = Fernet.generate_key().decode("utf-8")
CHATROOM[new_room] = password
await websocket.send(new_room+sepr+password)
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>USERJOINED</b> > <green>" + mesgjson.split(sepr)[1] + "@" + new_room + "</green>"))
await notify_mesej("SNCTRYZERO" + sepr + "USERJOINED" + sepr + mesgjson.split(sepr)[1] + sepr + new_room + sepr + str(getallus(new_room)))
elif mesgjson.split(sepr)[0] == 'CHKUSR':
# [query username chatroom password]
if mesgjson.split(sepr)[2] in current_rooms and mesgjson.split(sepr)[3] == CHATROOM[mesgjson.split(sepr)[2]] and str(chk_username_presence(mesgjson)) == "False":
await websocket.send("True")
USERS[websocket] = [mesgjson.split(sepr)[1],mesgjson.split(sepr)[2]]
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>USERJOINED</b> > <green>" + mesgjson.split(sepr)[1] + "@" + mesgjson.split(sepr)[2] + "</green>"))
await notify_mesej("SNCTRYZERO" + sepr + "USERJOINED" + sepr + mesgjson.split(sepr)[1] + sepr + mesgjson.split(sepr)[2] + sepr + str(getallus(mesgjson.split(sepr)[2])))
else:
await websocket.send("False")
isInvalid = True
elif str(mesgjson) == '/list':
await send_chatroommembers_list(websocket)
else:
if str(mesgjson) == "/list":
await send_chatroommembers_list(websocket)
else:
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>SNCTRYZERO</b> > " + helper_display.wrap_text(str(mesgjson))))
await notify_mesej(mesgjson)
except ConnectionClosedError as EXPT:
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>USEREXITED</b> > <red>" + USERS[websocket][0] + "@" + USERS[websocket][1] + "</red>"))
userlist = getallus(USERS[websocket][1])
userlist.remove(USERS[websocket][0])
leftmesg = "SNCTRYZERO" + sepr + "USEREXITED" + sepr + USERS[websocket][0] + sepr + USERS[websocket][1] + sepr + str(userlist)
USERS.pop(websocket)
await notify_mesej(leftmesg)

if isInvalid == False:
print_formatted_text(HTML("[" + obtntime() + "] " + "<b>USEREXITED</b> > <red>" + USERS[websocket][0] + "@" + USERS[websocket][1] + "</red>"))
userlist = getallus(USERS[websocket][1])
userlist.remove(USERS[websocket][0])
leftmesg = "SNCTRYZERO" + sepr + "USEREXITED" + sepr + USERS[websocket][0] + sepr + USERS[websocket][1] + sepr + str(userlist)
USERS.pop(websocket)
await notify_mesej(leftmesg)
else:
isInvalid = False

def randgene():
numb = 8
randstrg = ''.join(secrets.choice("ABCDEF" + "0123456789") for i in range(numb))
return randstrg

def servenow(netpdata="127.0.0.1", chatport="9696"):
try:
Expand Down