merge v0.1.0 patch2

Author: M09Ic

.github/workflows/generate.yaml

@@ -62,7 +62,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_PAT }}
           submodules: recursive
 
       - name: Judge target_triple is win
@@ -73,11 +73,6 @@ jobs:
             echo "is_win=0" >> $GITHUB_ENV
           fi
 
-      - name: Install win kit lib
-        run: | 
-          wget https://github.com/chainreactors/malefic/releases/latest/download/resources.zip
-          unzip resources.zip -d resources
-
       - name: Generate config.yaml
         if : ${{ github.event.inputs.malefic_config_yaml != null }}
         run: |
@@ -133,4 +128,4 @@ jobs:
         with:
           name: malefic-${{matrix.target}}-${{ github.run_id }}
           path: output/*
-          retention-days: 3 # you can change this value
+          retention-days: 3 # you can change this value

.github/workflows/release.yml

@@ -1,19 +1,9 @@
-name: release
+name: release_config_and_modules
 
 on:
   push:
     tags:
       - 'v*.*.*'
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'The tag name for the release'
-        required: true
-        default: 'v0.0.1'
-      draft:
-        description: 'Create a draft release'
-        required: false
-        default: 'true'
 
 permissions:
   contents: write
@@ -28,107 +18,96 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          token: ${{ secrets.GH_PAT }}
 
       - name: Set Version
         id: set_version
         run: |
-          if [ "${{ github.event_name }}" == "push" ]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          else
-            VERSION=${{ inputs.tag_name }}
-          fi
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Create release
         id: create_release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           tag_name: ${{ steps.set_version.outputs.VERSION }}
           release_name: Release ${{ steps.set_version.outputs.VERSION }}
           body: |
             Release ${{ steps.set_version.outputs.VERSION }}
-          draft: true
+          draft: false
           prerelease: false
 
-      - name: Download win-kit resources
-        uses: robinraju/release-downloader@v1.11
-        with:
-          repository: "chainreactors/malefic-win-kit"
-          latest: true
-          fileName: "community_resource.zip"
-          token: ${{ secrets.PAT_TOKEN }}
-
-      - name: Download rem lib
-        uses: robinraju/release-downloader@v1.11
-        with:
-          repository: "chainreactors/rem-community"
-          latest: true
-          fileName: "rem_lib.zip"
-          token: ${{ secrets.PAT_TOKEN }}
-
-      - name: Extract zip
-        run: |
-          unzip community_resource.zip -d community_resource
-          unzip rem_lib.zip -d rem_lib
-          mkdir resources_dir
-          mv community_resource/* resources_dir/
-          mv rem_lib/dist/lib/*.a resources_dir/
-          cd resources_dir
-          zip -r ../resources.zip ./*
-          cd ..
-
-      - name: Upload resources
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run : |
-          gh release upload ${{ steps.set_version.outputs.VERSION }} resources.zip
-
-  release-mutant:
+  config-release:
     needs: create-release
     runs-on: ubuntu-22.04
     continue-on-error: true
     strategy:
       matrix:
         target:
-          - x86_64-pc-windows-gnu
-          #          - i686-pc-windows-msvc
+          - x86_64-pc-windows-msvc
+          - i686-pc-windows-msvc
           - x86_64-unknown-linux-musl
-          #          - i686-unknown-linux-musl
+          - i686-unknown-linux-musl
           - x86_64-apple-darwin
           - aarch64-apple-darwin
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          token: ${{ secrets.GH_PAT }}
+
+      - name: Create output directory
+        run: |
+          mkdir -p output/
 
       - name: Build malefic-mutant for ${{matrix.target}}
         shell: 'script --return --quiet --log-out /dev/null --command "bash -e {0}"'
         run: |
-          mkdir -p output/
+          
+          docker run -v "$(pwd):/root/src" --rm -it ghcr.io/chainreactors/${{matrix.target}}:nightly-2024-08-16-latest \
+            cargo build --release -p malefic-mutant --target ${{matrix.target}}  
+          sudo chmod -R 777 target
+          
+          target_dir="target/${{matrix.target}}/release"
           binary_name="malefic-mutant"
-          release_dir="release"
-          target_dir="target/${{matrix.target}}/${release_dir}"
-          docker run -v "$(pwd):/root/src" --rm -it ghcr.io/chainreactors/malefic-builder:v0.0.4 \
-            cargo build --release -p malefic-mutant --target ${{matrix.target}}
           
-          sudo chmod 777 -R target/
           if [[ -f ${target_dir}/${binary_name}.exe ]]; then
             mv ${target_dir}/${binary_name}.exe output/${binary_name}-${{matrix.target}}.exe
           else
             mv ${target_dir}/${binary_name} output/${binary_name}-${{matrix.target}}
           fi
 
+      - name: Build malefic-modules for ${{matrix.target}}
+        if: ${{ contains(matrix.target, 'windows') }}
+        shell: 'script --return --quiet --log-out /dev/null --command "bash -e {0}"'
+        run: |
+          docker run -v "$(pwd):/root/src" --rm -it ghcr.io/chainreactors/${{matrix.target}}:nightly-2024-08-16-latest bash -c "\
+            cargo build --release -p malefic-mutant && \
+            ./target/release/malefic-mutant generate modules "base" && \
+            cargo build --release -p malefic-modules --features "base" --target ${{matrix.target}} && 
+            mv target/${{matrix.target}}/release/modules.dll output/modules-base-${{matrix.target}}.dll && \
+            ./target/release/malefic-mutant generate modules "extend" && \
+            cargo build --release -p malefic-modules --features "extend" --target ${{matrix.target}} && 
+            mv target/${{matrix.target}}/release/modules.dll output/modules-extend-${{matrix.target}}.dll && \
+            ./target/release/malefic-mutant generate modules "full" && \
+            cargo build --release -p malefic-modules --features "full" --target ${{matrix.target}} && 
+            mv target/${{matrix.target}}/release/modules.dll output/modules-full-${{matrix.target}}.dll "
+
+      - name: Chmod output
+        run: |
+          sudo chmod -R 777 output
+
       - name: Release ${{ matrix.target }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cd output
-          for file in *; do
+          for file in output/*; do
             filename=$(basename "$file")
-            echo "Uploading $filename"
-            gh release upload ${{ needs.create-release.outputs.VERSION }} $filename
+            echo "Uploading $file"
+            sha256sum $file >> $file.sha256
+            gh release upload ${{ needs.create-release.outputs.VERSION }} $file.sha256
+            gh release upload ${{ needs.create-release.outputs.VERSION }} $file
           done
         shell: bash

.github/workflows/test.yaml

@@ -0,0 +1,45 @@
+name: validate
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+permissions:
+  contents: write
+
+jobs:
+  generate:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        target: ["x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "aarch64-apple-darwin"]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GH_PAT }}
+          submodules: recursive
+          
+      - name: Authorize Git
+        run: |
+          git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config --global user.name "$GITHUB_ACTOR"
+          
+      - name: Update submodule
+        run: |
+          git submodule update  --init --recursive --remote -f
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+
+      - name: Build for ${{matrix.target}})
+        shell: 'script --return --quiet --log-out /dev/null --command "bash -e {0}"'
+        run: |
+          docker run -v $(pwd):/root/src ghcr.io/chainreactors/malefic-builder:latest \
+           bash -c "cargo build --release -p malefic-mutant && ./target/release/malefic-mutant generate beacon -s && ./target/release/malefic-mutant build malefic --target ${{matrix.target}}"
+          
+      - name: Build completed
+        run: |
+          echo "Build for ${{matrix.target}} completed successfully"

config.yaml

@@ -4,7 +4,7 @@ basic:
     - "127.0.0.1:5001"
   protocol: "tcp"
   tls: false
-  proxy:
+  proxy: 
   interval: 5
   jitter: 0.2
   ca:
@@ -14,11 +14,12 @@ basic:
     link:
   http:
     method: "POST"
-    path: "/pulse"
+    path: "/jquery.js"
     host: "127.0.0.1"
     version: "1.1"
     headers:
       User-Agent: "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.0"
+      Content-Type: "application/octet-stream"
       #any-header: any-value
 build:
   zigbuild: false

malefic-core/Cargo.toml

@@ -13,6 +13,10 @@ register_info = []
 tcp = []
 tls = ["async-tls", "rustls", "rustls-pemfile"]
 
+proxy = []
+http_proxy = ["httparse"]
+socks5_proxy = []
+
 # export transport feature
 transport_http = ["httparse", "tcp"]
 transport_tcp = ["tcp"]
@@ -30,7 +34,8 @@ lazy_static = "1.5.0"
 anyhow = "1.0.86"
 thiserror = "1.0.64"
 obfstr = "0.4.3"
-httparse = { version = "1.8", optional = true }
+httparse = { version = "1.8" , optional = true}
+
 
 # Runtime
 async-std = { version = "1.13.0", features = ["unstable", "attributes"], optional = true }
@@ -48,4 +53,5 @@ malefic-helper = { path= "../malefic-helper", features = [ "default" ] }
 malefic-proto = { path = "../malefic-proto" }
 malefic-modules = { path = "../malefic-modules"}
 malefic-3rd = { path = "../malefic-3rd" , optional = true}
+base64 = "0.22"
 

malefic-core/src/manager/internal.rs

@@ -33,8 +33,8 @@ pub enum InternalModule {
     Sleep,
     #[strum(serialize = "suicide")]
     Suicide,
-    #[strum(serialize = "login")]
-    Login,
+    #[strum(serialize = "switch")]
+    Switch,
 }
 
 impl InternalModule {
@@ -55,7 +55,7 @@ impl InternalModule {
             InternalModule::ListTask,
             InternalModule::Sleep,
             InternalModule::Suicide,
-            InternalModule::Login,
+            InternalModule::Switch,
         ]
             .iter()
             .map(|m| m.to_string()) // Display 自动提供 to_string() 方法

malefic-core/src/transport/mod.rs

@@ -5,6 +5,9 @@ pub mod http;
 #[cfg(feature = "transport_rem")]
 pub mod rem;
 
+#[cfg(feature = "proxy")]
+pub mod proxie;
+
 use anyhow::Result;
 use async_trait::async_trait;
 use futures::lock::Mutex;