Saverr/pwncat
1
0
Fork 0
mirror of https://github.com/calebstewart/pwncat.git synced 2024-11-24 01:25:37 +01:00
Code Projects Releases Wiki Activity

During debugging, accidentally removed an exception

Browse Source 
Re-added commented exception handler that was removed for testing
This commit is contained in:
Caleb Stewart 2021-06-14 22:36:14 -04:00
parent 64dcae2f0b
commit 31b68a2518
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pwncat/modules/linux/enumerate/system/container.py
View File

@ -7,14 +7,14 @@ from pwncat.modules.enumerate import EnumerateModule
class ContainerData(Fact): class ContainerData(Fact):
def __init__(self, source, type): def __init__(self, source, system):
super().__init__(source=source, types=["system.container"]) super().__init__(source=source, types=["system.container"])
self.type: str = type self.system: str = system
""" what type of container? either docker or lxd """ """ what type of container? either docker or lxd """
def title(self, session): def title(self, session):
return f"[yellow]{self.type}[/yellow]" return f"[yellow]{self.system}[/yellow]"
class Module(EnumerateModule): class Module(EnumerateModule):
@ -45,7 +45,7 @@ class Module(EnumerateModule):
if proc.stdout: if proc.stdout:
if proc.stdout.strip() != "": if proc.stdout.strip() != "":
yield "system.container", ContainerData(self.name, "docker") yield ContainerData(self.name, "docker")
return return
except CalledProcessError: except CalledProcessError:

6
pwncat/platform/linux.py
View File

@ -140,9 +140,9 @@ class PopenLinux(pwncat.subprocess.Popen):
if result == b"" and self.stdout_raw.raw.eof: if result == b"" and self.stdout_raw.raw.eof:
self._receive_returncode() self._receive_returncode()
return self.returncode return self.returncode
# except ValueError: except ValueError:
# self._receive_returncode() self._receive_returncode()
# return self.returncode return self.returncode
except BlockingIOError: except BlockingIOError:
return None return None