indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2021-12-10 15:33:16 +00:00
parent 260e1335fa 4ddabb896a
commit edfb4e728f
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon.py
View File

@ -14794,16 +14794,16 @@ class PubServer(BaseHTTPRequestHandler):
# This busy state helps to avoid flooding # This busy state helps to avoid flooding
# Resources which are expected to be called from a web page # Resources which are expected to be called from a web page
# should be above this # should be above this
currTimeGET = int(time.time() * 1000)
if self.server.GETbusy: if self.server.GETbusy:
currTimeGET = int(time.time()) if currTimeGET - self.server.lastGET < 500:
if currTimeGET - self.server.lastGET == 0:
if self.server.debug: if self.server.debug:
print('DEBUG: GET Busy') print('DEBUG: GET Busy')
self.send_response(429) self.send_response(429)
self.end_headers() self.end_headers()
return return
self.server.lastGET = currTimeGET
self.server.GETbusy = True self.server.GETbusy = True
self.server.lastGET = currTimeGET
# returns after this point should set GETbusy to False # returns after this point should set GETbusy to False
@ -17395,13 +17395,6 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: POST to ' + self.server.baseDir + print('DEBUG: POST to ' + self.server.baseDir +
' path: ' + self.path + ' busy: ' + ' path: ' + self.path + ' busy: ' +
str(self.server.POSTbusy)) str(self.server.POSTbusy))
if self.server.POSTbusy:
currTimePOST = int(time.time())
if currTimePOST - self.server.lastPOST == 0:
self.send_response(429)
self.end_headers()
return
self.server.lastPOST = currTimePOST
callingDomain = self.server.domainFull callingDomain = self.server.domainFull
if self.headers.get('Host'): if self.headers.get('Host'):
@ -17433,7 +17426,15 @@ class PubServer(BaseHTTPRequestHandler):
self._400() self._400()
return return
currTimePOST = int(time.time() * 1000)
if self.server.POSTbusy:
if currTimePOST - self.server.lastPOST < 500:
self.send_response(429)
self.end_headers()
return
self.server.POSTbusy = True self.server.POSTbusy = True
self.server.lastPOST = currTimePOST
if not self.headers.get('Content-type'): if not self.headers.get('Content-type'):
print('Content-type header missing') print('Content-type header missing')
self._400() self._400()