Add flood protection
This commit is contained in:
parent
4f523ef534
commit
c910f08b1e
1 changed files with 18 additions and 0 deletions
18
ircbot.py
18
ircbot.py
|
@ -2,6 +2,7 @@
|
||||||
import select
|
import select
|
||||||
import socket
|
import socket
|
||||||
import threading
|
import threading
|
||||||
|
import time
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
import channel
|
import channel
|
||||||
|
@ -109,6 +110,9 @@ class ServerThread(threading.Thread):
|
||||||
|
|
||||||
self.server_socket_write_lock = threading.Lock()
|
self.server_socket_write_lock = threading.Lock()
|
||||||
|
|
||||||
|
self.last_send = 0
|
||||||
|
self.last_send_lock = threading.Lock()
|
||||||
|
|
||||||
self.nick = None
|
self.nick = None
|
||||||
self.nick_lock = threading.Lock()
|
self.nick_lock = threading.Lock()
|
||||||
|
|
||||||
|
@ -121,6 +125,20 @@ class ServerThread(threading.Thread):
|
||||||
# Sanitize line just in case
|
# Sanitize line just in case
|
||||||
line = line.replace(b'\r', b'').replace(b'\n', b'')[:510]
|
line = line.replace(b'\r', b'').replace(b'\n', b'')[:510]
|
||||||
|
|
||||||
|
with self.last_send_lock:
|
||||||
|
now = time.monotonic()
|
||||||
|
if now - self.last_send < 1:
|
||||||
|
# Schedule our message sending one second after the last one
|
||||||
|
self.last_send += 1
|
||||||
|
wait = self.last_send - now
|
||||||
|
|
||||||
|
else:
|
||||||
|
self.last_send = now
|
||||||
|
wait = 0
|
||||||
|
|
||||||
|
if wait > 0:
|
||||||
|
time.sleep(wait)
|
||||||
|
|
||||||
with self.server_socket_write_lock:
|
with self.server_socket_write_lock:
|
||||||
self.server_socket.sendall(line + b'\r\n')
|
self.server_socket.sendall(line + b'\r\n')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue