[pull] master from ehids:master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,10 +23,12 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Linux Server/Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Kernel Version [e.g. 5.10]
- - Version [e.g. 0.1.3-20220313-69c1e0]
+**Linux Server/Android (please complete the following information):**
+
+- OS: [e.g. Ubuntu 21.04]
+- Arch: [e.g. arm_aarch64]
+- Kernel Version: [e.g. 5.10]
+- Version: [e.g. 0.1.3-20220313-69c1e0]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/codeql-analysis.yml

@@ -37,46 +37,46 @@ jobs:
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-    - uses: actions/setup-go@v3
-      with:
-        go-version: '1.16.14'
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.17.4'
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    - name: Install Compilers
-      run: |
-        sudo apt-get update
-        sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-common linux-tools-generic
-        for tool in "clang" "llc" "llvm-strip"
-        do
-          sudo rm -f /usr/bin/$tool
-          sudo ln -s /usr/bin/$tool-12 /usr/bin/$tool
-        done
-      shell: bash
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      - name: Install Compilers
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-common linux-tools-generic
+          for tool in "clang" "llc" "llvm-strip"
+          do
+            sudo rm -f /usr/bin/$tool
+            sudo ln -s /usr/bin/$tool-12 /usr/bin/$tool
+          done
+        shell: bash
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    - run: make
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - run: |
+          make env
+          make
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/go-c-cpp.yml

@@ -7,26 +7,253 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  build-on-ubuntu2004:
+    runs-on: ubuntu-20.04
+    name: build on ubuntu-20.04 x86_64
+    steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.17.4'
+      - name: Install Compilers
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-common linux-tools-generic
+          for tool in "clang" "llc" "llvm-strip"
+          do
+            sudo rm -f /usr/bin/$tool
+            sudo ln -s /usr/bin/$tool-12 /usr/bin/$tool
+          done
+        shell: bash
+      - uses: actions/checkout@v3
+      - name: Build
+        run: |
+          make clean
+          make env
+          make
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          #          version: v3.2.0
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          args: --disable-all -E errcheck
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true then the all caching functionality will be complete disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
+
+          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
 
-    runs-on: ubuntu-latest
+          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
+      - name: Build NOCORE
+        run: |
+          make clean
+          make env
+          make nocore
+      - name: Test
+        run: go test -v ./...
 
+  build-on-ubuntu2204:
+    runs-on: ubuntu-22.04
+    name: build on ubuntu-22.04 x86_64
     steps:
-    - uses: actions/setup-go@v3
-      with:
-        go-version: '1.16.14'
-    - name: Install Compilers
-      run: |
-        sudo apt-get update
-        sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-12 clang-12 linux-tools-common linux-tools-generic
-        for tool in "clang" "llc" "llvm-strip"
-        do
-          sudo rm -f /usr/bin/$tool
-          sudo ln -s /usr/bin/$tool-12 /usr/bin/$tool
-        done
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: Build
-      run: make all
-    - name: Test
-      run: go test -v ./...
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.17.4'
+      - name: Install Compilers
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes build-essential pkgconf libelf-dev llvm-14 clang-14 linux-tools-common linux-tools-generic
+          for tool in "clang" "llc" "llvm-strip"
+          do
+            sudo rm -f /usr/bin/$tool
+            sudo ln -s /usr/bin/$tool-14 /usr/bin/$tool
+          done
+        shell: bash
+      - uses: actions/checkout@v3
+      - name: Build
+        run: |
+          make clean
+          make env
+          make
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          #          version: v3.2.0
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          args: --disable-all -E errcheck
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true then the all caching functionality will be complete disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
+
+          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
+      - name: Build NOCORE
+        run: |
+          make clean
+          make env
+          make nocore
+      - name: Test
+        run: go test -v ./...
+
+  build-on-ubuntu2204-arm64:
+    runs-on: ubuntu-22.04
+    name: build on ubuntu-22.04 arm64
+    # Run steps on a matrix of 3 arch/distro combinations
+    strategy:
+      matrix:
+        include:
+          - arch: aarch64
+            distro: ubuntu22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          set-safe-directory: '/source_code'
+      - name: Branch Name
+        run: |
+          echo running on branch ${{ github.ref_name }}
+          echo checkout directory ${GITHUB_WORKSPACE}
+          echo PWD directory ${PWD}
+      - name: Write File
+        uses: DamianReeves/write-file-action@v1.0
+        with:
+          path: ./bin/release_notes.txt
+          contents: |
+            "just for CI"
+          write-mode: append
+      - uses: uraimo/run-on-arch-action@v2
+        name: Build artifact
+        id: build
+        with:
+          arch: ${{ matrix.arch }}
+          distro: ${{ matrix.distro }}
+
+          # Not required, but speeds up builds
+          githubToken: ${{ github.token }}
+
+          # Create an artifacts directory
+          setup: |
+            mkdir -p "${PWD}/artifacts"
+
+          # Mount the artifacts directory as /artifacts in the container
+          dockerRunArgs: |
+            --volume "${PWD}/artifacts:/artifacts"
+            --volume "${GITHUB_WORKSPACE}:/source_code"
+
+          # Pass some environment variables to the container
+          env: | # YAML, but pipe character is necessary
+            artifact_name: ecapture-${{ steps.get_tags.outputs.VERSION }}
+
+          # The shell to run commands with in the container
+          shell: /bin/sh
+
+          # Install some dependencies in the container. This speeds up builds if
+          # you are also using githubToken. Any dependencies installed here will
+          # be part of the container image that gets cached, so subsequent
+          # builds don't have to re-install them. The image layer is cached
+          # publicly in your project's package repository, so it is vital that
+          # no secrets are present in the container state or logs.
+          install: |
+            uname -a
+            apt-get update
+            apt-get install --yes wget git golang build-essential pkgconf libelf-dev llvm-14 clang-14  linux-tools-generic linux-tools-common
+          # Produce a binary artifact and place it in the mounted volume
+          run: |
+            uname -a
+            date
+            export PATH=$PATH:/usr/local/bin
+            for tool in "clang" "llc" "llvm-strip"
+            do
+            rm -f /usr/bin/$tool
+            ln -s /usr/bin/$tool-14 /usr/bin/$tool
+            done
+            clang --version
+            which bpftool
+            echo "cat /proc/1/cgroup:"
+            cat /proc/1/cgroup
+            echo "cat /proc/1/sched:"
+            cat /proc/1/sched
+            git config --global --add safe.directory /source_code
+            cd /source_code
+            echo "-------------------start: Create ecapture.tar.gz of Linux -------------------"
+            make env
+            make clean
+            make
+            echo "-------------------ecapture --help-------------------"
+            bin/ecapture -v
+            echo "-------------------create tar.gz file-------------------"
+            UNAME_M=`uname -m`
+            OUTPUT_DIR="./bin"
+            SNAPSHOT_VERSION=${{ steps.get_tags.outputs.VERSION }}
+            echo "#${SNAPSHOT_VERSION}#"
+            if [ -z "${SNAPSHOT_VERSION}" ]; then
+              SNAPSHOT_VERSION="v0.0.0"
+            fi
+            TAR_DIR=ecapture-${SNAPSHOT_VERSION}-linux-${UNAME_M}
+            RELEASE_NOTES=${OUTPUT_DIR}/release_notes.txt
+            OUT_ARCHIVE=${OUTPUT_DIR}/${artifact_name}-linux-${{ matrix.arch }}.tar.gz
+            mkdir -p ${TAR_DIR}
+            cp LICENSE ${TAR_DIR}/LICENSE
+            cp CHANGELOG.md ${TAR_DIR}/CHANGELOG.md
+            cp README.md ${TAR_DIR}/README.md
+            cp README_CN.md ${TAR_DIR}/README_CN.md
+            cp ${OUTPUT_DIR}/ecapture ${TAR_DIR}/ecapture
+            cp ${OUTPUT_DIR}/release_notes.txt ${TAR_DIR}/release_notes.txt
+            tar  -czf ${OUT_ARCHIVE} ${TAR_DIR}
+            cp ${OUT_ARCHIVE} "/artifacts/"
+            echo "-------------------end: Create ecapture.tar.gz of Linux -------------------"
+            echo "-------------------start: Create ecapture.tar.gz of Android kernel CO:RE -------------------"
+            make env
+            make clean
+            ANDROID=1 make
+            echo "-------------------ecapture --help-------------------"
+            echo "bin/ecapture -v"
+            echo "-------------------create tar.gz file-------------------"
+            UNAME_M=`uname -m`
+            OUTPUT_DIR="./bin"
+            SNAPSHOT_VERSION=${{ steps.get_tags.outputs.VERSION }}
+            echo "#${SNAPSHOT_VERSION}#"
+            if [ -z "${SNAPSHOT_VERSION}" ]; then
+              SNAPSHOT_VERSION="v0.0.0"
+            fi
+            TAR_DIR=ecapture-${SNAPSHOT_VERSION}-android_gki-${UNAME_M}
+            RELEASE_NOTES=${OUTPUT_DIR}/release_notes.txt
+            OUT_ARCHIVE=${OUTPUT_DIR}/${artifact_name}-android_core-${{ matrix.arch }}.tar.gz
+            mkdir -p ${TAR_DIR}
+            cp LICENSE ${TAR_DIR}/LICENSE
+            cp CHANGELOG.md ${TAR_DIR}/CHANGELOG.md
+            cp README.md ${TAR_DIR}/README.md
+            cp README_CN.md ${TAR_DIR}/README_CN.md
+            cp ${OUTPUT_DIR}/ecapture ${TAR_DIR}/ecapture
+            cp ${OUTPUT_DIR}/release_notes.txt ${TAR_DIR}/release_notes.txt
+            tar  -czf ${OUT_ARCHIVE} ${TAR_DIR}
+            cp ${OUT_ARCHIVE} "/artifacts/"
+            echo "-------------------end: Create ecapture.tar.gz of Android kernel CO:RE -------------------"
+            echo "Produced artifact at /artifacts/${artifact_name}"
+
+      - name: Show the artifact
+        # Items placed in /artifacts in the container will be in
+        # ${PWD}/artifacts on the host.
+        run: |
+          ls -al "${PWD}/artifacts"