Merge pull request #822 from qilingframework/dev

getting ready for 1.2.5

Author: xwings

.circleci/config.yml

@@ -5,28 +5,31 @@ jobs:
     macos:
       xcode: 10.1
     environment:
-      HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.13.6
     steps:
       - checkout
       - run:
-          name: "Install wget"
+          name: "Install cmake"
           command: |
-            brew install wget cmake
+            curl -OL https://distfiles.macports.org/MacPorts/MacPorts-2.6.4-10.13-HighSierra.pkg
+            sudo installer -pkg MacPorts-2.6.4-10.13-HighSierra.pkg -target /
+            export PATH=/opt/local/bin:/opt/local/sbin:$PATH
+            sudo port -q -N install cmake pkgconfig
 
       - restore_cache:
           keys:
-            - python-{{ .Environment.CIRCLE_JOB }}-3.7.0-macos-10.13.6
+            - python-{{ .Environment.CIRCLE_JOB }}-3.7-port-macos-10.13.6
 
-      - run: 
+      - run:
           name: "Install qiling framework"
           command: |
+            export PATH=/opt/local/bin:/opt/local/sbin:$PATH
             pip3 install --upgrade pip
             pip3 install wheel setuptools
             pip3 install .
             cd examples
             rm -rf rootfs
-            wget https://github.com/qilingframework/rootfs/archive/refs/heads/master.zip 
+            curl -OL https://github.com/qilingframework/rootfs/archive/refs/heads/master.zip
             unzip master.zip && mv rootfs-master rootfs
             cd .. && ./examples/scripts/dylibcollector.sh
             cd examples/rootfs/x8664_macos/kext
@@ -35,7 +38,7 @@ jobs:
       - save_cache:
           paths:
             - ~/Library/Caches/pip
-          key: python-{{ .Environment.CIRCLE_JOB }}-3.7.0-macos-10.13.6
+          key: python-{{ .Environment.CIRCLE_JOB }}-3.7-port-macos-10.13.6
 
       - run:
           name: "Run macos test"

.github/workflows/build-ci.yml

@@ -11,23 +11,19 @@ jobs:
       matrix:
         #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04]
         os: [windows-2019, ubuntu-18.04, ubuntu-20.04]
-        python-version: [3.6.8, 3.7.6, 3.8.5]
+        python-version: [3.7.6, 3.9.5]
         exclude:
           - os: ubuntu-20.04
             python-version: 3.7.6       
           - os: ubuntu-20.04
-            python-version: 3.8.5
-          - os: windows-2019
-            python-version: 3.6.8
+            python-version: 3.9.5
           - os: windows-2019
             python-version: 3.7.6                 
           # - os: macos-10.15
-          #   python-version: 3.6.8
-          # - os: macos-10.15
           #   python-version: 3.7.6                       
         include:
           - os: ubuntu-20.04
-            python-version: 3.6.8
+            python-version: 3.9.5
             container: Docker
 
     steps:

.github/workflows/giteesync.yml

@@ -1,15 +1,15 @@
-name: sync to gitee
-on:
-  push:
+ name: sync to gitee
+ on:
+   push:
 
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: acefei/sync-repo-action@master
-      with:
-        ssh_private_key: ${{ secrets.GITEE_KEY }}
-        target_repo: ssh://[email protected]/qilingframework/qiling.git
+ jobs:
+   deploy:
+     runs-on: ubuntu-latest
+     steps:
+     - uses: actions/checkout@v2
+       with:
+         fetch-depth: 0
+     - uses: acefei/sync-repo-action@master
+       with:
+         ssh_private_key: ${{ secrets.GITEE_KEY }}
+         target_repo: ssh://[email protected]/qilingframework/qiling.git

.gitignore

@@ -7,6 +7,7 @@
 *.cache2
 .*.swp
 *.raw
+.venv
 
 # cache and misc
 qiling.egg-info/
@@ -34,3 +35,6 @@ test.file
 *.o
 core
 *.perf
+
+# future
+engine/

ChangeLog

@@ -1,10 +1,20 @@
 This file details the changelog of Qiling Framework.
 
 ------------------------------------
-[Version 1.2.4]: April [SOMETHING], 2021
-
+[Version 1.2.4]: July 0th, 2021
 -
 
+------------------------------------
+[Version 1.2.4]: June 15th, 2021
+
+- Added custom engine extension
+- Added more posix syscall
+- Refactor: Posix syscall
+- Refactor: Memory management
+- Refactor: Heap management
+- Cleanup and getting ready for engine module
+
+
 ------------------------------------
 [Version 1.2.3]: March 30th, 2021
 
@@ -13,6 +23,7 @@ This file details the changelog of Qiling Framework.
 - Fixed return value for uid/gid related syscall
 - Resolved multilevel symbolic links
 - Demigod set.api implementation
+- Added support for arguments inside IDA plugin
 - Major refactor, see commit 4aa8e59e04d5a8a5520e4e1e2595ecc78a80beba
 - Clean and remove rootfs
 - ql.filter now accepts a regular expression
@@ -43,8 +54,8 @@ This file details the changelog of Qiling Framework.
 - Added support for custom envs variables inside IDA plugin
 - Demigod: Fixed lkm mapping and added support for MIPS32EL
 - Demigod: Added support for Linux x86 32bit
-- Added support for binaries that return from their entrypoint (PE / ELF).
-- Configure Qiling with 'stop_on_stackpointer' or 'stop_on_exit_trap'.
+- Added support for binaries that return from their entrypoint (PE / ELF)
+- Configure Qiling with 'stop_on_stackpointer' or 'stop_on_exit_trap'
 - Add basic Windows driver tests / example
 - UEFI refactor
 
@@ -100,7 +111,7 @@ This file details the changelog of Qiling Framework.
 - Added experimental 8086 and DOS support.
 - Fixed path transformation on Windows when running Linux.
 - IDA Plugin able to instrument code now
-- Refactor ql.fs_mapper (now ql.os.fs_mapper).
+- Refactor ql.fs_mapper (now ql.os.fs_mapper)
 
 
 ------------------------------------

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-slim AS builder
+FROM python:3.8-slim AS builder
 
 LABEL maintainer="Kevin Foo <[email protected]>"
 
@@ -13,14 +13,14 @@ COPY . /qiling
 RUN cd /qiling \
   && pip wheel . -w wheels
 
-FROM python:3.6-slim AS base
+FROM python:3.8-slim AS base
 
 COPY --from=builder /qiling /qiling
 
 WORKDIR /qiling
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends unzip \
+  && apt-get install -y --no-install-recommends unzip apt-utils \
   && rm -rf /var/lib/apt/lists/* \
   && pip3 install wheels/*.whl \
   && rm -rf wheels

examples/fuzzing/linux_x8664/fuzz.c

@@ -5,17 +5,23 @@
 // Program that will crash easily.
 #define SIZE (10)
 
-int fun(int i) {
+int fun(int i)
+{
     char *buf = malloc(SIZE);
     char buf2[SIZE];
-    while (*buf = getc(stdin) == 'A') {
+
+    while (*buf = getc(stdin) == 'A')
+    {
         buf[i++] = *buf;
     }
+
     strncpy(buf2, buf, i);
     printf(buf2);
+
     return 0;
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     return fun(argc);
 }