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

Try to fix left over tmp files

Browse Source 
Signed-off-by: Thomas Oettli <spacefreak@noop.ch>
This commit is contained in:
Thomas Oettli
2020-01-29 23:39:46 +01:00
parent 769ddc8fa7
commit 182faaf3c6
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -5,7 +5,7 @@ def read_file(fname):
return f.read() return f.read()
setup(name = "uvscand", setup(name = "uvscand",
version = "0.0.1", version = "0.0.2",
author = "Thomas Oettli", author = "Thomas Oettli",
author_email = "spacefreak@noop.ch", author_email = "spacefreak@noop.ch",
description = "A python daemon to perform virus scans with uvscan (McAfee) over TCP socket.", description = "A python daemon to perform virus scans with uvscan (McAfee) over TCP socket.",

16
uvscand/__init__.py
View File

@@ -34,7 +34,6 @@ uvscan_regex = re.compile(r"Found:?(?: the| potentially unwanted program| (?:vir
async def run(uvscan, filename): async def run(uvscan, filename):
proc = await asyncio.create_subprocess_exec(uvscan, "--secure", "--mime", "--noboot", "--panalyse", "--manalyse", filename, stdout=asyncio.subprocess.PIPE) proc = await asyncio.create_subprocess_exec(uvscan, "--secure", "--mime", "--noboot", "--panalyse", "--manalyse", filename, stdout=asyncio.subprocess.PIPE)
stdout, _ = await proc.communicate() stdout, _ = await proc.communicate()
os.remove(filename)
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"
@@ -53,6 +52,7 @@ class AIO(asyncio.Protocol):
raise RuntimeError("configuration not set") raise RuntimeError("configuration not set")
self.logger = logging.getLogger(__name__) self.logger = logging.getLogger(__name__)
self.data = bytearray() self.data = bytearray()
self.tmpfile = None
def connection_made(self, transport): def connection_made(self, transport):
self.peer = transport.get_extra_info("peername") self.peer = transport.get_extra_info("peername")
@@ -79,17 +79,17 @@ class AIO(asyncio.Protocol):
pos += 1 pos += 1
if command == "zINSTREAM": if command == "zINSTREAM":
# save data chunks to temporary file # save data chunks to temporary file
tmpfile = os.path.join(AIO.config["tmpdir"], "uvscan_{}_{}".format(self.request_time, str(self.peer[1]))) self.tmpfile = os.path.join(AIO.config["tmpdir"], "uvscan_{}_{}".format(self.request_time, str(self.peer[1])))
self.logger.debug("save data from {} in temporary file {}".format(self.peer, tmpfile)) self.logger.debug("save data from {} in temporary file {}".format(self.peer, self.tmpfile))
with open(tmpfile, "wb") as f: with open(self.tmpfile, "wb") as f:
while True: while True:
length = struct.unpack(">I", self.data[pos:pos + 4])[0] length = struct.unpack(">I", self.data[pos:pos + 4])[0]
if length == 0: break if length == 0: break
pos += 4 pos += 4
f.write(self.data[pos:pos + length]) f.write(self.data[pos:pos + length])
pos += length pos += length
self.logger.debug("starting uvscan for file {}".format(tmpfile)) self.logger.debug("starting uvscan for file {}".format(self.tmpfile))
task = asyncio.async(run(AIO.config["uvscan_path"], tmpfile)) task = asyncio.async(run(AIO.config["uvscan_path"], self.tmpfile))
task.add_done_callback(self.handle_uvscan_result) task.add_done_callback(self.handle_uvscan_result)
else: else:
raise RuntimeError("unknown command") raise RuntimeError("unknown command")
@@ -106,6 +106,10 @@ class AIO(asyncio.Protocol):
self.transport.write(response) self.transport.write(response)
self.transport.close() self.transport.close()
def connection_list(self, exc):
if self.tmpfile:
os.remove(self.tmpfile)
def main(): def main():
"Run uvscand." "Run uvscand."