Firepup650/python-talk
2
1
Fork 2
Code Issues Pull requests 1 Activity Actions

Compare commits

base: Firepup650:a245acc7701b98f5c9050d0a56d21d514e6267d2
Branches Tags
Firepup650:master
...
compare: Firepup650:6d1ff52b02fa10ec0c0e1f906022d8a2943d9482
Branches Tags
Firepup650:master

2 commits
a245acc770 ... 6d1ff52b02

Author SHA1 Message Date
Firepup Sixfifty
6d1ff52b02
Use literal NULs instead of pipes to differenciate between the message and client name 2024-07-31 21:11:49 +00:00
Firepup Sixfifty
8bc876d7af
Refuse blank server names, allow IPv6 & IPv4 connections at the same time 2024-07-31 21:08:25 +00:00
1 changed files with 24 additions and 17 deletions
Show stats Expand all files Collapse all files

41
server.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/python3
import os, sys, asyncio, re, signal
import os, sys, asyncio, re, signal, socket
from platform import uname
from traceback import format_exc
from logs import log
@ -36,8 +36,9 @@ G.killList = {}
G.outboundLinks = []
G.S2SLogs = []
G.cwlgd = False
G.NUL = "\x00"
saveLogs = True
address = "0.0.0.0"
address = "::"
# Try to load a message log, if one exists
try:
G.msgs = __import__("cache").msgs
@ -239,7 +240,7 @@ Please note that this is not network level statistics.\r\n""".encode(
writer.close()
await writer.wait_closed()
return # Server is already "linked", drop the connection
if G.remoteID == sName: # Hey! you can't *also* be ***me***!
if G.remoteID == sName or not sName: # Hey! you can't *also* be ***me***!
writer.close()
await writer.wait_closed()
return # drop "us"
@ -319,16 +320,16 @@ Please note that this is not network level statistics.\r\n""".encode(
)
)
case "M":
cName = buffer[2:].split("|", 1)[0]
message = buffer[2:].split("|", 1)[1]
cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split(G.NUL, 1)[1]
G.msgs.append(log(f" {cName}: {message}"))
G.S2SLogs.append(("M", (cName, message), sName))
writer.write(
b"I Get these damn heretic ghost clients out of my store so i can buy my cult candles in peace.\r\n"
)
case "A":
cName = buffer[2:].split("|", 1)[0]
message = buffer[2:].split("|", 1)[1]
cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split(G.NUL, 1)[1]
G.msgs.append(log(f"* {cName} {message}"))
G.S2SLogs.append(("A", (cName, message), sName))
writer.write(b"I Mmm... Strawberries\r\n")
@ -371,10 +372,10 @@ Please note that this is not network level statistics.\r\n""".encode(
match type:
case "A":
nick, msg = data
writer.write(f"A {nick}|{msg}\r\n".encode("utf8"))
writer.write(f"A {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "M":
nick, msg = data
writer.write(f"M {nick}|{msg}\r\n".encode("utf8"))
writer.write(f"M {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "+":
writer.write(f"+ {data}\r\n".encode("utf8"))
case "-":
@ -444,7 +445,7 @@ async def connectServer(hostname: str, port: int):
writer.close()
await writer.wait_closed()
return
if G.remoteID == rID:
if G.remoteID == rID or not rID:
writer.close()
await writer.wait_closed()
return
@ -505,16 +506,16 @@ async def connectServer(hostname: str, port: int):
)
)
case "M":
cName = buffer[2:].split("|", 1)[0]
message = buffer[2:].split("|", 1)[1]
cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split(G.NUL, 1)[1]
G.msgs.append(log(f" {cName}: {message}"))
G.S2SLogs.append(("M", (cName, message), rID))
writer.write(
b"I Get these damn heretic ghost clients out of my store so i can buy my cult candles in peace.\r\n"
)
case "A":
cName = buffer[2:].split("|", 1)[0]
message = buffer[2:].split("|", 1)[1]
cName = buffer[2:].split(G.NUL, 1)[0]
message = buffer[2:].split(G.NUL, 1)[1]
G.S2SLogs.append(("A", (cName, message), rID))
G.msgs.append(log(f"* {cName} {message}"))
writer.write(b"I Mmm... Strawberries\r\n")
@ -556,10 +557,10 @@ async def connectServer(hostname: str, port: int):
match type:
case "A":
nick, msg = data
writer.write(f"A {nick}|{msg}\r\n".encode("utf8"))
writer.write(f"A {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "M":
nick, msg = data
writer.write(f"M {nick}|{msg}\r\n".encode("utf8"))
writer.write(f"M {nick}{G.NUL}{msg}\r\n".encode("utf8"))
case "+":
writer.write(f"+ {data}\r\n".encode("utf8"))
case "-":
@ -602,7 +603,13 @@ async def connectServer(hostname: str, port: int):
async def runServer(address: str, port: int):
global G
server = await asyncio.start_server(handleClient, address, port)
if ":" in address:
INET = socket.AF_INET6
else:
INET = socket.AF_INET
sock = socket.socket(INET, socket.SOCK_STREAM)
sock.bind((address, port))
server = await asyncio.start_server(handleClient, sock=sock)
log(f"Listening on port {port}...")
G.msgs.append(log("Server startup"))
links = []