Brought enumerate.software.screen to the new platforms framework

pwncat/modules/linux/enumerate/software/screen.py

@@ -4,20 +4,31 @@ import os
 import re
 import shlex
 
+import rich.markup
+
 import pwncat
-from pwncat.modules.agnostic.enumerate import EnumerateModule, Schedule
+from pwncat.db import Fact
 from pwncat.platform.linux import Linux
+from pwncat.modules.agnostic.enumerate import EnumerateModule, Schedule
+from pwncat.subprocess import CalledProcessError
 
 
-@dataclasses.dataclass
-class ScreenVersion:
+"""
+TODO: This should realistically yield an ability (which can be used for 
+privilege escalation)... but we can implement that later.
+"""
 
-    path: str
-    perms: int
-    vulnerable: bool = True
+
+class ScreenVersion(Fact):
+    def __init__(self, source, path, perms, vulnerable):
+        super().__init__(source=source, types=["software.screen.version"])
+
+        self.path: str = path
+        self.perms: int = perms
+        self.vulnerable: bool = vulnerable
 
     def __str__(self):
-        return f"[cyan]{self.path}[/cyan] (perms: [blue]{oct(self.perms)[2:]}[/blue])"
+        return f"[cyan]{rich.markup.escape(self.path)}[/cyan] (perms: [blue]{oct(self.perms)[2:]}[/blue]) [bold red]is vulnerable[/bold red]"
 
 
 class Module(EnumerateModule):
@@ -31,14 +42,14 @@ class Module(EnumerateModule):
     PLATFORM = [Linux]
     SCHEDULE = Schedule.ONCE
 
-    def enumerate(self):
+    def enumerate(self, session):
         """
-        Enumerate kernel/OS version information
+        Enumerate locations of vulnerable screen versions
         :return:
         """
 
         # Grab current path plus other interesting paths
-        paths = set(pwncat.victim.getenv("PATH").split(":"))
+        paths = set(session.platform.getenv("PATH").split(":"))
         paths = paths | {
             "/bin",
             "/sbin",
@@ -49,11 +60,17 @@ class Module(EnumerateModule):
         }
 
         # Look for matching binaries
-        with pwncat.victim.subprocess(
-            f"find {shlex.join(paths)} \\( -type f -or -type l \\) -executable \\( -name 'screen' -or -name 'screen-*' \\) -printf '%#m %p\\n' 2>/dev/null"
-        ) as pipe:
-            for line in pipe:
-                line = line.decode("utf-8").strip()
+        proc = session.platform.Popen(
+            f"find {shlex.join(paths)} \\( -type f -or -type l \\) -executable \\( -name 'screen' -or -name 'screen-*' \\) -printf '%#m %p\\n' 2>/dev/null",
+            shell=True,
+            text=True,
+            stdout=pwncat.subprocess.PIPE,
+        )
+
+        # First, collect all the paths to a `screen` binary we can find
+        screen_paths = []
+        for line in proc.stdout:
+            line = line.strip()
             perms, *path = line.split(" ")
             path = " ".join(path)
             perms = int(perms, 8)
@@ -62,4 +79,37 @@ class Module(EnumerateModule):
             if os.path.splitext(path)[1] in [".c", ".o", ".h"]:
                 continue
 
-                yield "software.screen.version", ScreenVersion(path, perms)
+            if perms & 0o4000:
+                # if this is executable
+                screen_paths.append(path)
+
+        # Now, check each screen version to determine if it is vulnerable
+        for screen_path in screen_paths:
+            version_output = session.platform.Popen(
+                f"{screen_path} --version",
+                shell=True,
+                text=True,
+                stdout=pwncat.subprocess.PIPE,
+            )
+            for line in version_output.stdout:
+                # This process checks if it is a vulnerable version of screen
+                match = re.search(r"(\d+\.\d+\.\d+)", line)
+                if not match:
+                    continue
+
+                version_triplet = [int(x) for x in match.group().split(".")]
+
+                if version_triplet[0] > 4:
+                    continue
+
+                if version_triplet[0] == 4 and version_triplet[1] > 5:
+                    continue
+
+                if (
+                    version_triplet[0] == 4
+                    and version_triplet[1] == 5
+                    and version_triplet[2] >= 1
+                ):
+                    continue
+
+                yield ScreenVersion(self.name, path, perms, vulnerable=True)

pwncat/modules/linux/enumerate/user/group.py

@@ -35,7 +35,6 @@ class Module(EnumerateModule):
                         yield group
 
                     except Exception as exc:
-                        raise ModuleFailed(f"something fucked {exc}")
                         # Bad group line
                         continue