mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2026-11-20 12:43:17 +01:00
+1






![dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)


DaanSelen
GitHub
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
neolegshishov
unixro
LEE Kai-Ze
Mikhail Solovev
Evgeny Volferts
Theroxenes
torms
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
8d21152947
* Fix: batch IP geolocation requests (limit 100), add deduplication and caching (#1232) - Added batching of IP addresses into chunks of 100 to comply with ip-api limits - Implemented deduplication to avoid repeated geolocation requests for identical IPs - Added in-memory cache to reuse results across batches - Preserved original order and length of geolocation list in API response - Improved error handling around external API failures * fix: addPeers uses OverridePeerSettings for DNS and AllowedIPs fallback (#1310) * fix: addPeers uses OverridePeerSettings for DNS and AllowedIPs fallback When adding a peer via the API without explicit DNS or endpoint_allowed_ip values, the endpoint fell back directly to global wg-dashboard.ini defaults, ignoring any per-configuration OverridePeerSettings. This caused new peers to be stored with the wrong DNS and AllowedIPs in the database even when the configuration had overrides set. Resolve by fetching the configuration's OverridePeerSettings before the global defaults. The priority is now: request body → OverridePeerSettings → global default. The existing config lookup that happened later in the function is removed as it is now done earlier. Note: downloadPeer already applied OverridePeerSettings at download time, so client configs were correct; only the stored peer data was affected. * fix: addPeers applies OverridePeerSettings for MTU and PersistentKeepalive Extend the peer-settings priority chain (request body → OverridePeerSettings → global default) to MTU and PersistentKeepalive, matching the same pattern already applied to DNS and EndpointAllowedIPs. * style: align addPeers OverridePeerSettings fallback with project code style * Fix: backup regex, SQL cleanup, and restore metadata conflict (#1324) * fix: backup filename regex dot escaping * fix: delete paired .sql file when removing backup * fix: restore backup metadata conflict * Bug fix. Remove redundant break statement in IP allocation loop. (#1294) * Remove redundant break statement in IP allocation loop. * Fix: append IP to allowed_ips list instead of overwriting it * fix: clean up endpoint history tables on rename and delete (#1367) * Add new AmneziaWG parameters (implemented in 3.0/3.1) (#1363) * fix: add button type to accountSettingsInputPassword submission button (#1321) * fix: handle instantiated SQLAlchemy column types (#1400) * feat(docker): run drop-in scripts from /data/custom-init.d at startup (#1401) Allows users to install additional packages or apply custom setup by placing scripts in /data/custom-init.d, executed in alphabetical order before WGDashboard starts. * fix: handle existing endpoint history table during AmneziaWG restore (#1368) * build(deps): bump pydantic from 2.14.1 to 2.14.2 in /src (#1403) Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.14.1 to 2.14.2. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/v2.14.2/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.14.1...v2.14.2) --- updated-dependencies: - dependency-name: pydantic dependency-version: 2.14.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump @vue/language-server in /src/static/app (#1404) Bumps [@vue/language-server](https://github.com/vuejs/language-tools/tree/HEAD/packages/language-server) from 3.3.13 to 3.3.14. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v3.3.14/packages/language-server) --- updated-dependencies: - dependency-name: "@vue/language-server" dependency-version: 3.3.14 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump axios from 1.20.0 to 1.21.0 in /src/static/client (#1405) Bumps [axios](https://github.com/axios/axios) from 1.20.0 to 1.21.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.20.0...v1.21.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: neolegshishov <143963760+neolegshishov@users.noreply.github.com> Co-authored-by: unixro <mihaivint@users.noreply.github.com> Co-authored-by: LEE Kai-Ze <mail@leekaize.com> Co-authored-by: Mikhail Solovev <mike@solovjov.net> Co-authored-by: Evgeny Volferts <eugene.wolferz@gmail.com> Co-authored-by: Theroxenes <theroxenes@proton.me> Co-authored-by: torms <8841885+torms@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
354 lines
11 KiB
Bash
354 lines
11 KiB
Bash
#!/bin/bash
|
|
|
|
config_file="/data/wg-dashboard.ini"
|
|
runtime_pid=""
|
|
|
|
trap 'stop_service' SIGTERM
|
|
|
|
# Hash password with bcrypt
|
|
hash_password() {
|
|
${WGDASH}/src/venv/bin/python3 -c "import bcrypt; print(bcrypt.hashpw('$1'.encode(), bcrypt.gensalt(12)).decode())"
|
|
}
|
|
|
|
# Function to set or update section/key/value in the INI file
|
|
set_ini() {
|
|
local section="$1" key="$2" value="$3"
|
|
local current_value
|
|
|
|
# Add section if it doesn't exist
|
|
grep -q "^\[${section}\]" "$config_file" \
|
|
|| printf "\n[%s]\n" "${section}" >> "$config_file"
|
|
|
|
# Check current value if key exists
|
|
if grep -q "^[[:space:]]*${key}[[:space:]]*=" "$config_file"; then
|
|
current_value=$(grep "^[[:space:]]*${key}[[:space:]]*=" "$config_file" | cut -d= -f2- | xargs)
|
|
|
|
# Dont display actual value if it's a password field
|
|
if [[ "$key" == *"password"* ]]; then
|
|
if [ "$current_value" = "$value" ]; then
|
|
echo "- $key is already set correctly (value hidden)"
|
|
return 0
|
|
fi
|
|
sed -i "/^\[${section}\]/,/^\[/{s|^[[:space:]]*${key}[[:space:]]*=.*|${key} = ${value}|}" "$config_file"
|
|
echo "- Updated $key (value hidden)"
|
|
else
|
|
if [ "$current_value" = "$value" ]; then
|
|
echo "- $key is already set correctly ($value)"
|
|
return 0
|
|
fi
|
|
sed -i "/^\[${section}\]/,/^\[/{s|^[[:space:]]*${key}[[:space:]]*=.*|${key} = ${value}|}" "$config_file"
|
|
echo "- Updated $key to: $value"
|
|
fi
|
|
else
|
|
sed -i "/^\[${section}\]/a ${key} = ${value}" "$config_file"
|
|
|
|
# Don't display actual value if it's a password field
|
|
if [[ "$key" == *"password"* ]]; then
|
|
echo "- Added new setting $key (value hidden)"
|
|
else
|
|
echo "- Added new setting $key: $value"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
stop_service() {
|
|
echo "[WGDashboard] Stopping WGDashboard..."
|
|
|
|
local max_rounds="10"
|
|
local round="0"
|
|
local runtime_pid=""
|
|
|
|
while true; do
|
|
round=$((round + 1))
|
|
|
|
if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then
|
|
runtime_pid=$(cat ${WGDASH}/src/gunicorn.pid)
|
|
|
|
echo "Running as PID: ${runtime_pid}"
|
|
return 0
|
|
fi
|
|
|
|
if [[ $round -eq $max_rounds ]]; then
|
|
echo "Reached breaking point!"
|
|
return 1
|
|
|
|
fi
|
|
|
|
sleep 0.5s
|
|
done
|
|
|
|
kill $runtime_pid
|
|
exit 0
|
|
}
|
|
|
|
echo "------------------------- START ----------------------------"
|
|
echo "Starting the WGDashboard Docker container."
|
|
|
|
ensure_installation() {
|
|
# Make the wgd.sh script executable.
|
|
chmod +x "${WGDASH}"/src/wgd.sh
|
|
cd "${WGDASH}"/src || exit
|
|
|
|
# Github issue: https://github.com/donaldzou/WGDashboard/issues/723
|
|
echo "Checking for stale pids..."
|
|
if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then
|
|
echo "Found stale pid, removing..."
|
|
rm ${WGDASH}/src/gunicorn.pid
|
|
fi
|
|
|
|
# Removing clear shell command from the wgd.sh script to enhance docker logging.
|
|
echo "Removing clear command from wgd.sh for better Docker logging."
|
|
sed -i '/clear/d' ./wgd.sh
|
|
|
|
# PERSISTENCE FOR databases directory
|
|
# Create required directories and links
|
|
if [ ! -d "/data/db" ]; then
|
|
echo "Creating database dir"
|
|
mkdir -p /data/db
|
|
fi
|
|
|
|
if [[ ! -L "${WGDASH}/src/db" ]] && [[ -d "${WGDASH}/src/db" ]]; then
|
|
echo "Removing ${WGDASH}/src/db since its not a symbolic link."
|
|
rm -rfv "${WGDASH}/src/db"
|
|
fi
|
|
if [[ -L "${WGDASH}/src/db" ]]; then
|
|
echo "${WGDASH}/src/db is a symbolic link."
|
|
else
|
|
ln -sv /data/db "${WGDASH}/src/db"
|
|
fi
|
|
|
|
# PERSISTENCE FOR wg-dashboard-oidc-providers.json
|
|
if [ ! -f "/data/wg-dashboard-oidc-providers.json" ]; then
|
|
echo "Creating wg-dashboard-oidc-providers.json file"
|
|
cp -v /tmp/wg-dashboard-oidc-providers.json.template /data/wg-dashboard-oidc-providers.json
|
|
fi
|
|
if [[ ! -L "${WGDASH}/src/wg-dashboard-oidc-providers.json" ]] && [[ -f "${WGDASH}/src/wg-dashboard-oidc-providers.json" ]]; then
|
|
echo "Removing ${WGDASH}/src/wg-dashboard-oidc-providers.json since its not a symbolic link."
|
|
rm -fv "${WGDASH}/src/wg-dashboard-oidc-providers.json"
|
|
fi
|
|
if [[ -L "${WGDASH}/src/wg-dashboard-oidc-providers.json" ]]; then
|
|
echo "${WGDASH}/src/wg-dashboard-oidc-providers.json is a symbolic link."
|
|
else
|
|
ln -sv /data/wg-dashboard-oidc-providers.json "${WGDASH}/src/wg-dashboard-oidc-providers.json"
|
|
fi
|
|
|
|
# PERSISTENCE FOR wg-dashboard.ini
|
|
if [ ! -f "${config_file}" ]; then
|
|
echo "Creating wg-dashboard.ini file"
|
|
touch "${config_file}"
|
|
fi
|
|
if [[ ! -L "${WGDASH}/src/wg-dashboard.ini" ]] && [[ -f "${WGDASH}/src/wg-dashboard.ini" ]]; then
|
|
echo "Removing ${WGDASH}/src/wg-dashboard.ini since its not a symbolic link."
|
|
rm -fv "${WGDASH}/src/wg-dashboard.ini"
|
|
fi
|
|
if [[ -L "${WGDASH}/src/wg-dashboard.ini" ]]; then
|
|
echo "${WGDASH}/src/wg-dashboard.ini is a symbolic link."
|
|
else
|
|
ln -sv "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
|
|
fi
|
|
|
|
# Setup WireGuard if needed
|
|
if [ -z "$(ls -A /etc/wireguard)" ]; then
|
|
cp -a "/configs/wg0.conf.template" "/etc/wireguard/wg0.conf"
|
|
|
|
echo "Setting a secure private key."
|
|
local privateKey
|
|
privateKey=$(wg genkey)
|
|
sed -i "s|^PrivateKey *=.*$|PrivateKey = ${privateKey}|g" /etc/wireguard/wg0.conf
|
|
|
|
echo "Done setting template."
|
|
else
|
|
echo "Existing wg0 configuration file found, using that."
|
|
fi
|
|
}
|
|
|
|
set_envvars() {
|
|
printf "\n------------- SETTING ENVIRONMENT VARIABLES ----------------\n"
|
|
|
|
# Check if config file is empty
|
|
if [ ! -s "${config_file}" ]; then
|
|
echo "Config file is empty. Creating initial structure."
|
|
elif [[ ${dynamic_config,,} =~ ^(false|no)$ ]]; then
|
|
echo "Dynamic configuration feature turned off, not changing anything"
|
|
return
|
|
fi
|
|
|
|
echo "Checking basic configuration:"
|
|
set_ini Peers peer_global_dns "${global_dns}"
|
|
|
|
if [ -z "${public_ip}" ]; then
|
|
public_ip=$(curl -s https://ifconfig.me)
|
|
if [ -z "${public_ip}" ]; then
|
|
echo "Using fallback public IP resolution website"
|
|
public_ip=$(curl -s https://api.ipify.org)
|
|
fi
|
|
if [ -z "${public_ip}" ]; then
|
|
echo "Failed to resolve publicly. Using private address."
|
|
public_ip=$(hostname -i)
|
|
fi
|
|
echo "Automatically detected public IP: ${public_ip}"
|
|
fi
|
|
|
|
set_ini Peers remote_endpoint "${public_ip}"
|
|
set_ini Server app_port "${wgd_port}"
|
|
|
|
# Account settings - process all parameters
|
|
[[ -n "$username" ]] && echo "Configuring user account:"
|
|
# Basic account variables
|
|
[[ -n "$username" ]] && set_ini Account username "${username}"
|
|
|
|
if [[ -n "$password" ]]; then
|
|
echo "- Setting password"
|
|
set_ini Account password "$(hash_password "${password}")"
|
|
fi
|
|
|
|
# Additional account variables
|
|
[[ -n "$enable_totp" ]] && set_ini Account enable_totp "${enable_totp}"
|
|
[[ -n "$totp_verified" ]] && set_ini Account totp_verified "${totp_verified}"
|
|
[[ -n "$totp_key" ]] && set_ini Account totp_key "${totp_key}"
|
|
|
|
# Welcome session
|
|
[[ -n "$welcome_session" ]] && set_ini Other welcome_session "${welcome_session}"
|
|
# If username and password are set but welcome_session isn't, disable it
|
|
if [[ -n "$username" && -n "$password" && -z "$welcome_session" ]]; then
|
|
set_ini Other welcome_session "false"
|
|
fi
|
|
|
|
# Autostart WireGuard
|
|
if [[ -n "$wg_autostart" ]]; then
|
|
echo "Configuring WireGuard autostart:"
|
|
set_ini WireGuardConfiguration autostart "${wg_autostart}"
|
|
fi
|
|
|
|
# Database (check if any settings need to be configured)
|
|
database_vars=("database_type" "database_host" "database_port" "database_username" "database_password")
|
|
for var in "${database_vars[@]}"; do
|
|
if [ -n "${!var}" ]; then
|
|
echo "Configuring database settings:"
|
|
break
|
|
fi
|
|
done
|
|
|
|
# Database (iterate through all possible fields)
|
|
database_fields=("type:database_type" "host:database_host" "port:database_port"
|
|
"username:database_username" "password:database_password")
|
|
|
|
for field_pair in "${database_fields[@]}"; do
|
|
IFS=: read -r field var <<< "$field_pair"
|
|
[[ -n "${!var}" ]] && set_ini Database "$field" "${!var}"
|
|
done
|
|
|
|
# Email (check if any settings need to be configured)
|
|
email_vars=("email_server" "email_port" "email_encryption" "email_username" "email_password" "email_from" "email_template")
|
|
for var in "${email_vars[@]}"; do
|
|
if [ -n "${!var}" ]; then
|
|
echo "Configuring email settings:"
|
|
break
|
|
fi
|
|
done
|
|
|
|
# Email (iterate through all possible fields)
|
|
email_fields=("server:email_server" "port:email_port" "encryption:email_encryption"
|
|
"username:email_username" "email_password:email_password"
|
|
"send_from:email_from" "email_template:email_template")
|
|
|
|
for field_pair in "${email_fields[@]}"; do
|
|
IFS=: read -r field var <<< "$field_pair"
|
|
[[ -n "${!var}" ]] && set_ini Email "$field" "${!var}"
|
|
done
|
|
}
|
|
|
|
# Run user-provided drop-in scripts, e.g. to install additional packages
|
|
run_custom_init() {
|
|
local init_dir="/data/custom-init.d"
|
|
|
|
[[ -d "$init_dir" ]] || return 0
|
|
|
|
printf "\n------------------ RUNNING CUSTOM SCRIPTS ------------------\n"
|
|
|
|
for script in "$init_dir"/*; do
|
|
[[ -f "$script" ]] || continue
|
|
|
|
echo "Running custom script: ${script}"
|
|
if ! bash "$script"; then
|
|
echo "Custom script ${script} exited with an error, continuing."
|
|
fi
|
|
done
|
|
}
|
|
|
|
# Start service and monitor logs
|
|
start_and_monitor() {
|
|
printf "\n---------------------- STARTING CORE -----------------------\n"
|
|
|
|
# Due to resolvconf resetting the DNS we echo back the one we defined (or fallback to default).
|
|
resolvconf -u
|
|
|
|
# Due to some instances complaining about this, making sure its there every time.
|
|
mkdir -p /dev/net
|
|
mknod /dev/net/tun c 10 200
|
|
chmod 600 /dev/net/tun
|
|
|
|
# Actually starting WGDashboard
|
|
echo "Starting WGDashboard directly with Gunicorn..."
|
|
|
|
[[ ! -d ${WGDASH}/src/log ]] && mkdir ${WGDASH}/src/log
|
|
[[ ! -d ${WGDASH}/src/download ]] && mkdir ${WGDASH}/src/download
|
|
|
|
${WGDASH}/src/venv/bin/gunicorn --config ${WGDASH}/src/gunicorn.conf.py
|
|
|
|
cp /etc/resolv.conf /etc/resolv.conf.docker
|
|
/usr/sbin/resolvconf -u
|
|
cat /etc/resolv.conf.docker | resolvconf -a docker.inet
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "Loading WGDashboard failed... Look above for details."
|
|
fi
|
|
|
|
# Wait a second before continuing, to give the python program some time to get ready.
|
|
echo -e "\nEnsuring container continuation."
|
|
|
|
local max_rounds="10"
|
|
local round="0"
|
|
|
|
# Hang in there for 10s for Gunicorn to get ready
|
|
while true; do
|
|
round=$((round + 1))
|
|
|
|
local latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)
|
|
|
|
if [[ $round -eq $max_rounds ]]; then
|
|
echo "Reached breaking point!"
|
|
break
|
|
|
|
fi
|
|
|
|
if [[ -z $latest_error ]]; then
|
|
echo -e "Logs not yet present! Retrying in 1 second!"
|
|
sleep 1s
|
|
|
|
else
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
if [[ -z $latest_error ]]; then
|
|
echo -e "No error logs founds... Please investigate.\nExiting in 3 minutes..."
|
|
sleep 180s
|
|
exit 1
|
|
|
|
else
|
|
tail -f "$latest_error" &
|
|
tail_pid=$!
|
|
|
|
wait $tail_pid
|
|
fi
|
|
}
|
|
|
|
# Main execution flow
|
|
ensure_installation
|
|
set_envvars
|
|
run_custom_init
|
|
start_and_monitor
|