Fix small bugs in Android OS Plugin

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

@@ -4,7 +4,8 @@
 
 from dissect.target.filesystem import Filesystem
 from dissect.target.helpers.record import UnixUserRecord
-from dissect.target.plugin import OperatingSystem, OSPlugin, export
+from dissect.target.plugin import OperatingSystem, export
+from dissect.target.plugins.os.unix.linux._os import LinuxPlugin
 from dissect.target.target import Target
 
 
@@ -22,11 +23,11 @@ def __init__(self, fh: TextIO):
             self.props[k] = v
 
 
-class AndroidPlugin(OSPlugin):
+class AndroidPlugin(LinuxPlugin):
     def __init__(self, target: Target):
         super().__init__(target)
         self.target = target
-        self.props = BuildProp(self.target.path("/build.prop").open("rt"))
+        self.props = BuildProp(self.target.fs.path("/build.prop").open("rt"))
 
     @classmethod
     def detect(cls, target: Target) -> Optional[Filesystem]:
@@ -50,9 +51,16 @@ def ips(self) -> list[str]:
 
     @export(property=True)
     def version(self) -> str:
-        release_version = self.props.props["ro.build.version.release"]
-        security_patch_version = self.props.props["ro.build.version.security_patch"]
-        return f"Android {release_version} ({security_patch_version})"
+        full_version = "Android"
+
+        release_version = self.props.props.get("ro.build.version.release")
+        if release_version := self.props.props.get("ro.build.version.release"):
+            full_version += f" {release_version}"
+
+        if security_patch_version := self.props.props.get("ro.build.version.security_patch"):
+            full_version += f" ({security_patch_version})"
+
+        return full_version
 
     @export(property=True)
     def os(self) -> str:

tests/conftest.py

@@ -15,6 +15,7 @@
 from dissect.target.plugins.os.unix.bsd.citrix._os import CitrixBsdPlugin
 from dissect.target.plugins.os.unix.bsd.osx._os import MacPlugin
 from dissect.target.plugins.os.unix.linux._os import LinuxPlugin
+from dissect.target.plugins.os.unix.linux.android._os import AndroidPlugin
 from dissect.target.plugins.os.windows import registry
 from dissect.target.plugins.os.windows._os import WindowsPlugin
 from dissect.target.target import Target
@@ -144,6 +145,13 @@ def fs_bsd():
     yield fs
 
 
+@pytest.fixture
+def fs_android() -> VirtualFilesystem:
+    fs = VirtualFilesystem()
+    fs.map_file("/build.prop", absolute_path("data/plugins/os/unix/linux/android/build.prop"))
+    yield fs
+
+
 @pytest.fixture
 def hive_hklm():
     hive = VirtualHive()
@@ -258,6 +266,15 @@ def target_citrix(fs_bsd):
     yield mock_target
 
 
+@pytest.fixture
+def target_android(fs_android: VirtualFilesystem) -> Target:
+    mock_target = next(make_mock_target())
+    mock_target._os_plugin = AndroidPlugin
+    mock_target.filesystems.add(fs_android)
+    mock_target.apply()
+    yield mock_target
+
+
 @pytest.fixture
 def target_win_users(hive_hklm, hive_hku, target_win):
     profile_list_key_name = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"

tests/data/plugins/os/unix/linux/android/build.prop

@@ -0,0 +1,5 @@
+# begin build properties
+# autogenerated by buildinfo.sh
+ro.build.host=TMG28071935
+ro.build.version.release=4.4.2
+ro.build.version.security_patch=2013-10-31

tests/test_plugins_os_unix_linux_android.py

@@ -0,0 +1,10 @@
+from dissect.target import Target
+from dissect.target.plugins.os.unix.linux.android._os import AndroidPlugin
+
+
+def test_android_os(target_android: Target) -> None:
+    target_android.add_plugin(AndroidPlugin)
+
+    assert target_android.os == "android"
+    assert target_android.version == "Android 4.4.2 (2013-10-31)"
+    assert target_android.hostname == "TMG28071935"