Improve RedHat OS detection

dissect/target/plugins/os/unix/_os.py

@@ -42,7 +42,7 @@ def __init__(self, target: Target):
         super().__init__(target)
         self._add_mounts()
         self._add_devices()
-        self._hostname_dict = self._parse_hostname_string()
+        self._hostname, self._domain = self._parse_hostname_string()
         self._hosts_dict = self._parse_hosts_string()
         self._os_release = self._parse_os_release()
 
@@ -149,14 +149,13 @@ def architecture(self) -> str | None:
 
     @export(property=True)
     def hostname(self) -> str | None:
-        hosts_string = self._hosts_dict.get("hostname", "localhost")
-        return self._hostname_dict.get("hostname", hosts_string)
+        return self._hostname or self._hosts_dict.get("hostname", "localhost")
 
     @export(property=True)
     def domain(self) -> str | None:
-        domain = self._hostname_dict.get("domain", "localhost")
+        domain = self._domain or "localhost"
         if domain == "localhost":
-            domain = self._hosts_dict["hostname", "localhost"]
+            domain = self._hosts_dict.get("hostname", "localhost")
             if domain == self.hostname:
                 return domain  # domain likely not defined, so localhost is the domain.
         return domain
@@ -167,14 +166,14 @@ def os(self) -> str:
 
     def _parse_hostname_string(
         self, paths: list[tuple[str, Callable[[Path], str] | None]] | None = None
-    ) -> dict[str, str] | None:
-        """Returns a dict containing the hostname and domain name portion of the path(s) specified.
+    ) -> tuple[str | None, str | None]:
+        """Returns a tuple containing respectively the hostname and domain name portion of the path(s) specified.
 
         Args:
             paths (list): list of tuples with paths and callables to parse the path or None
 
         Returns:
-            Dictionary with ``hostname`` and ``domain`` keys.
+            Tuple with ``hostname`` and ``domain`` strings.
         """
         hostname = None
         domain = None
@@ -201,7 +200,8 @@ def _parse_hostname_string(
 
             break  # break whenever a valid hostname is found
 
-        return {"hostname": hostname if hostname else None, "domain": domain if domain else None}
+        # can be an empty string due to splitting of hostname and domain
+        return hostname if hostname else None, domain if domain else None
 
     def _parse_rh_legacy(self, path: Path) -> str | None:
         hostname = None

dissect/target/plugins/os/unix/bsd/openbsd/_os.py

@@ -9,7 +9,7 @@
 class OpenBsdPlugin(BsdPlugin):
     def __init__(self, target: Target):
         super().__init__(target)
-        self._hostname_dict = self._parse_hostname_string([("/etc/myname", None)])
+        self._hostname, self._domain = self._parse_hostname_string([("/etc/myname", None)])
 
     @classmethod
     def detect(cls, target: Target) -> Filesystem | None:
@@ -30,4 +30,8 @@ def version(self) -> str | None:
 
     @export(property=True)
     def hostname(self) -> str | None:
-        return self._hostname_dict.get("hostname", None)
+        return self._hostname
+
+    @export(property=True)
+    def domain(self) -> str | None:
+        return self._domain

tests/plugins/os/unix/test__os.py

@@ -125,10 +125,10 @@ def test_parse_hostname_string(
 ) -> None:
     fs_unix.map_file_fh(path, BytesIO(file_content))
 
-    hostname_dict = target_unix._os._parse_hostname_string()
+    hostname, domain = target_unix._os._parse_hostname_string()
 
-    assert hostname_dict["hostname"] == expected_hostname
-    assert hostname_dict["domain"] == expected_domain
+    assert hostname == expected_hostname
+    assert domain == expected_domain
 
 
 def test_users(target_unix_users: Target) -> None: