Refactor OSs hierarchy.

src/rpcclient/rpcclient/__main__.py

@@ -3,7 +3,7 @@
 import click
 import coloredlogs
 
-from rpcclient.client.client_factory import create_client
+from rpcclient.client_factory import create_client
 from rpcclient.protocol import DEFAULT_PORT
 
 coloredlogs.install(level=logging.DEBUG)

src/rpcclient/rpcclient/client/client.py → src/rpcclient/rpcclient/client.py

@@ -18,7 +18,7 @@
 from rpcclient.network import Network
 from rpcclient.processes import Processes
 from rpcclient.protocol import protocol_message_t, cmd_type_t, exec_chunk_t, exec_chunk_type_t, UNAME_VERSION_LEN
-from rpcclient.structs.darwin import pid_t, exitcode_t
+from rpcclient.darwin.structs import pid_t, exitcode_t
 from rpcclient.symbol import Symbol
 from rpcclient.symbols_jar import SymbolsJar
 

src/rpcclient/rpcclient/client/client_factory.py → src/rpcclient/rpcclient/client_factory.py

@@ -1,9 +1,9 @@
 import logging
 from socket import socket
 
-from rpcclient.client.client import Client
-from rpcclient.client.darwin_client import DarwinClient
-from rpcclient.client.linux_client import LinuxClient
+from rpcclient.client import Client
+from rpcclient.darwin.client import DarwinClient
+from rpcclient.linux.client import LinuxClient
 from rpcclient.exceptions import FailedToConnectError
 from rpcclient.protocol import UNAME_VERSION_LEN, DEFAULT_PORT
 

src/rpcclient/rpcclient/client/darwin_client.py → src/rpcclient/rpcclient/darwin/client.py

@@ -3,16 +3,16 @@
 
 from cached_property import cached_property
 
-from rpcclient.client.client import Client
-from rpcclient.darwin.darwin_fs import DarwinFs
-from rpcclient.darwin.darwin_media import DarwinMedia
-from rpcclient.darwin.darwin_network import DarwinNetwork
-from rpcclient.darwin.darwin_processes import DarwinProcesses
+from rpcclient.client import Client
+from rpcclient.darwin.fs import DarwinFs
+from rpcclient.darwin.media import DarwinMedia
+from rpcclient.darwin.network import DarwinNetwork
+from rpcclient.darwin.processes import DarwinProcesses
 from rpcclient.darwin.preferences import Preferences
 from rpcclient.exceptions import RpcClientException
-from rpcclient.structs.darwin import utsname
-from rpcclient.structs.darwin_consts import kCFNumberSInt64Type, kCFNumberDoubleType
-from rpcclient.symbol import DarwinSymbol
+from rpcclient.darwin.structs import utsname
+from rpcclient.darwin.consts import kCFNumberSInt64Type, kCFNumberDoubleType
+from rpcclient.darwin.symbol import DarwinSymbol
 
 
 class DarwinClient(Client):

src/rpcclient/rpcclient/darwin/darwin_fs.py → src/rpcclient/rpcclient/darwin/fs.py

@@ -1,7 +1,7 @@
 from rpcclient.common import path_to_str
 from rpcclient.exceptions import BadReturnValueError
 from rpcclient.fs import Fs, DirEntry, ScandirIterator
-from rpcclient.structs.darwin import dirent32, dirent64, stat64, statfs64
+from rpcclient.darwin.structs import dirent32, dirent64, stat64, statfs64
 
 
 def do_stat(client, stat_name, filename: str):

src/rpcclient/rpcclient/darwin/darwin_media.py → src/rpcclient/rpcclient/darwin/media.py

@@ -2,7 +2,7 @@
 
 from rpcclient.common import path_to_str
 from rpcclient.exceptions import RpcClientException, BadReturnValueError
-from rpcclient.symbol import DarwinSymbol
+from rpcclient.darwin.symbol import DarwinSymbol
 
 
 class Recorder:

src/rpcclient/rpcclient/darwin/darwin_processes.py → src/rpcclient/rpcclient/darwin/processes.py

@@ -9,7 +9,7 @@
 from rpcclient.common import path_to_str
 from rpcclient.exceptions import BadReturnValueError
 from rpcclient.processes import Processes
-from rpcclient.structs.darwin import pid_t, MAXPATHLEN, PROC_PIDLISTFDS, proc_fdinfo, PROX_FDTYPE_VNODE, \
+from rpcclient.darwin.structs import pid_t, MAXPATHLEN, PROC_PIDLISTFDS, proc_fdinfo, PROX_FDTYPE_VNODE, \
     vnode_fdinfowithpath, PROC_PIDFDVNODEPATHINFO, proc_taskallinfo, PROC_PIDTASKALLINFO, PROX_FDTYPE_SOCKET, \
     PROC_PIDFDSOCKETINFO, socket_fdinfo, so_kind_t, so_family_t, PROX_FDTYPE_PIPE, PROC_PIDFDPIPEINFO, pipe_info
 

src/rpcclient/rpcclient/darwin/symbol.py

@@ -0,0 +1,67 @@
+import struct
+import time
+
+from rpcclient.darwin.consts import kCFNumberSInt64Type, kCFNumberDoubleType
+from rpcclient.exceptions import CfSerializationError, UnrecognizedSelector
+from rpcclient.symbol import Symbol
+
+
+class DarwinSymbol(Symbol):
+    def objc_call(self, selector, *params):
+        """ call an objc method on a given object """
+        sel = self._client.symbols.sel_getUid(selector)
+        if not self._client.symbols.objc_msgSend(self, self._client.symbols.sel_getUid("respondsToSelector:"), sel):
+            raise UnrecognizedSelector(f"unrecognized selector '{selector}' sent to class")
+
+        return self._client.symbols.objc_msgSend(self, sel, *params)
+
+    @property
+    def cfdesc(self):
+        """
+        Get output from CFCopyDescription()
+        :return: CFCopyDescription()'s output as a string
+        """
+        if self == 0:
+            return None
+        return self._client.symbols.CFCopyDescription(self).py
+
+    @property
+    def py(self):
+        if self == 0:
+            return None
+
+        t = self._client._cf_types[self._client.symbols.CFGetTypeID(self)]
+        if t == 'str':
+            return self._client.symbols.CFStringGetCStringPtr(self, 0).peek_str()
+        if t == 'bool':
+            return bool(self._client.symbols.CFBooleanGetValue(self, 0))
+        if t == 'number':
+            with self._client.safe_malloc(200) as buf:
+                if self._client.symbols.CFNumberIsFloatType(self):
+                    if not self._client.symbols.CFNumberGetValue(self, kCFNumberDoubleType, buf):
+                        raise CfSerializationError(f'failed to deserialize float: {self}')
+                    return struct.unpack('<d', buf.peek(8))[0]
+                if not self._client.symbols.CFNumberGetValue(self, kCFNumberSInt64Type, buf):
+                    raise CfSerializationError(f'failed to deserialize int: {self}')
+                return int(buf[0])
+        if t == 'date':
+            return time.strptime(self.cfdesc, '%Y-%m-%d  %H:%M:%S %z')
+        if t == 'data':
+            count = self._client.symbols.CFDataGetLength(self)
+            return self._client.symbols.CFDataGetBytePtr(self).peek(count)
+        if t == 'array':
+            result = []
+            count = self._client.symbols.CFArrayGetCount(self)
+            for i in range(count):
+                result.append(self._client.symbols.CFArrayGetValueAtIndex(self, i).py)
+            return result
+        if t == 'dict':
+            result = {}
+            count = self._client.symbols.CFArrayGetCount(self)
+            with self._client.safe_malloc(8 * count) as keys:
+                with self._client.safe_malloc(8 * count) as values:
+                    self._client.symbols.CFDictionaryGetKeysAndValues(self, keys, values)
+                    for i in range(count):
+                        result[keys[i].py] = values[i].py
+                    return result
+        raise NotImplementedError(f'type: {t}')

src/rpcclient/rpcclient/client/linux_client.py → src/rpcclient/rpcclient/linux/client.py

@@ -1,8 +1,8 @@
 from cached_property import cached_property
 
-from rpcclient.client.client import Client
-from rpcclient.linux_fs import LinuxFs
-from rpcclient.structs.linux import utsname
+from rpcclient.client import Client
+from rpcclient.linux.fs import LinuxFs
+from rpcclient.linux.structs import utsname
 
 
 class LinuxClient(Client):

src/rpcclient/rpcclient/linux_fs.py → src/rpcclient/rpcclient/linux/fs.py

@@ -3,7 +3,7 @@
 
 from rpcclient.exceptions import BadReturnValueError
 from rpcclient.fs import Fs
-from rpcclient.structs.linux import dirent
+from rpcclient.linux.structs import dirent
 
 
 class LinuxFs(Fs):

src/rpcclient/rpcclient/symbol.py

@@ -1,14 +1,10 @@
 import ctypes
 import os
 import struct
-import time
 from contextlib import contextmanager
 
 from construct import FormatField
 
-from rpcclient.exceptions import CfSerializationError, UnrecognizedSelector
-from rpcclient.structs.darwin_consts import kCFNumberSInt64Type, kCFNumberDoubleType
-
 ADDRESS_SIZE_TO_STRUCT_FORMAT = {1: 'B', 2: 'H', 4: 'I', 8: 'Q'}
 RETVAL_BIT_COUNT = 64
 
@@ -194,64 +190,3 @@ def __str__(self):
 
     def __call__(self, *args, **kwargs):
         return self._client.call(self, args)
-
-
-class DarwinSymbol(Symbol):
-    def objc_call(self, selector, *params):
-        """ call an objc method on a given object """
-        sel = self._client.symbols.sel_getUid(selector)
-        if not self._client.symbols.objc_msgSend(self, self._client.symbols.sel_getUid("respondsToSelector:"), sel):
-            raise UnrecognizedSelector(f"unrecognized selector '{selector}' sent to class")
-
-        return self._client.symbols.objc_msgSend(self, sel, *params)
-
-    @property
-    def cfdesc(self):
-        """
-        Get output from CFCopyDescription()
-        :return: CFCopyDescription()'s output as a string
-        """
-        if self == 0:
-            return None
-        return self._client.symbols.CFCopyDescription(self).py
-
-    @property
-    def py(self):
-        if self == 0:
-            return None
-
-        t = self._client._cf_types[self._client.symbols.CFGetTypeID(self)]
-        if t == 'str':
-            return self._client.symbols.CFStringGetCStringPtr(self, 0).peek_str()
-        if t == 'bool':
-            return bool(self._client.symbols.CFBooleanGetValue(self, 0))
-        if t == 'number':
-            with self._client.safe_malloc(200) as buf:
-                if self._client.symbols.CFNumberIsFloatType(self):
-                    if not self._client.symbols.CFNumberGetValue(self, kCFNumberDoubleType, buf):
-                        raise CfSerializationError(f'failed to deserialize float: {self}')
-                    return struct.unpack('<d', buf.peek(8))[0]
-                if not self._client.symbols.CFNumberGetValue(self, kCFNumberSInt64Type, buf):
-                    raise CfSerializationError(f'failed to deserialize int: {self}')
-                return int(buf[0])
-        if t == 'date':
-            return time.strptime(self.cfdesc, '%Y-%m-%d  %H:%M:%S %z')
-        if t == 'data':
-            count = self._client.symbols.CFDataGetLength(self)
-            return self._client.symbols.CFDataGetBytePtr(self).peek(count)
-        if t == 'array':
-            result = []
-            count = self._client.symbols.CFArrayGetCount(self)
-            for i in range(count):
-                result.append(self._client.symbols.CFArrayGetValueAtIndex(self, i).py)
-            return result
-        if t == 'dict':
-            result = {}
-            count = self._client.symbols.CFArrayGetCount(self)
-            with self._client.safe_malloc(8 * count) as keys:
-                with self._client.safe_malloc(8 * count) as values:
-                    self._client.symbols.CFDictionaryGetKeysAndValues(self, keys, values)
-                    for i in range(count):
-                        result[keys[i].py] = values[i].py
-                    return result
-        raise NotImplementedError(f'type: {t}')

src/rpcclient/tests/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 
-from rpcclient.client.client_factory import create_client
+from rpcclient.client_factory import create_client
 
 
 @pytest.fixture