CreatBot/CreatBotMoonraker
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moonraker: don't allow a unix socket to open while closing

Browse Source 
Hold the closed mutex in the "connect()" method.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-12-12 08:24:04 -05:00
parent 31dd758d52
commit 3f7cc53baa
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonraker/moonraker.py
View File

@ -707,14 +707,16 @@ class KlippyConnection:
event_loop: EventLoop event_loop: EventLoop
) -> None: ) -> None:
self.writer: Optional[asyncio.StreamWriter] = None self.writer: Optional[asyncio.StreamWriter] = None
self.closed: bool = True self.connection_mutex: asyncio.Lock = asyncio.Lock()
self.close_mutex: asyncio.Lock = asyncio.Lock()
self.on_recd = on_recd self.on_recd = on_recd
self.on_close = on_close self.on_close = on_close
self.event_loop = event_loop self.event_loop = event_loop
self.log_no_access = True self.log_no_access = True
async def connect(self, address: str) -> bool: async def connect(self, address: str) -> bool:
if self.is_connected():
await self.close()
async with self.connection_mutex:
if not os.path.exists(address): if not os.path.exists(address):
return False return False
if not os.access(address, os.R_OK | os.W_OK): if not os.access(address, os.R_OK | os.W_OK):
@ -732,7 +734,6 @@ class KlippyConnection:
except Exception: except Exception:
return False return False
logging.info("Klippy Connection Established") logging.info("Klippy Connection Established")
self.closed = False
self.writer = writer self.writer = writer
self.event_loop.register_callback(self._read_stream, reader) self.event_loop.register_callback(self._read_stream, reader)
return True return True
@ -770,21 +771,23 @@ class KlippyConnection:
await self.close() await self.close()
def is_connected(self) -> bool: def is_connected(self) -> bool:
return not self.closed return self.writer is not None
async def close(self) -> None: async def close(self) -> None:
async with self.close_mutex: if (
if self.writer is not None: self.connection_mutex.locked() or
self.writer is None
):
return
async with self.connection_mutex:
try: try:
self.writer.close() self.writer.close()
await self.writer.wait_closed() await self.writer.wait_closed()
except Exception: except Exception:
logging.exception("Error closing Klippy Unix Socket") logging.exception("Error closing Klippy Unix Socket")
self.writer = None self.writer = None
if not self.closed:
self.closed = True
self.on_close() self.on_close()
self.closing = False
# Basic WebRequest class, easily converted to dict for json encoding # Basic WebRequest class, easily converted to dict for json encoding
class BaseRequest: class BaseRequest: