Skip to content

disable undefined ipfilter construction #3

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

Open
d47081 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

disable undefined ipfilter construction #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f9c232
add IPv6 support
Dec 23, 2023
3ffc59b
disable undefined ipfilter construction
Dec 24, 2023
de15629
debug pymaster output to file
Dec 24, 2023
5957bbe
Merge pull request #1 from YGGverse/ipv6-support
d47081 Dec 24, 2023
94498e9
Merge branch 'ygg' into disable-ipfilter
d47081 Dec 24, 2023
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
3 changes: 2 additions & 1 deletion etc/systemd/system/pymaster.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ User=master
Group=master
WorkingDirectory=/home/master/pymaster/
ExecStart=/home/master/pymaster/pymaster.py -i $PYMASTER_IP -p $PYMASTER_PORT
StandardOutput=file:/home/master/pymaster-debug.log
StandardError=file:/home/master/pymaster-error.log
Restart=on-failure

[Install]
WantedBy=multi-user.target

16 changes: 10 additions & 6 deletions pymaster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from server_entry import ServerEntry
from protocol import MasterProtocol
import ipfilter
# import ipfilter

LOG_FILENAME = 'pymaster.log'
MAX_SERVERS_FOR_IP = 14
Expand Down Expand Up @@ -66,8 +66,12 @@ def __init__(self, ip, port):
self.serverList = []
self.serverRL = IPRateLimit('server', 60, 30)
self.clientRL = IPRateLimit('client', 60, 120)
# self.ipfilterRL = IPRateLimit('filterlog', 60, 10)
self.ipfilterRL = IPRateLimit('filterlog', 60, 10)
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
if ':' in ip:
self.sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
else:
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self.sock.bind((ip, port))

log("Welcome to PyMaster!")
Expand All @@ -77,10 +81,10 @@ def __init__(self, ip, port):
def serverLoop(self):
data, addr = self.sock.recvfrom(1024)

if ip_address(addr[0]) in ipfilter.ipfilter:
if not self.ipfilterRL.ratelimit(addr[0]):
log('Filter: %s:%d' % (addr[0], addr[1]))
return
# if ip_address(addr[0]) in ipfilter.ipfilter:
# if not self.ipfilterRL.ratelimit(addr[0]):
# log('Filter: %s:%d' % (addr[0], addr[1]))
# return

if len(data) == 0:
return
Expand Down