mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-18 03:26:17 +00:00
remove subscription banner V3
This commit is contained in:
MacRimi
229
scripts/global/remove-banner-pve-v3.sh
Normal file
229
scripts/global/remove-banner-pve-v3.sh
Normal file
@@ -0,0 +1,229 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# ==========================================================
|
||||||
|
# Remove Subscription Banner - Proxmox VE (v3 - Minimal Intrusive)
|
||||||
|
# ==========================================================
|
||||||
|
# This version makes a surgical change to the checked_command function
|
||||||
|
# by changing the condition to 'if (false)' and commenting out the banner logic.
|
||||||
|
# ==========================================================
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Source utilities if available
|
||||||
|
BASE_DIR="/usr/local/share/proxmenux"
|
||||||
|
UTILS_FILE="$BASE_DIR/utils.sh"
|
||||||
|
TOOLS_JSON="/usr/local/share/proxmenux/installed_tools.json"
|
||||||
|
|
||||||
|
if [[ -f "$UTILS_FILE" ]]; then
|
||||||
|
source "$UTILS_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
load_language
|
||||||
|
initialize_cache
|
||||||
|
|
||||||
|
# File paths
|
||||||
|
JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
|
||||||
|
GZ_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js.gz"
|
||||||
|
MIN_JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.min.js"
|
||||||
|
BACKUP_DIR="$BASE_DIR/backups"
|
||||||
|
APT_HOOK="/etc/apt/apt.conf.d/no-nag-script"
|
||||||
|
PATCH_BIN="/usr/local/bin/pve-remove-nag-v3.sh"
|
||||||
|
MARK="/* PROXMENUX_NAG_PATCH_V3 */"
|
||||||
|
|
||||||
|
# Ensure tools JSON exists
|
||||||
|
ensure_tools_json() {
|
||||||
|
[ -f "$TOOLS_JSON" ] || echo "{}" > "$TOOLS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Register tool in JSON
|
||||||
|
register_tool() {
|
||||||
|
command -v jq >/dev/null 2>&1 || return 0
|
||||||
|
local tool="$1" state="$2"
|
||||||
|
ensure_tools_json
|
||||||
|
jq --arg t "$tool" --argjson v "$state" '.[$t]=$v' "$TOOLS_JSON" \
|
||||||
|
> "$TOOLS_JSON.tmp" && mv "$TOOLS_JSON.tmp" "$TOOLS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Verify JS file integrity
|
||||||
|
verify_js_integrity() {
|
||||||
|
local file="$1"
|
||||||
|
[ -f "$file" ] || return 1
|
||||||
|
[ -s "$file" ] || return 1
|
||||||
|
grep -Eq 'Ext|function|var|const|let' "$file" || return 1
|
||||||
|
if LC_ALL=C grep -qP '\x00' "$file" 2>/dev/null; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create timestamped backup
|
||||||
|
create_backup() {
|
||||||
|
local file="$1"
|
||||||
|
local timestamp
|
||||||
|
timestamp=$(date +%Y%m%d_%H%M%S)
|
||||||
|
local backup_file="$BACKUP_DIR/$(basename "$file").backup.$timestamp"
|
||||||
|
|
||||||
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
|
||||||
|
if [ -f "$file" ]; then
|
||||||
|
rm -f "$BACKUP_DIR"/"$(basename "$file")".backup.* 2>/dev/null || true
|
||||||
|
|
||||||
|
cp -a "$file" "$backup_file"
|
||||||
|
echo "$backup_file"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create the patch script that will be called by APT hook
|
||||||
|
create_patch_script() {
|
||||||
|
cat > "$PATCH_BIN" <<'EOFPATCH'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# ==========================================================
|
||||||
|
# Proxmox Subscription Banner Patch (v3 - Minimal)
|
||||||
|
# ==========================================================
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
|
||||||
|
GZ_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js.gz"
|
||||||
|
MIN_JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.min.js"
|
||||||
|
BACKUP_DIR="/usr/local/share/proxmenux/backups"
|
||||||
|
MARK="/* PROXMENUX_NAG_PATCH_V3 */"
|
||||||
|
|
||||||
|
verify_js_integrity() {
|
||||||
|
local file="$1"
|
||||||
|
[ -f "$file" ] && [ -s "$file" ] && grep -Eq 'Ext|function' "$file" && ! LC_ALL=C grep -qP '\x00' "$file" 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
patch_checked_command() {
|
||||||
|
[ -f "$JS_FILE" ] || return 0
|
||||||
|
|
||||||
|
# Check if already patched
|
||||||
|
grep -q "$MARK" "$JS_FILE" && return 0
|
||||||
|
|
||||||
|
# Create backup
|
||||||
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
local backup="$BACKUP_DIR/$(basename "$JS_FILE").backup.$(date +%Y%m%d_%H%M%S)"
|
||||||
|
cp -a "$JS_FILE" "$backup"
|
||||||
|
|
||||||
|
# Set trap to restore on error
|
||||||
|
trap "cp -a '$backup' '$JS_FILE' 2>/dev/null || true" ERR
|
||||||
|
|
||||||
|
# Add patch marker at the beginning
|
||||||
|
sed -i "1s|^|$MARK\n|" "$JS_FILE"
|
||||||
|
|
||||||
|
# Surgical patch: Change the condition in checked_command function
|
||||||
|
# This changes the if condition to 'if (false)' making the banner never show
|
||||||
|
if grep -q "res\.data\.status\.toLowerCase() !== 'active'" "$JS_FILE"; then
|
||||||
|
# Pattern for newer versions (8.4.5+)
|
||||||
|
sed -i "/checked_command: function/,/},$/s/res === null || res === undefined || !res || res\.data\.status\.toLowerCase() !== 'active'/false/g" "$JS_FILE"
|
||||||
|
elif grep -q "res\.data\.status !== 'Active'" "$JS_FILE"; then
|
||||||
|
# Pattern for older versions
|
||||||
|
sed -i "/checked_command: function/,/},$/s/res === null || res === undefined || !res || res\.data\.status !== 'Active'/false/g" "$JS_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Also handle the NoMoreNagging pattern if present
|
||||||
|
if grep -q "res\.data\.status\.toLowerCase() !== 'NoMoreNagging'" "$JS_FILE"; then
|
||||||
|
sed -i "/checked_command: function/,/},$/s/res === null || res === undefined || !res || res\.data\.status\.toLowerCase() !== 'NoMoreNagging'/false/g" "$JS_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Verify integrity after patch
|
||||||
|
if ! verify_js_integrity "$JS_FILE"; then
|
||||||
|
cp -a "$backup" "$JS_FILE"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clean up generated files
|
||||||
|
rm -f "$MIN_JS_FILE" "$GZ_FILE" 2>/dev/null || true
|
||||||
|
find /var/cache/pve-manager/ -name "*.js*" -delete 2>/dev/null || true
|
||||||
|
find /var/lib/pve-manager/ -name "*.js*" -delete 2>/dev/null || true
|
||||||
|
find /var/cache/nginx/ -type f -delete 2>/dev/null || true
|
||||||
|
|
||||||
|
trap - ERR
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
reload_services() {
|
||||||
|
systemctl is-active --quiet pveproxy 2>/dev/null && {
|
||||||
|
systemctl reload pveproxy 2>/dev/null || systemctl restart pveproxy 2>/dev/null || true
|
||||||
|
}
|
||||||
|
systemctl is-active --quiet nginx 2>/dev/null && {
|
||||||
|
systemctl reload nginx 2>/dev/null || true
|
||||||
|
}
|
||||||
|
systemctl is-active --quiet pvedaemon 2>/dev/null && {
|
||||||
|
systemctl reload pvedaemon 2>/dev/null || true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
patch_checked_command || return 1
|
||||||
|
reload_services
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
|
EOFPATCH
|
||||||
|
|
||||||
|
chmod 755 "$PATCH_BIN"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Create APT hook to reapply patch after updates
|
||||||
|
create_apt_hook() {
|
||||||
|
cat > "$APT_HOOK" <<'EOFAPT'
|
||||||
|
/* ProxMenux: reapply minimal nag patch after upgrades */
|
||||||
|
DPkg::Post-Invoke { "/usr/local/bin/pve-remove-nag-v3.sh || true"; };
|
||||||
|
EOFAPT
|
||||||
|
|
||||||
|
chmod 644 "$APT_HOOK"
|
||||||
|
|
||||||
|
# Verify APT hook syntax
|
||||||
|
apt-config dump >/dev/null 2>&1 || {
|
||||||
|
msg_warn "APT hook syntax issue, removing..."
|
||||||
|
rm -f "$APT_HOOK"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main function to remove subscription banner
|
||||||
|
remove_subscription_banner_v3() {
|
||||||
|
local pve_version
|
||||||
|
pve_version=$(pveversion 2>/dev/null | grep -oP 'pve-manager/\K[0-9]+\.[0-9]+' | head -1 || echo "unknown")
|
||||||
|
|
||||||
|
msg_info "Detected Proxmox VE ${pve_version} - applying minimal banner patch"
|
||||||
|
|
||||||
|
# Ask user for confirmation
|
||||||
|
if ! whiptail --title "Proxmox Subscription Banner (v3 - Minimal)" \
|
||||||
|
--yesno "This will make a minimal surgical change to proxmoxlib.js\nto disable the subscription banner.\n\nA backup will be created automatically.\n\nContinue?" 12 70; then
|
||||||
|
msg_warn "Banner removal cancelled by user."
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Remove old APT hooks
|
||||||
|
for f in /etc/apt/apt.conf.d/*nag*; do
|
||||||
|
[[ -e "$f" ]] && rm -f "$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Create backup
|
||||||
|
local backup_file
|
||||||
|
backup_file=$(create_backup "$JS_FILE")
|
||||||
|
if [ -n "$backup_file" ]; then
|
||||||
|
msg_info "Backup created: $backup_file"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create patch script and APT hook
|
||||||
|
create_patch_script
|
||||||
|
create_apt_hook
|
||||||
|
|
||||||
|
# Apply the patch
|
||||||
|
if ! "$PATCH_BIN"; then
|
||||||
|
msg_error "Error applying patch. Backup preserved at: $backup_file"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Register tool as applied
|
||||||
|
register_tool "subscription_banner_v3" true
|
||||||
|
|
||||||
|
msg_ok "Subscription banner removed successfully (v3 - minimal patch)"
|
||||||
|
msg_ok "Refresh your browser (Ctrl+Shift+R) to see changes"
|
||||||
|
msg_info "Backup location: $BACKUP_DIR"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run if executed directly
|
||||||
|
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||||
|
remove_subscription_banner_v3
|
||||||
|
fi
|
||||||
@@ -166,7 +166,7 @@ uninstall_subscription_banner_() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
uninstall_subscription_banner() {
|
uninstall_subscription_banner__() {
|
||||||
msg_info "$(translate "Restoring subscription banner...")"
|
msg_info "$(translate "Restoring subscription banner...")"
|
||||||
|
|
||||||
local JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
|
local JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
|
||||||
@@ -268,6 +268,98 @@ uninstall_subscription_banner() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
uninstall_subscription_banner() {
|
||||||
|
msg_info "$(translate "Restoring subscription banner...")"
|
||||||
|
|
||||||
|
local JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js"
|
||||||
|
local PATCH_BIN="/usr/local/bin/pve-remove-nag-v3.sh"
|
||||||
|
local BASE_DIR="/opt/pve-nag-buster"
|
||||||
|
local MIN_JS_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.min.js"
|
||||||
|
local GZ_FILE="/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js.gz"
|
||||||
|
|
||||||
|
local restored=false
|
||||||
|
|
||||||
|
|
||||||
|
for hook in /etc/apt/apt.conf.d/*nag*; do
|
||||||
|
if [[ -e "$hook" ]]; then
|
||||||
|
rm -f "$hook"
|
||||||
|
msg_ok "$(translate "Removed APT hook: $hook")"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -f "$PATCH_BIN" ]]; then
|
||||||
|
rm -f "$PATCH_BIN"
|
||||||
|
msg_ok "$(translate "Removed patch script: $PATCH_BIN")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -d "$BASE_DIR/backups" ]]; then
|
||||||
|
local backup_file
|
||||||
|
backup_file=$(ls -t "$BASE_DIR/backups"/proxmoxlib.js.backup.* 2>/dev/null | head -1)
|
||||||
|
|
||||||
|
if [[ -n "$backup_file" && -f "$backup_file" ]]; then
|
||||||
|
# Verify backup integrity before restoring
|
||||||
|
if [[ -s "$backup_file" ]] && grep -q "Ext\|function" "$backup_file" && ! grep -q $'\0' "$backup_file"; then
|
||||||
|
cp -a "$backup_file" "$JS_FILE"
|
||||||
|
msg_ok "$(translate "Restored from backup: $backup_file")"
|
||||||
|
restored=true
|
||||||
|
else
|
||||||
|
msg_warn "$(translate "Backup file appears corrupted, will reinstall packages")"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
msg_warn "$(translate "No backup found, will reinstall packages")"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$restored" == false ]]; then
|
||||||
|
msg_info "$(translate "Performing complete package reinstallation...")"
|
||||||
|
|
||||||
|
# Update package lists
|
||||||
|
apt-get update >/dev/null 2>&1
|
||||||
|
|
||||||
|
# Reinstall packages with force-confnew to restore original configs
|
||||||
|
if apt-get --reinstall -o Dpkg::Options::="--force-confnew" install \
|
||||||
|
pve-manager proxmox-widget-toolkit libjs-extjs libpve-http-server-perl -y >/dev/null 2>&1; then
|
||||||
|
msg_ok "$(translate "Reinstalled Proxmox packages successfully")"
|
||||||
|
restored=true
|
||||||
|
else
|
||||||
|
msg_error "$(translate "Failed to reinstall packages")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clean package update cache
|
||||||
|
rm -rf /var/lib/pve-manager/pkgupdates /var/cache/pve-manager 2>/dev/null || true
|
||||||
|
|
||||||
|
# Second pass reinstallation to ensure everything is clean
|
||||||
|
apt-get update >/dev/null 2>&1
|
||||||
|
apt-get --reinstall install proxmox-widget-toolkit pve-manager libjs-extjs libpve-http-server-perl -y >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
msg_info "$(translate "Cleaning cached files...")"
|
||||||
|
rm -f "$MIN_JS_FILE" "$GZ_FILE" 2>/dev/null || true
|
||||||
|
rm -rf /var/lib/pve-manager/pkgupdates /var/cache/pve-manager 2>/dev/null || true
|
||||||
|
find /var/cache/pve-manager/ -name "*.js*" -delete 2>/dev/null || true
|
||||||
|
find /var/lib/pve-manager/ -name "*.js*" -delete 2>/dev/null || true
|
||||||
|
find /var/cache/nginx/ -type f -delete 2>/dev/null || true
|
||||||
|
|
||||||
|
systemctl restart pveproxy pvedaemon pvestatd 2>/dev/null || true
|
||||||
|
|
||||||
|
register_tool "subscription_banner" false
|
||||||
|
|
||||||
|
if [[ "$restored" == true ]]; then
|
||||||
|
msg_ok "$(translate "Subscription banner restored successfully")"
|
||||||
|
msg_ok "$(translate "Clear your browser cache and refresh to see the subscription banner again")"
|
||||||
|
else
|
||||||
|
msg_error "$(translate "Failed to restore subscription banner completely")"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
|
|
||||||
uninstall_time_sync() {
|
uninstall_time_sync() {
|
||||||
|
|||||||
Reference in New Issue
Block a user