Only banning web socket creation, static pages ok.

This commit is contained in:
Marat Fayzullin 2023-11-20 19:21:44 -05:00
parent 673aa186f1
commit e40a80e68c
2 changed files with 6 additions and 10 deletions

View File

@ -167,7 +167,7 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
self.close() self.close()
raise raise
except BannedClientException: except BannedClientException:
self.write_backoff_message("Client IP banned") self.write_backoff_message("Client address banned")
self.close() self.close()
raise raise

View File

@ -24,7 +24,6 @@ from owrx.controllers.session import SessionController
from owrx.controllers.profile import ProfileController from owrx.controllers.profile import ProfileController
from owrx.controllers.imageupload import ImageUploadController from owrx.controllers.imageupload import ImageUploadController
from owrx.controllers.robots import RobotsController from owrx.controllers.robots import RobotsController
from owrx.client import ClientRegistry
from owrx.storage import Storage from owrx.storage import Storage
from http.server import BaseHTTPRequestHandler from http.server import BaseHTTPRequestHandler
from urllib.parse import urlparse, parse_qs from urllib.parse import urlparse, parse_qs
@ -179,15 +178,12 @@ class Router(object):
return r return r
def route(self, handler, request): def route(self, handler, request):
if ClientRegistry.getSharedInstance().isIpBanned(handler.client_address[0]): route = self.find_route(request)
handler.send_error(404, "Not Found", "The page you requested could not be found.") if route is not None:
controller = route.controller
controller(handler, request, route.controllerOptions).handle_request()
else: else:
route = self.find_route(request) handler.send_error(404, "Not Found", "The page you requested could not be found.")
if route is None:
handler.send_error(404, "Not Found", "The page you requested could not be found.")
else:
controller = route.controller
controller(handler, request, route.controllerOptions).handle_request()
class RequestHandler(BaseHTTPRequestHandler): class RequestHandler(BaseHTTPRequestHandler):