diff options
| author |  jesopo | 2017-10-27 13:15:33 +0100 |
|---|---|---|
| committer | jesopo | 2017-10-27 13:15:33 +0100 |
| commit | 0df7abb03e2a75744a575bc9a7b349fa98d6f485 (patch) | |
| tree | f6a4a5f952f030108371588347a45f0cea684eed /IRCServer.py | |
| parent | Amber Rudd (diff) | |
| signature | ||
Handle empty CAP, additional IRCLog feature, better tls, better channel_save logic, add sed-sender-only setting
Signed-off-by: jesopo <github@lolnerd.net>
Diffstat (limited to 'IRCServer.py')
| -rw-r--r-- | IRCServer.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/IRCServer.py b/IRCServer.py index 2783ae91..0de4d854 100644 --- a/IRCServer.py +++ b/IRCServer.py @@ -38,7 +38,9 @@ class Server(object): self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) self.socket.settimeout(5.0) if self.tls: - context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + context = ssl.SSLContext(ssl.PROTOCOL_TLS) + context.options |= ssl.OP_NO_SSLv2 + context.options |= ssl.OP_NO_SSLv3 self.socket = context.wrap_socket(self.socket) self.cached_fileno = self.socket.fileno() self.bot.events.on("timer").on("rejoin").hook(self.try_rejoin) @@ -178,7 +180,8 @@ class Server(object): if len(encoded) > 450: encoded = encoded[:450] self.write_buffer += b"%s\r\n" % encoded - print(encoded.decode("utf8")) + if self.bot.args.verbose: + print(encoded.decode("utf8")) def _send(self): self.write_buffer = self.write_buffer[self.socket.send( self.write_buffer):] |