swee/IRCat
swee/IRCat
1
0
Fork 0
Code Issues Pull requests Activity Actions

Migrate to PyOpenSSL (?)

Browse source
This commit is contained in:
Nova Cat 2025-02-04 19:10:35 -08:00
parent ca3894ad3e
commit 1d6716e8a2
1 changed files with 18 additions and 11 deletions

29
server.py
View file

@ -186,7 +186,11 @@ for i in restrict_ip.split(" "):
sockets[i].listen(1) sockets[i].listen(1)
if ssl_option: if ssl_option:
for i in restrict_ip.split(" "): for i in restrict_ip.split(" "):
sockets_ssl[i] = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ctx = SSL.Context(SSL.SSLv23_METHOD)
ctx.set_options(SSL.OP_NO_SSLv2)
ctx.use_privatekey_file (ssl_pkey)
ctx.use_certificate_file(ssl_cert)
sockets_ssl[i] = SSL.Connection(ctx, socket.socket(socket.AF_INET, socket.SOCK_STREAM))
sockets_ssl[i].setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sockets_ssl[i].setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sockets_ssl[i].settimeout(None) sockets_ssl[i].settimeout(None)
sockets_ssl[i].bind((i,6697)) sockets_ssl[i].bind((i,6697))
@ -203,6 +207,8 @@ def pinger(nick, connection):
time.sleep(0.5) time.sleep(0.5)
try: try:
connection.sendall(bytes(f"PING {server}\r\n","UTF-8")) connection.sendall(bytes(f"PING {server}\r\n","UTF-8"))
except (SSL.WantReadError, SSL.WantWriteError, SSL.WantX509LookupError):
pass
except Exception as ex: except Exception as ex:
print(traceback.format_exc()) print(traceback.format_exc())
property_list[nick]["cause"] = "Send error: " + str(ex) property_list[nick]["cause"] = "Send error: " + str(ex)
@ -288,10 +294,10 @@ def session(connection, client, ip, isssl=False):
if not data: if not data:
cause = "Remote host closed the connection" cause = "Remote host closed the connection"
break break
except ssl.SSLEOFError: except (SSL.WantReadError, SSL.WantWriteError, SSL.WantX509LookupError):
print("EOF occurred.") print("Skipable error occurred.")
pass pass
except ssl.SSLZeroReturnError: except SSL.ZeroReturnError:
print(traceback.format_exc()) print(traceback.format_exc())
cause = "Remote host closed the connection" cause = "Remote host closed the connection"
break break
@ -768,6 +774,13 @@ def session(connection, client, ip, isssl=False):
textt = "" textt = ""
connection.sendall(bytes(pendingSend, "UTF-8")) connection.sendall(bytes(pendingSend, "UTF-8"))
pendingSend = "" pendingSend = ""
except (SSL.WantReadError, SSL.WantWriteError, SSL.WantX509LookupError):
print("Skipable error occurred.")
pass
except SSL.ZeroReturnError:
print(traceback.format_exc())
cause = "Remote host closed the connection"
break
except Exception as ex: except Exception as ex:
print(traceback.format_exc()) print(traceback.format_exc())
cause = "" + str(ex) cause = "" + str(ex)
@ -832,14 +845,8 @@ def ssl_session(sock):
while True: while True:
try: try:
while opened: while opened:
context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) conn, client = sock.accept()
context.minimum_version = ssl.TLSVersion.TLSv1_2
context.set_ciphers('DEFAULT:@SECLEVEL=0')
context.load_cert_chain(ssl_cert, keyfile=ssl_pkey)
print("Waiting for connection...")
connection, client = sock.accept()
ip_to = restrict_ip ip_to = restrict_ip
conn = context.wrap_socket(connection, server_side=True)
threading.Thread(target=session, daemon=True, args=[conn, client, ip_to, True]).start() threading.Thread(target=session, daemon=True, args=[conn, client, ip_to, True]).start()
except: except:
print("Something went wrong...") print("Something went wrong...")