Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Suggested fix for #1231 + whitespace/docstring

Browse source
This commit is contained in:
BlauFeuer 2017-02-23 15:56:27 -05:00 • committed by Griatch
parent 657b3585f8
commit 1b24bacc12
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
evennia/server/portal/portalsessionhandler.py
View file

@ -28,9 +28,11 @@ _CONNECTION_QUEUE = deque()
DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0) DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0)
#------------------------------------------------------------ # -------------------------------------------------------------
# Portal-SessionHandler class # Portal-SessionHandler class
#------------------------------------------------------------ # -------------------------------------------------------------
class PortalSessionHandler(SessionHandler): class PortalSessionHandler(SessionHandler):
""" """
This object holds the sessions connected to the portal at any time. This object holds the sessions connected to the portal at any time.
@ -95,7 +97,7 @@ class PortalSessionHandler(SessionHandler):
if len(_CONNECTION_QUEUE) > 1: if len(_CONNECTION_QUEUE) > 1:
session.data_out(text=[["%s DoS protection is active. You are queued to connect in %g seconds ..." % ( session.data_out(text=[["%s DoS protection is active. You are queued to connect in %g seconds ..." % (
settings.SERVERNAME, settings.SERVERNAME,
len(_CONNECTION_QUEUE)*_MIN_TIME_BETWEEN_CONNECTS)],{}]) len(_CONNECTION_QUEUE)*_MIN_TIME_BETWEEN_CONNECTS)], {}])
now = time.time() now = time.time()
if (now - self.connection_last < _MIN_TIME_BETWEEN_CONNECTS) or not self.portal.amp_protocol: if (now - self.connection_last < _MIN_TIME_BETWEEN_CONNECTS) or not self.portal.amp_protocol:
if not session or not self.connection_task: if not session or not self.connection_task:
@ -176,8 +178,7 @@ class PortalSessionHandler(SessionHandler):
del self[session.sessid] del self[session.sessid]
# Tell the Server to disconnect its version of the Session as well. # Tell the Server to disconnect its version of the Session as well.
self.portal.amp_protocol.send_AdminPortal2Server(session, self.portal.amp_protocol.send_AdminPortal2Server(session, operation=PDISCONN)
operation=PDISCONN)
def disconnect_all(self): def disconnect_all(self):
""" """
@ -194,7 +195,7 @@ class PortalSessionHandler(SessionHandler):
# inform Server; wait until finished sending before we continue # inform Server; wait until finished sending before we continue
# removing all the sessions. # removing all the sessions.
self.portal.amp_protocol.send_AdminPortal2Server(DUMMYSESSION, self.portal.amp_protocol.send_AdminPortal2Server(DUMMYSESSION,
operation=PDISCONNALL).addCallback(_callback, self) operation=PDISCONNALL).addCallback(_callback, self)
def server_connect(self, protocol_path="", config=dict()): def server_connect(self, protocol_path="", config=dict()):
""" """
@ -233,8 +234,8 @@ class PortalSessionHandler(SessionHandler):
Called by server to force a disconnect by sessid. Called by server to force a disconnect by sessid.
Args: Args:
sessid (int): Session id to disconnect. session (portalsession): Session to disconnect.
reason (str, optional): Motivation for disconect. reason (str, optional): Motivation for disconnect.
""" """
if session: if session:
@ -335,7 +336,7 @@ class PortalSessionHandler(SessionHandler):
""" """
for session in self.values(): for session in self.values():
self.data_out(session, text=[[message],{}]) self.data_out(session, text=[[message], {}])
def data_in(self, session, **kwargs): def data_in(self, session, **kwargs):
""" """
@ -352,8 +353,8 @@ class PortalSessionHandler(SessionHandler):
Data is serialized before passed on. Data is serialized before passed on.
""" """
#from evennia.server.profiling.timetrace import timetrace # from evennia.server.profiling.timetrace import timetrace # DEBUG
#text = timetrace(text, "portalsessionhandler.data_in") # text = timetrace(text, "portalsessionhandler.data_in") # DEBUG
try: try:
text = kwargs['text'] text = kwargs['text']
if (_MAX_CHAR_LIMIT > 0) and len(text) > _MAX_CHAR_LIMIT: if (_MAX_CHAR_LIMIT > 0) and len(text) > _MAX_CHAR_LIMIT:
@ -367,14 +368,14 @@ class PortalSessionHandler(SessionHandler):
now = time.time() now = time.time()
if self.command_counter > _MAX_COMMAND_RATE > 0: if self.command_counter > _MAX_COMMAND_RATE > 0:
# data throttle (anti DoS measure) # data throttle (anti DoS measure)
dT = now - self.command_counter_reset delta_time = now - self.command_counter_reset
self.command_counter = 0 self.command_counter = 0
self.command_counter_reset = now self.command_counter_reset = now
self.command_overflow = dT < 1.0 self.command_overflow = delta_time < 1.0
if self.command_overflow: if self.command_overflow:
reactor.callLater(1.0, self.data_in, None) reactor.callLater(1.0, self.data_in, None)
if self.command_overflow: if self.command_overflow:
self.data_out(session, text=[[_ERROR_COMMAND_OVERFLOW],{}]) self.data_out(session, text=[[_ERROR_COMMAND_OVERFLOW], {}])
return return
# scrub data # scrub data
kwargs = self.clean_senddata(session, kwargs) kwargs = self.clean_senddata(session, kwargs)
@ -385,7 +386,7 @@ class PortalSessionHandler(SessionHandler):
self.portal.amp_protocol.send_MsgPortal2Server(session, self.portal.amp_protocol.send_MsgPortal2Server(session,
**kwargs) **kwargs)
else: else:
# called by the callLater callback # called by the callLater callback
if self.command_overflow: if self.command_overflow:
self.command_overflow = False self.command_overflow = False
reactor.callLater(1.0, self.data_in, None) reactor.callLater(1.0, self.data_in, None)
@ -405,8 +406,8 @@ class PortalSessionHandler(SessionHandler):
method exixts, it sends the data to a method send_default. method exixts, it sends the data to a method send_default.
""" """
#from evennia.server.profiling.timetrace import timetrace # from evennia.server.profiling.timetrace import timetrace # DEBUG
#text = timetrace(text, "portalsessionhandler.data_out") # text = timetrace(text, "portalsessionhandler.data_out") # DEBUG
# distribute outgoing data to the correct session methods. # distribute outgoing data to the correct session methods.
if session: if session: