spacefreak/uvscand
1
0
Fork 0
Code Issues Pull Requests Releases Activity

switch to f-strings

Browse Source
This commit is contained in:
Thomas Oettli
2024-06-16 00:38:14 +02:00
parent a5d5448001
commit 792ba7c1aa
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
uvscand/__init__.py
View File

@@ -41,7 +41,7 @@ async def uvscan_worker(queue):
if proc.returncode == 13: if proc.returncode == 13:
match = uvscan_regex.search(stdout.decode()) match = uvscan_regex.search(stdout.decode())
name = match.group(1) if match else "UNKNOWN" name = match.group(1) if match else "UNKNOWN"
result = "stream: {} FOUND".format(name) result = f"stream: {name} FOUND"
else: else:
result = "stream: OK" result = "stream: OK"
cb(result) cb(result)
@@ -63,13 +63,13 @@ class AIO(asyncio.Protocol):
def _send_response(self, response): def _send_response(self, response):
response = response.encode() + AIO.separator response = response.encode() + AIO.separator
self.logger.debug("{} sending response: {}".format(self.peer, response)) self.logger.debug(f"{self.peer} sending response: {response}")
self.transport.write(response) self.transport.write(response)
self.transport.close() self.transport.close()
def connection_made(self, transport): def connection_made(self, transport):
self.peer = transport.get_extra_info("peername") self.peer = transport.get_extra_info("peername")
self.logger.info("new connection from {}".format(self.peer)) self.logger.info(f"new connection from {self.peer}")
self.transport = transport self.transport = transport
self.request_time = str(time.time()) self.request_time = str(time.time())
self.buffer = bytearray() self.buffer = bytearray()
@@ -80,10 +80,11 @@ class AIO(asyncio.Protocol):
def data_received(self, data): def data_received(self, data):
try: try:
nbytes = len(data)
if self.all_chunks: if self.all_chunks:
self.logger.warning("{} received {} bytes of garbage after last chunk".format(self.peer, len(data))) self.logger.warning(f"{self.peer} received {nbytes} bytes of garbage after last chunk")
return return
self.logger.debug("{} received {} bytes".format(self.peer, len(data))) self.logger.debug(f"{self.peer} received {nbytes} bytes")
self.buffer.extend(data) self.buffer.extend(data)
if not self.command: if not self.command:
@@ -97,7 +98,7 @@ class AIO(asyncio.Protocol):
if command != "zINSTREAM": if command != "zINSTREAM":
raise RuntimeError("unknown command") raise RuntimeError("unknown command")
self.command = command self.command = command
self.logger.debug("{} command is {}".format(self.peer, command)) self.logger.debug(f"{self.peer} command is {command}")
pos += 1 pos += 1
self.buffer = self.buffer[pos:] self.buffer = self.buffer[pos:]
if self.command: if self.command:
@@ -109,34 +110,37 @@ class AIO(asyncio.Protocol):
self.buffer = self.buffer[4:] self.buffer = self.buffer[4:]
if self.length == 0: if self.length == 0:
self.all_chunks = True self.all_chunks = True
tmpfile = os.path.join(AIO.config["tmpdir"], "uvscan_{}_{}".format(self.request_time, str(self.peer[1]))) suffix = str(self.peer[1])
self.logger.debug("{} got last chunk, save data to {}".format(self.peer, tmpfile)) tmpfile = os.path.join(AIO.config["tmpdir"], f"uvscan_{self.request_time}_{suffix}")
self.logger.debug(f"{self.peer} got last chunk, save data to {tmpfile}")
with open(tmpfile, "wb") as f: with open(tmpfile, "wb") as f:
self.tmpfile = tmpfile self.tmpfile = tmpfile
f.write(self.data) f.write(self.data)
AIO.queue.put_nowait((AIO.config["uvscan_path"], tmpfile, self.process_uvscan_result)) AIO.queue.put_nowait((AIO.config["uvscan_path"], tmpfile, self.process_uvscan_result))
self.logger.info("{} queued uvscan of {}, queue size is {}".format(self.peer, tmpfile, AIO.queue.qsize())) queuesize = AIO.queue.qsize()
self.logger.info(f"{self.peer} queued uvscan of {tmpfile}, queue size is {queuesize}")
break break
self.logger.debug("{} got chunk size of {} bytes".format(self.peer, self.length)) self.logger.debug(f"{self.peer} got chunk size of {self.length} bytes")
else: else:
if len(self.buffer) < self.length: if len(self.buffer) < self.length:
self.logger.debug("{} got {} of {} bytes".format(self.peer, len(self.buffer), self.length)) nbytes = len(self.buffer)
self.logger.debug(f"{self.peer} got {nbytes} of {self.length} bytes")
break break
self.logger.debug("{} chunk complete ({} bytes)".format(self.peer, self.length)) self.logger.debug(f"{self.peer} chunk complete ({self.length} bytes)")
self.data.extend(self.buffer[0:self.length]) self.data.extend(self.buffer[0:self.length])
self.buffer = self.buffer[self.length:] self.buffer = self.buffer[self.length:]
self.length = None self.length = None
except (RuntimeError, IndexError, IOError, struct.error) as e: except (RuntimeError, IndexError, IOError, struct.error) as e:
self.logger.warning("{} warning: {}".format(self.peer, e)) self.logger.warning(f"{self.peer} warning: {e}")
self._send_response(str(e)) self._send_response(str(e))
def process_uvscan_result(self, result): def process_uvscan_result(self, result):
self.logger.debug("{} removing temporary file {}".format(self.peer, self.tmpfile)) self.logger.debug(f"{self.peer} removing temporary file {self.tmpfile}")
os.remove(self.tmpfile) os.remove(self.tmpfile)
self.tmpfile = None self.tmpfile = None
if not self.cancelled: if not self.cancelled:
self.logger.info("{} received uvscan result of {}: {}".format(self.peer, self.tmpfile, result)) self.logger.info(f"{self.peer} received uvscan result of {self.tmpfile}: {result}")
self._send_response(result) self._send_response(result)
def connection_lost(self, exc): def connection_lost(self, exc):
@@ -155,15 +159,15 @@ class AIO(asyncio.Protocol):
for entry in entries: for entry in entries:
AIO.queue.put_nowait(entry) AIO.queue.put_nowait(entry)
if self.cancelled: if self.cancelled:
self.logger.warning("{} client prematurely closed connection, skipped scan of {}".format(self.peer, self.tmpfile)) self.logger.warning(f"{self.peer} client prematurely closed connection, skipped scan of {self.tmpfile}")
self.logger.debug("{} removing temporary file {}".format(self.peer, self.tmpfile)) self.logger.debug(f"{self.peer} removing temporary file {self.tmpfile}")
os.remove(self.tmpfile) os.remove(self.tmpfile)
else: else:
self.logger.warning("{} client prematurely closed connection".format(self.peer)) self.logger.warning(f"{self.peer} client prematurely closed connection")
self.cancelled = True self.cancelled = True
else: else:
self.logger.info("closed connection to {}".format(self.peer)) self.logger.info(f"closed connection to {self.peer}")
def main(): def main():
@@ -183,8 +187,8 @@ def main():
syslog_name = logname syslog_name = logname
if args.debug: if args.debug:
loglevel = logging.DEBUG loglevel = logging.DEBUG
logname = "{}[%(name)s]".format(logname) logname = f"{logname}[%(name)s]"
syslog_name = "{}: [%(name)s] %(levelname)s".format(syslog_name) syslog_name = f"{syslog_name}: [%(name)s] %(levelname)s"
root_logger = logging.getLogger() root_logger = logging.getLogger()
root_logger.setLevel(loglevel) root_logger.setLevel(loglevel)
@@ -192,14 +196,14 @@ def main():
# setup console log # setup console log
stdouthandler = logging.StreamHandler(sys.stdout) stdouthandler = logging.StreamHandler(sys.stdout)
stdouthandler.setLevel(loglevel) stdouthandler.setLevel(loglevel)
formatter = logging.Formatter("%(asctime)s {}: [%(levelname)s] %(message)s".format(logname), datefmt="%Y-%m-%d %H:%M:%S") formatter = logging.Formatter(f"%(asctime)s {logname}: [%(levelname)s] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
stdouthandler.setFormatter(formatter) stdouthandler.setFormatter(formatter)
root_logger.addHandler(stdouthandler) root_logger.addHandler(stdouthandler)
# setup syslog # setup syslog
sysloghandler = logging.handlers.SysLogHandler(address="/dev/log") sysloghandler = logging.handlers.SysLogHandler(address="/dev/log")
sysloghandler.setLevel(loglevel) sysloghandler.setLevel(loglevel)
formatter = logging.Formatter("{}: %(message)s".format(syslog_name)) formatter = logging.Formatter(f"{syslog_name}: %(message)s")
sysloghandler.setFormatter(formatter) sysloghandler.setFormatter(formatter)
root_logger.addHandler(sysloghandler) root_logger.addHandler(sysloghandler)
@@ -216,7 +220,7 @@ def main():
config = dict(parser.items("uvscand")) config = dict(parser.items("uvscand"))
for option in ["bind_address", "bind_port", "tmpdir", "uvscan_path", "loglevel"]: for option in ["bind_address", "bind_port", "tmpdir", "uvscan_path", "loglevel"]:
if option not in config.keys(): if option not in config.keys():
logger.error("option '{}' not present in config section 'uvscand'".format(option)) logger.error(f"option '{option}' not present in config section 'uvscand'")
sys.exit(1) sys.exit(1)
if not args.debug: if not args.debug:
@@ -226,7 +230,7 @@ def main():
# check if uvscan binary exists and is executable # check if uvscan binary exists and is executable
if not os.path.isfile(config["uvscan_path"]) or not os.access(config["uvscan_path"], os.X_OK): if not os.path.isfile(config["uvscan_path"]) or not os.access(config["uvscan_path"], os.X_OK):
logger.error("uvscan binary '{}' does not exist or is not executable".format(config["uvscan_path"])) logger.error(f"uvscan binary '{config['uvscan_path']}' does not exist or is not executable")
sys.exit(1) sys.exit(1)
# setup protocol # setup protocol