make const work with ostype, add ql.platform_os and ql.platform_arch

Author: xwings

qiling/core.py

@@ -34,7 +34,6 @@ def __init__(
             rootfs=None,
             env=None,
             code=None,
-            shellcoder=None,
             ostype=None,
             archtype=None,
             bigendian=False,
@@ -52,6 +51,7 @@ def __init__(
             stdin=None,
             stdout=None,
             stderr=None,
+            noneos=None,
     ):
         """ Create a Qiling instance.
 
@@ -67,9 +67,9 @@ def __init__(
         self._rootfs = rootfs
         self._env = env if env else {}
         self._code = code
-        self._shellcoder = shellcoder
         self._ostype = ostype
         self._archtype = archtype
+        self._noneos = None,
         self._archendian = None
         self._archbit = None
         self._pointersize = None
@@ -82,7 +82,8 @@ def __init__(
         self._log_override = log_override
         self._log_plain = log_plain
         self._filter = filter
-        self._platform = ostype_convert(platform.system().lower())
+        self._platform_os = ostype_convert(platform.system().lower())
+        self._platform_arch = arch_convert(platform.machine().lower())
         self._internal_exception = None
         self._uc = None
         self._stop_options = QlStopOptions(stackpointer=stop_on_stackpointer, exit_trap=stop_on_exit_trap)
@@ -114,10 +115,6 @@ def __init__(
         # Shellcode? #
         ##############
 
-        # for Legacy
-        if self._shellcoder:
-            self._code = self._shellcoder
-
         if self._code or (self._archtype and type(self._archtype) == str):
             if (self._archtype and type(self._archtype) == str):
                 self._archtype= arch_convert(self._archtype.lower())
@@ -476,20 +473,36 @@ def targetname(self) -> str:
         return self._targetname
 
     @property
-    def platform(self):
-        """ Specify current platform where Qiling runs on.
+    def platform_os(self):
+        """ Specify current platform os where Qiling runs on.
+
+            Type: int
+            Values: All possible values from platform.system()
+        """
+        return self._platform_os
+
+    @platform_os.setter
+    def platform_os(self, value):
+        if type(value) is str:
+            self._platform_os = ostype_convert(value.lower())
+        else:
+            self._platform_os = value
+
+    @property
+    def platform_arch(self):
+        """ Specify current platform arch where Qiling runs on.
 
             Type: int
             Values: All possible values from platform.system()
         """
-        return self._platform
+        return self._platform_arch
 
-    @platform.setter
-    def platform(self, value):
+    @platform_arch.setter
+    def platform_arch(self, value):
         if type(value) is str:
-            self._platform = ostype_convert(value.lower())
+            self._platform_arch = arch_convert(value.lower())
         else:
-            self._platform = value
+            self._platform_arch = value
 
     @property
     def internal_exception(self) -> Exception:

qiling/os/linux/const.py

@@ -107,7 +107,7 @@ def convert_for_native_os(rootfs: Union[str, Path], cwd: str, path: str) -> Path
 
     def convert_path(self, rootfs: Union[str, Path], cwd: str, path: str) -> Path:
         emulated_os = self.ql.ostype
-        hosting_os = self.ql.platform
+        hosting_os = self.ql.platform_os
 
         # emulated os and hosting platform are of the same type
         if  (emulated_os == hosting_os) or (emulated_os in QL_OS_POSIX and hosting_os in QL_OS_POSIX):

qiling/os/path.py

@@ -3,6 +3,11 @@
 # Cross Platform and Multi Architecture Advanced Binary Emulation Framework
 #
 
+#!/usr/bin/env python3
+# 
+# Cross Platform and Multi Architecture Advanced Binary Emulation Framework
+#
+
 from qiling.const import *
 
 # OS Threading Constants
@@ -19,7 +24,7 @@
 
 SOCK_TYPE_MASK = 0x0f
 
-linux_socket_types = {
+x86_socket_types = {
     'SOCK_STREAM'    : 0x1,
     'SOCK_DGRAM'     : 0x2,
     'SOCK_RAW'       : 0x3,
@@ -29,8 +34,7 @@
     'SOCK_PACKET'    : 0xa,
 }
 
-
-linux_socket_domain = {
+x86_socket_domain = {
     'AF_UNSPEC'    : 0x0,
     'AF_LOCAL'     : 0x1,
     'AF_INET'      : 0x2,
@@ -46,7 +50,7 @@
 }
 
 # https://github.com/torvalds/linux/blob/master/include/uapi/linux/in.h
-linux_socket_level = {
+x86_socket_level = {
     'IPPROTO_IP'    : 0x0000,
     'SOL_SOCKET'    : 0x0001,
     'IPPROTO_TCP'   : 0x0006,
@@ -56,7 +60,7 @@
 }
 
 
-linux_socket_options = {
+x86_socket_options = {
     "SO_DEBUG"           : 0x0001,
     "SO_REUSEADDR"       : 0x0002,
     "SO_KEEPALIVE"       : 0x0009,
@@ -75,7 +79,7 @@
 
 # https://man7.org/linux/man-pages/man7/ip.7.html
 # https://github.com/torvalds/linux/blob/master/include/uapi/linux/in.h
-linux_socket_ip_options = {
+posix_socket_ip_options = {
     "IP_TOS"                    : 0x0001,
     "IP_TTL"                    : 0x0002,
     "IP_HDRINCL"                : 0x0003,
@@ -143,7 +147,7 @@
 }
 
 
-macos_socket_domain = {
+macos_x86_socket_domain = {
     'AF_UNSPEC'    : 0x0,
     'AF_LOCAL'     : 0x1,
     'AF_INET'      : 0x2,
@@ -397,11 +401,9 @@
     "SO_TIMESTAMPING_NEW"       : 0x0041,
     "SO_RCVTIMEO_NEW"           : 0x0042,
     "SO_SNDTIMEO_NEW"           : 0x0043,
-
 }
 
-
-mac_open_flags = {
+macos_x86_open_flags = {
     "O_RDONLY"   : 0x0000,
     "O_WRONLY"   : 0x0001,
     "O_RDWR"     : 0x0002,
@@ -417,8 +419,23 @@
     "O_DIRECTORY": 0x100000
 }
 
+macos_arm64_open_flags = {
+    "O_RDONLY"   : 0x0000,
+    "O_WRONLY"   : 0x0001,
+    "O_RDWR"     : 0x0002,
+    "O_NONBLOCK" : 0x0004,
+    "O_APPEND"   : 0x0008,
+    "O_ASYNC"    : 0x0040,
+    "O_SYNC"     : 0x0080,
+    "O_NOFOLLOW" : 0x0100,
+    "O_CREAT"    : 0x0200,
+    "O_TRUNC"    : 0x0400,
+    "O_EXCL"     : 0x0800,
+    "O_NOCTTY"   : 0x20000,
+    "O_DIRECTORY": 0x100000
+}
 
-linux_open_flags = {
+x86_open_flags = {
     'O_RDONLY'    : 0o000000000,
     'O_WRONLY'    : 0o000000001,
     'O_RDWR'      : 0o000000002,