SamNet-dev/paqctl
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove microsocks from GFK client, use tunnel port for SOCKS5

Browse Source 
microsocks was a standalone SOCKS5 proxy started alongside the GFK
QUIC tunnel but had no awareness of it — traffic went directly to
the internet, bypassing the tunnel entirely. The correct SOCKS5
entry point is the VIO port from tcp_port_mapping, which tunnels
through QUIC to xray's SOCKS5 inbound on the server.

- Remove microsocks startup from both GFK client wrappers
- Fix all SOCKS5 port displays to use VIO port from GFK_PORT_MAPPINGS
- Update health check to validate the actual tunnel SOCKS5 port
- Fix hardcoded port in dashboard status line
- Regenerate client wrapper on update to clean up existing installs
- Remove microsocks install step and SOCKS5 port prompt for GFK
This commit is contained in:
SamNet-dev
2026-02-08 00:40:44 -06:00
parent ee0d8ea0f8
commit fc01fead8c
1 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
paqctl.sh
View File

@@ -573,7 +573,7 @@ run_config_wizard() {
# Backend selection # Backend selection
echo -e "${BOLD}Select backend:${NC}" echo -e "${BOLD}Select backend:${NC}"
echo " 1. paqet (Go/KCP, built-in SOCKS5, single binary)" echo " 1. paqet (Go/KCP, built-in SOCKS5, single binary)"
echo " 2. gfw-knocker (Python/QUIC, port forwarding + microsocks)" echo " 2. gfw-knocker (Python/QUIC, port forwarding + SOCKS5)"
echo "" echo ""
local backend_choice local backend_choice
read -p " Enter choice [1/2]: " backend_choice < /dev/tty || true read -p " Enter choice [1/2]: " backend_choice < /dev/tty || true
@@ -832,17 +832,6 @@ _wizard_gfk() {
echo -e "${BOLD}TCP port mappings${NC} (must match server) [14000:443]:" echo -e "${BOLD}TCP port mappings${NC} (must match server) [14000:443]:"
read -p " Mappings: " input < /dev/tty || true read -p " Mappings: " input < /dev/tty || true
GFK_PORT_MAPPINGS="${input:-14000:443}" GFK_PORT_MAPPINGS="${input:-14000:443}"
# SOCKS5 port via microsocks
echo ""
echo -e "${BOLD}SOCKS5 listen port${NC} (via microsocks) [1080]:"
read -p " SOCKS port: " input < /dev/tty || true
MICROSOCKS_PORT="${input:-1080}"
if ! _validate_port "$MICROSOCKS_PORT"; then
log_warn "Invalid port. Using default 1080."
MICROSOCKS_PORT=1080
fi
SOCKS_PORT="$MICROSOCKS_PORT"
fi fi
# Generate GFK config # Generate GFK config
@@ -1750,24 +1739,20 @@ PYEOF
create_gfk_client_wrapper() { create_gfk_client_wrapper() {
log_info "Creating GFW-knocker client wrapper..." log_info "Creating GFW-knocker client wrapper..."
local wrapper="$INSTALL_DIR/bin/gfk-client.sh" local wrapper="$INSTALL_DIR/bin/gfk-client.sh"
local msport="${MICROSOCKS_PORT:-1080}"
mkdir -p "$INSTALL_DIR/bin" mkdir -p "$INSTALL_DIR/bin"
cat > "$wrapper" << 'WRAPEOF' cat > "$wrapper" << 'WRAPEOF'
#!/bin/bash #!/bin/bash
set -e set -e
GFK_DIR="REPLACE_ME_GFK_DIR" GFK_DIR="REPLACE_ME_GFK_DIR"
INSTALL_DIR="REPLACE_ME_INSTALL_DIR" INSTALL_DIR="REPLACE_ME_INSTALL_DIR"
MICROSOCKS_PORT="REPLACE_ME_MSPORT"
cd "$GFK_DIR" cd "$GFK_DIR"
"$INSTALL_DIR/venv/bin/python" mainclient.py & "$INSTALL_DIR/venv/bin/python" mainclient.py &
PID1=$! PID1=$!
"$INSTALL_DIR/bin/microsocks" -i 127.0.0.1 -p "$MICROSOCKS_PORT" & trap "kill $PID1 2>/dev/null; wait" EXIT INT TERM
PID2=$!
trap "kill $PID1 $PID2 2>/dev/null; wait" EXIT INT TERM
wait wait
WRAPEOF WRAPEOF
sed "s#REPLACE_ME_GFK_DIR#${GFK_DIR}#g; s#REPLACE_ME_INSTALL_DIR#${INSTALL_DIR}#g; s#REPLACE_ME_MSPORT#${msport}#g" "$wrapper" > "$wrapper.sed" && mv "$wrapper.sed" "$wrapper" sed "s#REPLACE_ME_GFK_DIR#${GFK_DIR}#g; s#REPLACE_ME_INSTALL_DIR#${INSTALL_DIR}#g" "$wrapper" > "$wrapper.sed" && mv "$wrapper.sed" "$wrapper"
chmod 755 "$wrapper" chmod 755 "$wrapper"
log_success "Client wrapper created at $wrapper" log_success "Client wrapper created at $wrapper"
} }
@@ -2699,23 +2684,19 @@ PYEOF
create_gfk_client_wrapper() { create_gfk_client_wrapper() {
local wrapper="$INSTALL_DIR/bin/gfk-client.sh" local wrapper="$INSTALL_DIR/bin/gfk-client.sh"
local msport="${MICROSOCKS_PORT:-1080}"
mkdir -p "$INSTALL_DIR/bin" mkdir -p "$INSTALL_DIR/bin"
cat > "$wrapper" << 'WEOF' cat > "$wrapper" << 'WEOF'
#!/bin/bash #!/bin/bash
set -e set -e
GFK_DIR="REPLACE_GFK" GFK_DIR="REPLACE_GFK"
INSTALL_DIR="REPLACE_INST" INSTALL_DIR="REPLACE_INST"
MICROSOCKS_PORT="REPLACE_MSP"
cd "$GFK_DIR" cd "$GFK_DIR"
"$INSTALL_DIR/venv/bin/python" mainclient.py & "$INSTALL_DIR/venv/bin/python" mainclient.py &
PID1=$! PID1=$!
"$INSTALL_DIR/bin/microsocks" -i 127.0.0.1 -p "$MICROSOCKS_PORT" & trap "kill $PID1 2>/dev/null; wait" EXIT INT TERM
PID2=$!
trap "kill $PID1 $PID2 2>/dev/null; wait" EXIT INT TERM
wait wait
WEOF WEOF
sed "s#REPLACE_GFK#${GFK_DIR}#g; s#REPLACE_INST#${INSTALL_DIR}#g; s#REPLACE_MSP#${msport}#g" "$wrapper" > "$wrapper.sed" && mv "$wrapper.sed" "$wrapper" sed "s#REPLACE_GFK#${GFK_DIR}#g; s#REPLACE_INST#${INSTALL_DIR}#g" "$wrapper" > "$wrapper.sed" && mv "$wrapper.sed" "$wrapper"
chmod 755 "$wrapper" chmod 755 "$wrapper"
} }
@@ -3664,18 +3645,14 @@ health_check() {
fi fi
fi fi
# 7. microsocks (client) # 7. SOCKS5 port (client)
if [ "$ROLE" = "client" ]; then if [ "$ROLE" = "client" ]; then
if [ -x "$INSTALL_DIR/bin/microsocks" ]; then local _socks_vio
echo -e " ${GREEN}✓${NC} microsocks binary found" _socks_vio=$(echo "${GFK_PORT_MAPPINGS:-14000:443}" | cut -d, -f1 | cut -d: -f1)
else if is_running && ss -tlnp 2>/dev/null | grep -q ":${_socks_vio} "; then
echo -e " ${RED}✗${NC} microsocks binary missing" echo -e " ${GREEN}✓${NC} SOCKS5 port ${_socks_vio} is listening"
issues=$((issues + 1))
fi
if is_running && ss -tlnp 2>/dev/null | grep -q ":${MICROSOCKS_PORT:-1080}"; then
echo -e " ${GREEN}✓${NC} SOCKS5 port ${MICROSOCKS_PORT:-1080} is listening"
elif is_running; then elif is_running; then
echo -e " ${RED}✗${NC} SOCKS5 port ${MICROSOCKS_PORT:-1080} not listening" echo -e " ${RED}✗${NC} SOCKS5 port ${_socks_vio} not listening"
issues=$((issues + 1)) issues=$((issues + 1))
fi fi
fi fi
@@ -3856,6 +3833,12 @@ update_gfk() {
fi fi
rm -rf "$tmp_dir" rm -rf "$tmp_dir"
# Regenerate client wrapper (removes legacy microsocks startup)
if [ "$ROLE" = "client" ]; then
create_gfk_client_wrapper
pkill -f "${INSTALL_DIR}/bin/microsocks" 2>/dev/null || true
fi
# Also check for management script updates # Also check for management script updates
update_management_script update_management_script
echo "" echo ""
@@ -4403,14 +4386,6 @@ _change_config_gfk() {
log_error "Invalid flags. Use uppercase letters only: F, S, R, P, A, U, E, C"; return 1 log_error "Invalid flags. Use uppercase letters only: F, S, R, P, A, U, E, C"; return 1
fi fi
[ -n "$input" ] && GFK_TCP_FLAGS="$input" [ -n "$input" ] && GFK_TCP_FLAGS="$input"
echo -e "${BOLD}SOCKS5 port${NC} [${MICROSOCKS_PORT:-1080}]:"
read -p " Port: " input < /dev/tty || true
if [ -n "$input" ] && ! _validate_port "$input"; then
log_error "Invalid port number"; return 1
fi
[ -n "$input" ] && MICROSOCKS_PORT="$input"
SOCKS_PORT="${MICROSOCKS_PORT:-1080}"
fi fi
# Regenerate parameters.py # Regenerate parameters.py
@@ -6065,7 +6040,6 @@ uninstall_paqctl() {
echo -e " This will remove:" echo -e " This will remove:"
if [ "$BACKEND" = "gfw-knocker" ]; then if [ "$BACKEND" = "gfw-knocker" ]; then
echo " - GFW-knocker scripts and config" echo " - GFW-knocker scripts and config"
echo " - microsocks binary"
else else
echo " - paqet binary" echo " - paqet binary"
fi fi
@@ -6702,7 +6676,8 @@ show_menu() {
# GFK status # GFK status
if [ "$gfk_installed" = true ]; then if [ "$gfk_installed" = true ]; then
if is_gfk_running; then if is_gfk_running; then
echo -e " GFK: ${GREEN}● Running${NC} | VIO: ${GFK_VIO_PORT:-45000} | SOCKS5: 127.0.0.1:14000" local _gfk_sv; _gfk_sv=$(echo "${GFK_PORT_MAPPINGS:-14000:443}" | cut -d, -f1 | cut -d: -f1)
echo -e " GFK: ${GREEN}● Running${NC} | VIO: ${GFK_VIO_PORT:-45000} | SOCKS5: 127.0.0.1:${_gfk_sv}"
else else
echo -e " GFK: ${RED}○ Stopped${NC} | VIO: ${GFK_VIO_PORT:-45000}" echo -e " GFK: ${RED}○ Stopped${NC} | VIO: ${GFK_VIO_PORT:-45000}"
fi fi
@@ -7013,7 +6988,6 @@ main() {
generate_gfk_config || { log_error "Failed to regenerate GFK config"; exit 1; } generate_gfk_config || { log_error "Failed to regenerate GFK config"; exit 1; }
fi fi
elif [ "$ROLE" = "client" ]; then elif [ "$ROLE" = "client" ]; then
install_microsocks || { log_error "Failed to install microsocks"; exit 1; }
create_gfk_client_wrapper || { log_error "Failed to create client wrapper"; exit 1; } create_gfk_client_wrapper || { log_error "Failed to create client wrapper"; exit 1; }
fi fi
PAQET_VERSION="$GFK_VERSION_PINNED" PAQET_VERSION="$GFK_VERSION_PINNED"
@@ -7173,11 +7147,13 @@ main() {
fi fi
echo -e "${YELLOW}╚═══════════════════════════════════════════════════════════════╝${NC}" echo -e "${YELLOW}╚═══════════════════════════════════════════════════════════════╝${NC}"
else else
local _socks_vio
_socks_vio=$(echo "${GFK_PORT_MAPPINGS:-14000:443}" | cut -d, -f1 | cut -d: -f1)
echo -e " Server: ${BOLD}${GFK_SERVER_IP}${NC}" echo -e " Server: ${BOLD}${GFK_SERVER_IP}${NC}"
echo -e " SOCKS5: ${BOLD}127.0.0.1:${MICROSOCKS_PORT}${NC}" echo -e " SOCKS5: ${BOLD}127.0.0.1:${_socks_vio}${NC}"
echo "" echo ""
echo -e " ${YELLOW}Test your proxy:${NC}" echo -e " ${YELLOW}Test your proxy:${NC}"
echo -e " ${BOLD} curl --proxy socks5h://127.0.0.1:${MICROSOCKS_PORT} https://httpbin.org/ip${NC}" echo -e " ${BOLD} curl --proxy socks5h://127.0.0.1:${_socks_vio} https://httpbin.org/ip${NC}"
fi fi
elif [ "$ROLE" = "server" ]; then elif [ "$ROLE" = "server" ]; then
echo -e " Port: ${BOLD}${LISTEN_PORT}${NC}" echo -e " Port: ${BOLD}${LISTEN_PORT}${NC}"