fix: make CI pipeline and sidecar builds work on all platforms

- Move sqlmap-bundle.py and sqlmap-bundle.spec into scripts/ so they
  are part of the repo (CI can access them without external files)
- Remove hardcoded target_arch='arm64' from spec, auto-detect platform
- Use SQLMAP_ROOT env var to decouple spec from sqlmap directory location
- Rewrite build-sidecar.sh to set SQLMAP_ROOT and use scripts/ spec
- Rewrite GitHub Actions workflow:
  - Single job per platform (sidecar + app build in sequence)
  - Clone sqlmap inside the workspace
  - Collect DMG/deb/AppImage/MSI/EXE artifacts
  - Create GitHub Release with all platform installers
- Update updater endpoint to javierpr0/sqlmap-ui
- Add build/ to .gitignore (PyInstaller temp directory)

Author: javierpr0

.github/workflows/build.yml

@@ -5,65 +5,54 @@ on:
     tags:
       - 'v*'
 
+permissions:
+  contents: write
+
 jobs:
-  build-sidecar:
+  build:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: macos-latest
             target: aarch64-apple-darwin
+            label: macOS-arm64
           - os: macos-13
             target: x86_64-apple-darwin
+            label: macOS-x86_64
           - os: ubuntu-22.04
             target: x86_64-unknown-linux-gnu
+            label: Linux-x86_64
           - os: windows-latest
             target: x86_64-pc-windows-msvc
+            label: Windows-x86_64
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
+      # -- Python + PyInstaller for sidecar --
       - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
-      - name: Clone sqlmap
-        run: git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap
-        working-directory: ..
-
-      - name: Copy build files to sqlmap
-        run: |
-          cp ../sqlmap-bundle.py ../sqlmap/ 2>/dev/null || true
-          cp ../sqlmap-bundle.spec ../sqlmap/ 2>/dev/null || true
-        shell: bash
-
       - name: Install PyInstaller
         run: pip install pyinstaller
 
+      - name: Clone sqlmap
+        run: git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap
+        working-directory: ${{ github.workspace }}
+
       - name: Build sidecar
         run: bash scripts/build-sidecar.sh
+        env:
+          SQLMAP_ROOT: ${{ github.workspace }}/sqlmap
+        shell: bash
 
-      - uses: actions/upload-artifact@v4
-        with:
-          name: sidecar-${{ matrix.target }}
-          path: src-tauri/binaries/sqlmap-sidecar-*
-
-  build-app:
-    needs: build-sidecar
-    strategy:
-      matrix:
-        include:
-          - os: macos-latest
-            target: aarch64-apple-darwin
-          - os: macos-13
-            target: x86_64-apple-darwin
-          - os: ubuntu-22.04
-            target: x86_64-unknown-linux-gnu
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
+      - name: Verify sidecar
+        run: ls -la src-tauri/binaries/
+        shell: bash
 
+      # -- Node + Rust for Tauri --
       - uses: pnpm/action-setup@v4
         with:
           version: 10
@@ -79,30 +68,55 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: sidecar-${{ matrix.target }}
-          path: src-tauri/binaries/
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: Make sidecar executable
         if: runner.os != 'Windows'
         run: chmod +x src-tauri/binaries/sqlmap-sidecar-*
 
       - run: pnpm install
 
-      - run: pnpm tauri build
-        env:
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+      - name: Build Tauri app
+        run: pnpm tauri build
+
+      # -- Collect artifacts --
+      - name: Collect release artifacts
+        id: artifacts
+        run: |
+          mkdir -p release-artifacts
+          # macOS
+          cp src-tauri/target/release/bundle/dmg/*.dmg release-artifacts/ 2>/dev/null || true
+          # Linux
+          cp src-tauri/target/release/bundle/deb/*.deb release-artifacts/ 2>/dev/null || true
+          cp src-tauri/target/release/bundle/appimage/*.AppImage release-artifacts/ 2>/dev/null || true
+          # Windows
+          cp src-tauri/target/release/bundle/msi/*.msi release-artifacts/ 2>/dev/null || true
+          cp src-tauri/target/release/bundle/nsis/*.exe release-artifacts/ 2>/dev/null || true
+          ls -lh release-artifacts/
+        shell: bash
 
       - uses: actions/upload-artifact@v4
         with:
-          name: app-${{ matrix.target }}
-          path: |
-            src-tauri/target/release/bundle/**/*.dmg
-            src-tauri/target/release/bundle/**/*.app
-            src-tauri/target/release/bundle/**/*.deb
-            src-tauri/target/release/bundle/**/*.AppImage
-            src-tauri/target/release/bundle/**/*.msi
-            src-tauri/target/release/bundle/**/*.exe
+          name: release-${{ matrix.label }}
+          path: release-artifacts/*
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+          merge-multiple: true
+
+      - name: List all artifacts
+        run: find artifacts -type f | sort
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: artifacts/**/*
+          generate_release_notes: true
+          draft: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 
 # Build output
 dist/
+build/
 
 # Rust / Tauri
 src-tauri/target/

scripts/build-sidecar.sh

@@ -1,60 +1,85 @@
 #!/bin/bash
 # Build sqlmap sidecar for the current platform.
-# Run this on each target OS (macOS, Linux, Windows) to produce the correct binary.
+#
+# Prerequisites:
+#   - Python 3 with PyInstaller installed (pip install pyinstaller)
+#   - sqlmap cloned somewhere on disk
 #
 # Usage:
-#   ./scripts/build-sidecar.sh
+#   SQLMAP_ROOT=/path/to/sqlmap ./scripts/build-sidecar.sh
 #
-# Output goes to src-tauri/binaries/sqlmap-sidecar-{target-triple}
+# If SQLMAP_ROOT is not set, it looks for sqlmap in ../sqlmap relative to the project.
+# Output: src-tauri/binaries/sqlmap-sidecar-{target-triple}
 
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
-SQLMAP_DIR="$(dirname "$PROJECT_DIR")/sqlmap"
 BINARIES_DIR="$PROJECT_DIR/src-tauri/binaries"
 
+# Resolve sqlmap root
+if [ -z "$SQLMAP_ROOT" ]; then
+  SQLMAP_ROOT="$(dirname "$PROJECT_DIR")/sqlmap"
+fi
+
+export SQLMAP_ROOT
+
+# Validate
+if [ ! -f "$SQLMAP_ROOT/sqlmap.py" ]; then
+  echo "Error: sqlmap.py not found at $SQLMAP_ROOT"
+  echo "Clone sqlmap first: git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git $SQLMAP_ROOT"
+  exit 1
+fi
+
 # Detect target triple
-case "$(uname -s)-$(uname -m)" in
-  Darwin-arm64)  TARGET="aarch64-apple-darwin" ;;
-  Darwin-x86_64) TARGET="x86_64-apple-darwin" ;;
-  Linux-x86_64)  TARGET="x86_64-unknown-linux-gnu" ;;
-  Linux-aarch64) TARGET="aarch64-unknown-linux-gnu" ;;
+case "$(uname -s)" in
+  Darwin)
+    case "$(uname -m)" in
+      arm64)  TARGET="aarch64-apple-darwin" ;;
+      x86_64) TARGET="x86_64-apple-darwin" ;;
+      *)      echo "Unsupported macOS arch: $(uname -m)"; exit 1 ;;
+    esac
+    ;;
+  Linux)
+    case "$(uname -m)" in
+      x86_64)  TARGET="x86_64-unknown-linux-gnu" ;;
+      aarch64) TARGET="aarch64-unknown-linux-gnu" ;;
+      *)       echo "Unsupported Linux arch: $(uname -m)"; exit 1 ;;
+    esac
+    ;;
   MINGW*|MSYS*|CYGWIN*)
     case "$(uname -m)" in
       x86_64) TARGET="x86_64-pc-windows-msvc" ;;
       *)      TARGET="aarch64-pc-windows-msvc" ;;
     esac
     ;;
-  *) echo "Unsupported platform: $(uname -s)-$(uname -m)"; exit 1 ;;
+  *) echo "Unsupported OS: $(uname -s)"; exit 1 ;;
 esac
 
-echo "Building sqlmap sidecar for: $TARGET"
-echo "sqlmap directory: $SQLMAP_DIR"
-echo "Output: $BINARIES_DIR/sqlmap-sidecar-$TARGET"
+echo "=== Building sqlmap sidecar ==="
+echo "Platform:    $TARGET"
+echo "sqlmap:      $SQLMAP_ROOT"
+echo "Spec:        $SCRIPT_DIR/sqlmap-bundle.spec"
+echo "Output:      $BINARIES_DIR/sqlmap-sidecar-$TARGET"
+echo ""
 
-if [ ! -f "$SQLMAP_DIR/sqlmap-bundle.spec" ]; then
-  echo "Error: $SQLMAP_DIR/sqlmap-bundle.spec not found"
-  echo "Make sure sqlmap is cloned next to sqlmap-ui/"
-  exit 1
-fi
+mkdir -p "$BINARIES_DIR"
 
-cd "$SQLMAP_DIR"
-
-python3 -m PyInstaller sqlmap-bundle.spec \
+python3 -m PyInstaller "$SCRIPT_DIR/sqlmap-bundle.spec" \
   --distpath "$BINARIES_DIR" \
+  --workpath "$PROJECT_DIR/build/pyinstaller" \
   --clean -y
 
-# Rename to include target triple
+# Rename binary to include target triple
 if [ -f "$BINARIES_DIR/sqlmap-sidecar" ]; then
   mv "$BINARIES_DIR/sqlmap-sidecar" "$BINARIES_DIR/sqlmap-sidecar-$TARGET"
-  echo "Success: $BINARIES_DIR/sqlmap-sidecar-$TARGET"
-  ls -lh "$BINARIES_DIR/sqlmap-sidecar-$TARGET"
 elif [ -f "$BINARIES_DIR/sqlmap-sidecar.exe" ]; then
   mv "$BINARIES_DIR/sqlmap-sidecar.exe" "$BINARIES_DIR/sqlmap-sidecar-$TARGET.exe"
-  echo "Success: $BINARIES_DIR/sqlmap-sidecar-$TARGET.exe"
-  ls -lh "$BINARIES_DIR/sqlmap-sidecar-$TARGET.exe"
 else
   echo "Error: sidecar binary not found after build"
   exit 1
 fi
+
+echo ""
+echo "=== Success ==="
+ls -lh "$BINARIES_DIR/sqlmap-sidecar-$TARGET"* 2>/dev/null

scripts/sqlmap-bundle.py

@@ -0,0 +1,39 @@
+"""
+Entry point for PyInstaller bundle.
+Patches broken MySQLdb, overrides modulePath for frozen builds, then runs sqlmap.
+"""
+import sys
+import os
+import types
+
+# Block broken MySQLdb import
+fake_mysqldb = types.ModuleType("MySQLdb")
+fake_mysqldb.version_info = (0, 0, 0)
+fake_mysqldb._mysql = types.ModuleType("MySQLdb._mysql")
+fake_mysqldb._mysql.version_info = (0, 0, 0)
+fake_mysqldb._mysql.__file__ = ""
+sys.modules["MySQLdb"] = fake_mysqldb
+sys.modules["MySQLdb._mysql"] = fake_mysqldb._mysql
+
+# When running as a PyInstaller bundle, _MEIPASS points to the extracted dir
+if getattr(sys, 'frozen', False):
+    bundle_dir = sys._MEIPASS
+else:
+    bundle_dir = os.path.dirname(os.path.abspath(__file__))
+
+os.chdir(bundle_dir)
+sys.path.insert(0, bundle_dir)
+
+# Patch sqlmap's modulePath to return _MEIPASS instead of exe directory
+import sqlmap as sqlmap_module
+sqlmap_module.modulePath = lambda: bundle_dir
+
+# Also patch weAreFrozen so setPaths reads from _MEIPASS
+from lib.core import common as common_module
+_original_modulePath = common_module.getUnicode if hasattr(common_module, 'getUnicode') else str
+
+# Override modulePath at the common level too if it exists
+if hasattr(common_module, 'modulePath'):
+    common_module.modulePath = lambda: bundle_dir
+
+sqlmap_module.main()