From 7a1d6492b2541278a2c6a575a1ff5406839d9338 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 12 Oct 2023 17:42:31 +0200 Subject: [PATCH 01/39] Initial commit --- config/vpn-providers.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 config/vpn-providers.json diff --git a/config/vpn-providers.json b/config/vpn-providers.json new file mode 100644 index 00000000..ed2b7641 --- /dev/null +++ b/config/vpn-providers.json @@ -0,0 +1,14 @@ +{ + "providers": [ + { + "id": 1, + "name": "ExpressVPN", + "bin_path": "/usr/bin/expressvpn" + }, + { + "id": 2, + "name": "NordVPN", + "bin_path": "/usr/bin/nordvpn" + } + ] +} From d3c9b00e899bc334322982fa8c553a62b079d6f6 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 12 Oct 2023 17:43:54 +0200 Subject: [PATCH 02/39] Added _prompt_install_vpn_providers() --- installers/common.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/installers/common.sh b/installers/common.sh index a98d0f84..194477a9 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -59,6 +59,7 @@ function _install_raspap() { _prompt_install_openvpn _install_mobile_clients _prompt_install_wireguard + _prompt_install_vpn_providers _patch_system_files _install_complete } @@ -401,6 +402,64 @@ function _install_adblock() { _install_status 0 } +# Prompt to install VPN providers +function _prompt_install_vpn_providers() { + _install_log "Configure VPN provider support" + echo -n "Enable VPN provider client configuration? [Y/n]: " + if [ "$assume_yes" == 0 ]; then + read answer < /dev/tty + if [ "$answer" != "${answer#[Nn]}" ]; then + _install_status 0 "(Skipped)" + else + echo -e "Select an option from the list:" + while true; do + json="$webroot_dir/config/"vpn-providers.json + while IFS='|' read -r key value; do + options["$key"]="$value" + done< <(jq -r '.providers[] | "\(.id)|\(.name)|\(.bin_path)"' "$json") + + # display provider options + for key in "${!options[@]}"; do + echo " $key) ${options[$key]%%|*}" + done + echo " 0) None" + echo -n "Choose an option: " + read answer < /dev/tty + + if [ "$answer" != "${answer#[0]}" ]; then + _install_status 0 "(Skipped)" + break + elif [[ "$answer" =~ ^[0-9]+$ ]] && [[ -n ${options[$answer]+abc} ]]; then + selected="${options[$answer]}" + echo "Configuring support for ${selected%%|*}" + bin_path=${selected#*|} + if ! grep -q "$bin_path" "$webroot_dir/installers/raspap.sudoers"; then + echo "Adding $bin_path to raspap.sudoers" + echo "www-data ALL=(ALL) NOPASSWD:$bin_path" | sudo tee -a "$webroot_dir/installers/raspap.sudoers" > /dev/null || _install_status 1 "Unable to modify raspap.sudoers" + fi + echo "Enabling administration option for ${selected%%|*}" + sudo sed -i "s/\('RASPI_VPN_PROVIDER_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php" + + echo "Adding VPN provider to $raspap_dir/provider.ini" + if [ ! -f "$raspap_dir/provider.ini" ]; then + sudo touch "$raspap_dir/provider.ini" + echo "providerID = $answer" | sudo tee "$raspap_dir/provider.ini" > /dev/null || _install_status 1 "Unable to create $raspap_dir/provider.ini" + elif ! grep -q "providerID = $answer" "$raspap_dir/provider.ini"; then + echo "providerID = $answer" | sudo tee "$raspap_dir/provider.ini" > /dev/null || _install_status 1 "Unable to write to $raspap_dir/provider.ini" + fi + + _install_status 0 + break + else + echo "Invalid choice. Select a valid option:" + fi + done + fi + else + echo "(Skipped)" + fi +} + # Prompt to install openvpn function _prompt_install_openvpn() { _install_log "Configure OpenVPN support" From ac7b4ccb289398f8cd45d8a2a1835d511b95743b Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 12 Oct 2023 19:17:00 +0200 Subject: [PATCH 03/39] Add basic commands for Linux provider CLIs --- config/vpn-providers.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index ed2b7641..39a2be9c 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -3,12 +3,14 @@ { "id": 1, "name": "ExpressVPN", - "bin_path": "/usr/bin/expressvpn" + "bin_path": "/usr/bin/expressvpn", + "commands": "connect disconnect status version" }, { "id": 2, "name": "NordVPN", - "bin_path": "/usr/bin/nordvpn" + "bin_path": "/usr/bin/nordvpn", + "commands": "connect disconnect status version" } ] } From 5123ab4599301c658d7566882acfc6986ebdd046 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 12 Oct 2023 19:19:15 +0200 Subject: [PATCH 04/39] Update w/ provider constants --- config/config.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/config.php b/config/config.php index 4589092d..630f1ef7 100755 --- a/config/config.php +++ b/config/config.php @@ -3,6 +3,7 @@ define('RASPI_BRAND_TEXT', 'RaspAP'); define('RASPI_CONFIG', '/etc/raspap'); define('RASPI_CONFIG_NETWORK', RASPI_CONFIG.'/networking/defaults.json'); +define('RASPI_CONFIG_PROVIDERS', 'config/vpn-providers.json'); define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth'); define('RASPI_WIFI_AP_INTERFACE', 'wlan0'); define('RASPI_CACHE_PATH', sys_get_temp_dir() . '/raspap'); @@ -43,6 +44,7 @@ define('RASPI_NETWORK_ENABLED', true); define('RASPI_DHCP_ENABLED', true); define('RASPI_ADBLOCK_ENABLED', false); define('RASPI_OPENVPN_ENABLED', false); +define('RASPI_VPN_PROVIDER_ENABLED', false); define('RASPI_WIREGUARD_ENABLED', false); define('RASPI_TORPROXY_ENABLED', false); define('RASPI_CONFAUTH_ENABLED', true); From a2394c0742b0c54cbd6ee3bc0d32b7b00832b5d6 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 12 Oct 2023 19:21:23 +0200 Subject: [PATCH 05/39] Update UI, page actions + functions for basic provider support --- includes/defaults.php | 2 ++ includes/functions.php | 30 ++++++++++++++++++++++++++++++ includes/page_actions.php | 3 +++ includes/sidebar.php | 5 +++++ index.php | 1 + 5 files changed, 41 insertions(+) diff --git a/includes/defaults.php b/includes/defaults.php index 3fc6e914..dd5c588f 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -8,6 +8,7 @@ $defaults = [ 'RASPI_BRAND_TEXT' => 'RaspAP', 'RASPI_VERSION' => '2.9.6', 'RASPI_CONFIG_NETWORK' => RASPI_CONFIG.'/networking/defaults.json', + 'RASPI_CONFIG_PROVIDERS' => 'config/vpn-providers.json', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', 'RASPI_WIFI_AP_INTERFACE' => 'wlan0', 'RASPI_CACHE_PATH' => sys_get_temp_dir() . '/raspap', @@ -45,6 +46,7 @@ $defaults = [ 'RASPI_DHCP_ENABLED' => true, 'RASPI_ADBLOCK_ENABLED' => false, 'RASPI_OPENVPN_ENABLED' => false, + 'RASPI_VPN_PROVIDER_ENABLED' => false, 'RASPI_WIREGUARD_ENABLED' => false, 'RASPI_TORPROXY_ENABLED' => false, 'RASPI_CONFAUTH_ENABLED' => true, diff --git a/includes/functions.php b/includes/functions.php index 24a42f15..e5797507 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -169,6 +169,24 @@ function getDefaultNetOpts($svc,$key) } } +/** + * Returns a value for the specified VPN provider + * + * @param numeric $id + * @param string $key + * @return object $json + */ +function getProviderValue($id,$key) +{ + $obj = json_decode(file_get_contents(RASPI_CONFIG_PROVIDERS), true); + if ($obj === null) { + return false; + } else { + $id--; + return $obj['providers'][$id][$key]; + } +} + /* Functions to write ini files */ /** @@ -669,6 +687,7 @@ function initializeApp() $_SESSION["theme_url"] = getThemeOpt(); $_SESSION["toggleState"] = getSidebarState(); $_SESSION["bridgedEnabled"] = getBridgedState(); + $_SESSION["providerID"] = getProviderID(); } function getThemeOpt() @@ -709,6 +728,17 @@ function getBridgedState() return $arrHostapdConf['BridgedEnable']; } +// Returns VPN provider ID, if defined +function getProviderID() +{ + if (RASPI_VPN_PROVIDER_ENABLED) { + $arrProvider = parse_ini_file(RASPI_CONFIG.'/provider.ini'); + if (isset($arrProvider['providerID'])) { + return $arrProvider['providerID']; + } + } +} + /** * Validates the format of a CIDR notation string * diff --git a/includes/page_actions.php b/includes/page_actions.php index b460dd43..ed64a33e 100755 --- a/includes/page_actions.php +++ b/includes/page_actions.php @@ -27,6 +27,9 @@ case "/wg_conf": DisplayWireGuardConfig(); break; + case "/provider_conf": + DisplayProviderConfig(); + break; case "/torproxy_conf": DisplayTorProxyConfig(); break; diff --git a/includes/sidebar.php b/includes/sidebar.php index ada2a0b0..13558354 100755 --- a/includes/sidebar.php +++ b/includes/sidebar.php @@ -60,6 +60,11 @@ + +
  • + +
    • +
  • diff --git a/index.php b/index.php index bafecca4..d0ec6b6a 100755 --- a/index.php +++ b/index.php @@ -45,6 +45,7 @@ require_once 'includes/data_usage.php'; require_once 'includes/about.php'; require_once 'includes/openvpn.php'; require_once 'includes/wireguard.php'; +require_once 'includes/provider.php'; require_once 'includes/torproxy.php'; initializeApp(); From 72cac43c0f8c9d87c5302ec4c1e777a9c4fe1a1f Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 13 Oct 2023 08:46:39 +0200 Subject: [PATCH 06/39] Added _install_provider() --- installers/common.sh | 91 +++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index 194477a9..814b4088 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -411,55 +411,60 @@ function _prompt_install_vpn_providers() { if [ "$answer" != "${answer#[Nn]}" ]; then _install_status 0 "(Skipped)" else - echo -e "Select an option from the list:" - while true; do - json="$webroot_dir/config/"vpn-providers.json - while IFS='|' read -r key value; do - options["$key"]="$value" - done< <(jq -r '.providers[] | "\(.id)|\(.name)|\(.bin_path)"' "$json") - - # display provider options - for key in "${!options[@]}"; do - echo " $key) ${options[$key]%%|*}" - done - echo " 0) None" - echo -n "Choose an option: " - read answer < /dev/tty - - if [ "$answer" != "${answer#[0]}" ]; then - _install_status 0 "(Skipped)" - break - elif [[ "$answer" =~ ^[0-9]+$ ]] && [[ -n ${options[$answer]+abc} ]]; then - selected="${options[$answer]}" - echo "Configuring support for ${selected%%|*}" - bin_path=${selected#*|} - if ! grep -q "$bin_path" "$webroot_dir/installers/raspap.sudoers"; then - echo "Adding $bin_path to raspap.sudoers" - echo "www-data ALL=(ALL) NOPASSWD:$bin_path" | sudo tee -a "$webroot_dir/installers/raspap.sudoers" > /dev/null || _install_status 1 "Unable to modify raspap.sudoers" - fi - echo "Enabling administration option for ${selected%%|*}" - sudo sed -i "s/\('RASPI_VPN_PROVIDER_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php" - - echo "Adding VPN provider to $raspap_dir/provider.ini" - if [ ! -f "$raspap_dir/provider.ini" ]; then - sudo touch "$raspap_dir/provider.ini" - echo "providerID = $answer" | sudo tee "$raspap_dir/provider.ini" > /dev/null || _install_status 1 "Unable to create $raspap_dir/provider.ini" - elif ! grep -q "providerID = $answer" "$raspap_dir/provider.ini"; then - echo "providerID = $answer" | sudo tee "$raspap_dir/provider.ini" > /dev/null || _install_status 1 "Unable to write to $raspap_dir/provider.ini" - fi - - _install_status 0 - break - else - echo "Invalid choice. Select a valid option:" - fi - done + _install_provider fi else echo "(Skipped)" fi } +# Install VPN provider client configuration +function _install_provider() { + echo -e "Select an option from the list:" + while true; do + json="$webroot_dir/config/"vpn-providers.json + while IFS='|' read -r key value; do + options["$key"]="$value" + done< <(jq -r '.providers[] | "\(.id)|\(.name)|\(.bin_path)"' "$json") + + # display provider options + for key in "${!options[@]}"; do + echo " $key) ${options[$key]%%|*}" + done + echo " 0) None" + echo -n "Choose an option: " + read answer < /dev/tty + + if [ "$answer" != "${answer#[0]}" ]; then + _install_status 0 "(Skipped)" + break + elif [[ "$answer" =~ ^[0-9]+$ ]] && [[ -n ${options[$answer]+abc} ]]; then + selected="${options[$answer]}" + echo "Configuring support for ${selected%%|*}" + bin_path=${selected#*|} + if ! grep -q "$bin_path" "$webroot_dir/installers/raspap.sudoers"; then + echo "Adding $bin_path to raspap.sudoers" + echo "www-data ALL=(ALL) NOPASSWD:$bin_path" | sudo tee -a "$webroot_dir/installers/raspap.sudoers" > /dev/null || _install_status 1 "Unable to modify raspap.sudoers" + fi + echo "Enabling administration option for ${selected%%|*}" + sudo sed -i "s/\('RASPI_VPN_PROVIDER_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php" + + echo "Adding VPN provider to $raspap_dir/provider.ini" + if [ ! -f "$raspap_dir/provider.ini" ]; then + sudo touch "$raspap_dir/provider.ini" + echo "providerID = $answer" | sudo tee "$raspap_dir/provider.ini" > /dev/null || _install_status 1 "Unable to create $raspap_dir/provider.ini" + elif ! grep -q "providerID = $answer" "$raspap_dir/provider.ini"; then + echo "providerID = $answer" | sudo tee "$raspap_dir/provider.ini" > /dev/null || _install_status 1 "Unable to write to $raspap_dir/provider.ini" + fi + + _install_status 0 + break + else + echo "Invalid choice. Select a valid option:" + fi + done +} + # Prompt to install openvpn function _prompt_install_openvpn() { _install_log "Configure OpenVPN support" From f7bdcb4e63fe3d51b9a5cef6ae1bc0e3c027a911 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 13 Oct 2023 08:47:35 +0200 Subject: [PATCH 07/39] Add providers with known Linux CLIs --- config/vpn-providers.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index 39a2be9c..ce7c75a7 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -4,12 +4,28 @@ "id": 1, "name": "ExpressVPN", "bin_path": "/usr/bin/expressvpn", + "install_page": "", "commands": "connect disconnect status version" }, { "id": 2, + "name": "Mullvad VPN", + "bin_path": "/usr/bin/mullvad", + "install_page": "https://mullvad.net/en/download/vpn/linux", + "commands": "connect disconnect status version" + }, + { + "id": 3, "name": "NordVPN", "bin_path": "/usr/bin/nordvpn", + "install_page": "https://nordvpn.com/download/linux/", + "commands": "connect disconnect status version" + }, + { + "id": 4, + "name": "Proton VPN", + "bin_path": "/usr/bin/protonvpn-cli", + "install_page": "https://protonvpn.com/support/linux-vpn-tool/", "commands": "connect disconnect status version" } ] From a09ee1e86b0fccc18a7fe8a2a0e46de20743a2c1 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 13 Oct 2023 19:46:44 +0200 Subject: [PATCH 08/39] Initial commit --- includes/provider.php | 65 ++++++++++++++++++++++++++++++++++ templates/provider.php | 53 +++++++++++++++++++++++++++ templates/provider/general.php | 17 +++++++++ templates/provider/status.php | 12 +++++++ 4 files changed, 147 insertions(+) create mode 100755 includes/provider.php create mode 100755 templates/provider.php create mode 100644 templates/provider/general.php create mode 100644 templates/provider/status.php diff --git a/includes/provider.php b/includes/provider.php new file mode 100755 index 00000000..ee2b8008 --- /dev/null +++ b/includes/provider.php @@ -0,0 +1,65 @@ +addMessage('Attempting to connect provider VPN', 'info'); + exec('sudo '.$binPath.' connect', $return); + foreach ($return as $line) { + $status->addMessage($line, 'info'); + } + } elseif (isset($_POST['StopProviderVPN'])) { + $status->addMessage('Attempting to disconnect provider VPN', 'info'); + exec('sudo '.$binPath.' disconnect', $return); + foreach ($return as $line) { + $status->addMessage($line, 'info'); + } + } + } + + exec("sudo $binPath status", $result); + $serviceStatus = strtolower($output[1]) == 0 ? "disconnected" : "connected"; + $public_ip = get_public_ip(); + + exec("sudo $binPath status > /tmp/provider.log"); + $providerLog = file_get_contents('/tmp/provider.log'); + + echo renderTemplate( + "provider", compact( + "status", + "serviceStatus", + "providerName", + "providerLog", + "public_ip" + ) + ); +} + +/** + * Validates VPN provider settings + * + * @param object $status + * @return string $someVar + */ +function SaveProviderConfig($status, $someVar) +{ + +} diff --git a/templates/provider.php b/templates/provider.php new file mode 100755 index 00000000..8cb15541 --- /dev/null +++ b/templates/provider.php @@ -0,0 +1,53 @@ + + + + ' , PHP_EOL; + } else { + echo '' , PHP_EOL; + } + ?> + + + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + showMessages(); ?> +
    + + +
      +
      • +
      • +
    + + +
    + + +
    + + +
    +
    +
    +
    +
    +
    + + diff --git a/templates/provider/general.php b/templates/provider/general.php new file mode 100644 index 00000000..ebe6ab6f --- /dev/null +++ b/templates/provider/general.php @@ -0,0 +1,17 @@ +
    +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + diff --git a/templates/provider/status.php b/templates/provider/status.php new file mode 100644 index 00000000..b902d78c --- /dev/null +++ b/templates/provider/status.php @@ -0,0 +1,12 @@ + +
    +

    +

    ".strtolower($providerName)." connection status is displayed below.") ?>

    + +
    +
    + +
    +
    +
    + From ab0568875d6571baede157f2517b69f2a73870ea Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 15 Oct 2023 21:17:16 +0200 Subject: [PATCH 09/39] Set provider cmd_overrides, status codes --- config/vpn-providers.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index ce7c75a7..45b3bb96 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -4,29 +4,41 @@ "id": 1, "name": "ExpressVPN", "bin_path": "/usr/bin/expressvpn", - "install_page": "", - "commands": "connect disconnect status version" + "install_page": "https://www.expressvpn.com/support/vpn-setup/app-for-linux/", + "cmd_overrides": { + "countries": "list" + }, + "status": { + "connected": "connected" + } }, { "id": 2, "name": "Mullvad VPN", "bin_path": "/usr/bin/mullvad", "install_page": "https://mullvad.net/en/download/vpn/linux", - "commands": "connect disconnect status version" + "cmd_overrides": { + } }, { "id": 3, "name": "NordVPN", "bin_path": "/usr/bin/nordvpn", "install_page": "https://nordvpn.com/download/linux/", - "commands": "connect disconnect status version" + "cmd_overrides": { + }, + "status": { + "connected": "connected", + "disconnected": "disconnected" + } }, { "id": 4, "name": "Proton VPN", "bin_path": "/usr/bin/protonvpn-cli", "install_page": "https://protonvpn.com/support/linux-vpn-tool/", - "commands": "connect disconnect status version" + "cmd_overrides": { + } } ] } From f535acc18c44fb40acf8e1e348b342f64be486c4 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 15 Oct 2023 21:26:58 +0200 Subject: [PATCH 10/39] Country select list, account info, CLI version + status --- templates/provider.php | 32 ++++++++++++++++++++++-------- templates/provider/general.php | 36 ++++++++++++++++++++++++++++------ templates/provider/status.php | 2 ++ 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/templates/provider.php b/templates/provider.php index 8cb15541..0ca9827b 100755 --- a/templates/provider.php +++ b/templates/provider.php @@ -1,12 +1,11 @@ - - ' , PHP_EOL; - } else { - echo '' , PHP_EOL; - } - ?> + class="btn btn-outline btn-primary " name="SaveProviderConfig" value="Save settings" /> + + class="btn btn-success " name="StartProviderVPN" value="Connect " /> + + class="btn btn-warning " name="StopProviderVPN" value="Disconnect " /> + @@ -32,7 +31,7 @@
      -
      • +
    @@ -50,4 +49,21 @@ + + diff --git a/templates/provider/general.php b/templates/provider/general.php index ebe6ab6f..7c6cd209 100644 --- a/templates/provider/general.php +++ b/templates/provider/general.php @@ -1,17 +1,41 @@
    -

    +

    -
    -
    +
    + +
    +
    + +
    -
    -
    -
    +
    + +
    +
    +
    +
    + +
    + '. $item .'
    '; + } ?> + " /> +
    +
    +
    +
    +
    +
    +
    + + +
    +
    diff --git a/templates/provider/status.php b/templates/provider/status.php index b902d78c..90d99dce 100644 --- a/templates/provider/status.php +++ b/templates/provider/status.php @@ -1,6 +1,8 @@

    + +

    ".$providerVersion."") ?>

    ".strtolower($providerName)." connection status is displayed below.") ?>

    From ac863f5c8a4e8dec7dbe0ef6948431d6aa59970e Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 15 Oct 2023 21:29:34 +0200 Subject: [PATCH 11/39] Status message when CLI binary not found, fetch provider countries, status, user account --- app/css/custom.php | 6 ++++ includes/provider.php | 72 +++++++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/app/css/custom.php b/app/css/custom.php index ff87b3b2..33a59c58 100644 --- a/app/css/custom.php +++ b/app/css/custom.php @@ -42,6 +42,12 @@ body { background-color: #fff; } +.btn-primary.disabled { + color: !important; + border-color: !important; + background-color: #fff !important; +} + .card-footer, .modal-footer { background-color: #f2f1f0; } diff --git a/includes/provider.php b/includes/provider.php index ee2b8008..f178810e 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -1,11 +1,8 @@ addMessage('Expected '.$providerName.' binary not found at: '.$binPath, 'warning'); + $status->addMessage('Visit the installation instructions for '.$providerName.'\'s Linux CLI.', 'warning'); + $ctlState = 'disabled'; + $providerVersion = 'not found'; + } else { + // fetch provider status + $output = shell_exec("sudo $binPath status"); + $serviceStatus = strtolower($output) == 0 ? "inactive" : "active"; + $result = strtolower(($lastSpacePos = strrpos($output, ' ')) ? substr($output, $lastSpacePos + 1) : $output); + $providerLog = stripArtifacts($output); + //echo '
    status = '.$result; + + // fetch provider version + $providerVersion = shell_exec("sudo $binPath -v"); + + // fetch account info + exec("sudo $binPath account", $output); + $accountInfo = stripArtifacts($output); + + // fetch available countries + $output = shell_exec("sudo $binPath countries"); + $output = stripArtifacts($output, '\s'); + $arrTmp = explode(",", $output); + $countries = array_combine($arrTmp, $arrTmp); + foreach ($countries as $key => $value) { + $countries[$key] = str_replace("_", " ", $value); + } + } if (!RASPI_MONITOR_ENABLED) { if (isset($_POST['SaveProviderSettings'])) { @@ -21,34 +50,31 @@ function DisplayProviderConfig() } $return = SaveProviderConfig($status, $someVar); } elseif (isset($_POST['StartProviderVPN'])) { - $status->addMessage('Attempting to connect provider VPN', 'info'); - exec('sudo '.$binPath.' connect', $return); + $status->addMessage('Attempting to connect VPN provider', 'info'); + exec("sudo $binPath connect", $return); foreach ($return as $line) { $status->addMessage($line, 'info'); } } elseif (isset($_POST['StopProviderVPN'])) { - $status->addMessage('Attempting to disconnect provider VPN', 'info'); - exec('sudo '.$binPath.' disconnect', $return); + $status->addMessage('Attempting to disconnect VPN provider', 'info'); + exec("sudo $binPath disconnect", $return); foreach ($return as $line) { $status->addMessage($line, 'info'); } } } - exec("sudo $binPath status", $result); - $serviceStatus = strtolower($output[1]) == 0 ? "disconnected" : "connected"; - $public_ip = get_public_ip(); - - exec("sudo $binPath status > /tmp/provider.log"); - $providerLog = file_get_contents('/tmp/provider.log'); - echo renderTemplate( "provider", compact( "status", "serviceStatus", "providerName", + "providerVersion", + "accountInfo", + "countries", "providerLog", - "public_ip" + "public_ip", + "ctlState" ) ); } @@ -63,3 +89,17 @@ function SaveProviderConfig($status, $someVar) { } + +/** + * Removes artifacts from shell_exec string values + * + * @param string $output + * @param string $pattern + * @return string $result + */ +function stripArtifacts($output, $pattern = null) +{ + $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|]/', '', $output); + return $result; +} + From 53f4645c2ffea0a6072ba1e91453b2730dec8642 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 16 Oct 2023 10:44:46 +0200 Subject: [PATCH 12/39] Implement CLI overrides, get countries + status functions --- includes/provider.php | 96 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 18 deletions(-) diff --git a/includes/provider.php b/includes/provider.php index f178810e..7db7631d 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -8,39 +8,38 @@ require_once 'includes/config.php'; function DisplayProviderConfig() { $status = new \RaspAP\Messages\StatusMessage; - $providerName = getProviderValue($_SESSION["providerID"], "name"); - $binPath = getProviderValue($_SESSION["providerID"], "bin_path"); - $public_ip = get_public_ip(); + + $id = $_SESSION["providerID"]; + $providerName = getProviderValue($id, "name"); + $binPath = getProviderValue($id, "bin_path"); + $publicIP = get_public_ip(); if (!file_exists($binPath)) { - $installPage = getProviderValue($_SESSION["providerID"], "install_page"); + $installPage = getProviderValue($id, "install_page"); $status->addMessage('Expected '.$providerName.' binary not found at: '.$binPath, 'warning'); $status->addMessage('Visit the installation instructions for '.$providerName.'\'s Linux CLI.', 'warning'); $ctlState = 'disabled'; $providerVersion = 'not found'; } else { // fetch provider status - $output = shell_exec("sudo $binPath status"); - $serviceStatus = strtolower($output) == 0 ? "inactive" : "active"; - $result = strtolower(($lastSpacePos = strrpos($output, ' ')) ? substr($output, $lastSpacePos + 1) : $output); + $serviceStatus = getProviderStatus($id, $binPath); + $statusDisplay = $serviceStatus == "down" ? "inactive" : "active"; + + // fetch provider log + $cmd = getCliOverride($id, 'cmd_overrides', 'status'); + $output = shell_exec("sudo $binPath $cmd"); $providerLog = stripArtifacts($output); - //echo '
    status = '.$result; // fetch provider version $providerVersion = shell_exec("sudo $binPath -v"); // fetch account info - exec("sudo $binPath account", $output); + $cmd = getCliOverride($id, 'cmd_overrides', 'account'); + exec("sudo $binPath $cmd", $output); $accountInfo = stripArtifacts($output); // fetch available countries - $output = shell_exec("sudo $binPath countries"); - $output = stripArtifacts($output, '\s'); - $arrTmp = explode(",", $output); - $countries = array_combine($arrTmp, $arrTmp); - foreach ($countries as $key => $value) { - $countries[$key] = str_replace("_", " ", $value); - } + $countries = getCountries($id, $binPath); } if (!RASPI_MONITOR_ENABLED) { @@ -51,7 +50,8 @@ function DisplayProviderConfig() $return = SaveProviderConfig($status, $someVar); } elseif (isset($_POST['StartProviderVPN'])) { $status->addMessage('Attempting to connect VPN provider', 'info'); - exec("sudo $binPath connect", $return); + $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); + exec("sudo $binPath $cmd", $return); foreach ($return as $line) { $status->addMessage($line, 'info'); } @@ -68,12 +68,13 @@ function DisplayProviderConfig() "provider", compact( "status", "serviceStatus", + "statusDisplay", "providerName", "providerVersion", "accountInfo", "countries", "providerLog", - "public_ip", + "publicIP", "ctlState" ) ); @@ -103,3 +104,62 @@ function stripArtifacts($output, $pattern = null) return $result; } +/** + * Retrieves an override for provider CLI + * + * @param integer $id + * @param string $group + * @param string $item + * @return string $override + */ +function getCliOverride($id, $group, $item) +{ + $obj = json_decode(file_get_contents(RASPI_CONFIG_PROVIDERS), true); + if ($obj === null) { + return false; + } else { + $id--; + if ($obj['providers'][$id][$group][$item] === null) { + return $item; + } else { + return $obj['providers'][$id][$group][$item]; + } + } +} + +/** + * Retreives VPN provider status + * + * @param integer $id + * @param string $binPath + * @return string $status + */ +function getProviderStatus($id, $binPath) +{ + $output = shell_exec("sudo $binPath status"); + $output = strtolower(($lastSpace = strrpos($output, ' ')) ? substr($output, $lastSpace + 1) : $output); + $return = getCliOverride($id, 'status', 'connected'); + $status = strtolower($return) == 'connected' ? "up" : "down"; + return $status; +} + +/** + * Retrieves available countries + * + * @param integer $id + * @param string $binPath + * @return array $countries + */ +function getCountries($id, $binPath) +{ + $cmd = getCliOverride($id, 'cmd_overrides', 'countries'); + $output = shell_exec("sudo $binPath $cmd"); + $output = stripArtifacts($output, '\s'); + $arrTmp = explode(",", $output); + $countries = array_combine($arrTmp, $arrTmp); + foreach ($countries as $key => $value) { + $countries[$key] = str_replace("_", " ", $value); + } + return $countries; +} + From 47f983a361ff885ad901b0711d556a2e61ae1d7e Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 16 Oct 2023 10:46:15 +0200 Subject: [PATCH 13/39] Minor: update template labels --- app/css/all.css | 2 +- templates/provider.php | 4 ++-- templates/provider/general.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/css/all.css b/app/css/all.css index d9de52e3..15700850 100644 --- a/app/css/all.css +++ b/app/css/all.css @@ -75,8 +75,8 @@ License: GNU General Public License v3.0 .service-status-down { color: #f80107 !important; - animation: flash 1s linear infinite; } + @keyframes flash { 50% { opacity: 0; diff --git a/templates/provider.php b/templates/provider.php index 0ca9827b..db334c86 100755 --- a/templates/provider.php +++ b/templates/provider.php @@ -20,7 +20,7 @@
    @@ -31,7 +31,7 @@
      -
      • +
    diff --git a/templates/provider/general.php b/templates/provider/general.php index 7c6cd209..ec55765f 100644 --- a/templates/provider/general.php +++ b/templates/provider/general.php @@ -1,5 +1,5 @@
    -

    +

    @@ -9,7 +9,7 @@
    - +
    From 99f8838fe202aa74b448c0333774c5024fe16275 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 18 Oct 2023 09:50:57 +0200 Subject: [PATCH 14/39] Populate country select, get provider log, connect to country --- app/css/all.css | 2 + includes/provider.php | 72 ++++++++++++++++++++++++++-------- templates/provider.php | 6 +-- templates/provider/general.php | 7 +++- templates/provider/status.php | 2 +- 5 files changed, 67 insertions(+), 22 deletions(-) diff --git a/app/css/all.css b/app/css/all.css index 15700850..7f07c51f 100644 --- a/app/css/all.css +++ b/app/css/all.css @@ -88,6 +88,8 @@ License: GNU General Public License v3.0 height: 20rem; border: 1px solid #d1d3e2; border-radius: .35rem; + font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace; + font-size: 0.9rem; } .dhcp-static-leases { diff --git a/includes/provider.php b/includes/provider.php index 7db7631d..521ae7f7 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -26,17 +26,15 @@ function DisplayProviderConfig() $statusDisplay = $serviceStatus == "down" ? "inactive" : "active"; // fetch provider log - $cmd = getCliOverride($id, 'cmd_overrides', 'status'); - $output = shell_exec("sudo $binPath $cmd"); - $providerLog = stripArtifacts($output); + $providerLog = getProviderLog($id, $binPath, $country); // fetch provider version $providerVersion = shell_exec("sudo $binPath -v"); // fetch account info $cmd = getCliOverride($id, 'cmd_overrides', 'account'); - exec("sudo $binPath $cmd", $output); - $accountInfo = stripArtifacts($output); + exec("sudo $binPath $cmd", $acct); + $accountInfo = stripArtifacts($acct); // fetch available countries $countries = getCountries($id, $binPath); @@ -44,20 +42,27 @@ function DisplayProviderConfig() if (!RASPI_MONITOR_ENABLED) { if (isset($_POST['SaveProviderSettings'])) { - if (isset($_POST['someVar'])) { - $someVar = strip_tags(trim($_POST['someVar'])); + if (isset($_POST['country'])) { + $country = trim($_POST['country']); + if (strlen($country) == 0) { + $status->addMessage('Select a country from the server location list', 'danger'); + } + $return = saveProviderConfig($status, $binPath, $country); } - $return = SaveProviderConfig($status, $someVar); } elseif (isset($_POST['StartProviderVPN'])) { $status->addMessage('Attempting to connect VPN provider', 'info'); $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); exec("sudo $binPath $cmd", $return); + sleep(3); // required for connect delay + $return = stripArtifacts($return); foreach ($return as $line) { $status->addMessage($line, 'info'); } } elseif (isset($_POST['StopProviderVPN'])) { $status->addMessage('Attempting to disconnect VPN provider', 'info'); - exec("sudo $binPath disconnect", $return); + $cmd = getCliOverride($id, 'cmd_overrides', 'disconnect'); + exec("sudo $binPath $cmd", $return); + $return = stripArtifacts($return); foreach ($return as $line) { $status->addMessage($line, 'info'); } @@ -73,6 +78,7 @@ function DisplayProviderConfig() "providerVersion", "accountInfo", "countries", + "country", "providerLog", "publicIP", "ctlState" @@ -86,9 +92,16 @@ function DisplayProviderConfig() * @param object $status * @return string $someVar */ -function SaveProviderConfig($status, $someVar) +function saveProviderConfig($status, $binPath, $country) { - + $status->addMessage('Attempting to connect to '.$country, 'info'); + $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); + exec("sudo $binPath $cmd $country", $return); + sleep(3); // required for connect delay + $return = stripArtifacts($return); + foreach ($return as $line) { + $status->addMessage($line, 'info'); + } } /** @@ -136,11 +149,14 @@ function getCliOverride($id, $group, $item) */ function getProviderStatus($id, $binPath) { - $output = shell_exec("sudo $binPath status"); - $output = strtolower(($lastSpace = strrpos($output, ' ')) ? substr($output, $lastSpace + 1) : $output); - $return = getCliOverride($id, 'status', 'connected'); - $status = strtolower($return) == 'connected' ? "up" : "down"; - return $status; + $cmd = getCliOverride($id, 'cmd_overrides', 'status'); + exec("sudo $binPath $cmd", $cmd_raw); + $cmd_raw = stripArtifacts($cmd_raw[0]); + if (preg_match('/Status: (\w+)/', $cmd_raw, $match)) { + $cli = getCliOverride($id, 'status', 'connected'); + $status = strtolower($match[1]) == $cli ? "up" : "down"; + } + return $status; } /** @@ -157,9 +173,33 @@ function getCountries($id, $binPath) $output = stripArtifacts($output, '\s'); $arrTmp = explode(",", $output); $countries = array_combine($arrTmp, $arrTmp); + $select = array(' ' => 'Select a country...'); + $countries = $select + $countries; foreach ($countries as $key => $value) { $countries[$key] = str_replace("_", " ", $value); } return $countries; } +/** + * Retrieves provider log + * + * @param integer $id + * @param string $binPath + * @param string $country + * @return string $log + */ +function getProviderLog($id, $binPath, &$country) +{ + $cmd = getCliOverride($id, 'cmd_overrides', 'status'); + exec("sudo $binPath $cmd", $cmd_raw); + $output = stripArtifacts($cmd_raw); + foreach ($output as $item) { + if (preg_match('/Country: (\w+)/', $item, $match)) { + $country = $match[1]; + } + $providerLog.= ltrim($item) .PHP_EOL; + } + return $providerLog; +} + diff --git a/templates/provider.php b/templates/provider.php index db334c86..a0f6648c 100755 --- a/templates/provider.php +++ b/templates/provider.php @@ -1,7 +1,7 @@ - class="btn btn-outline btn-primary " name="SaveProviderConfig" value="Save settings" /> - + class="btn btn-outline btn-primary " name="SaveProviderSettings" value="Save settings" /> + class="btn btn-success " name="StartProviderVPN" value="Connect " /> class="btn btn-warning " name="StopProviderVPN" value="Disconnect " /> @@ -57,7 +57,7 @@
    -
    +
    diff --git a/templates/provider/general.php b/templates/provider/general.php index ec55765f..41538aff 100644 --- a/templates/provider/general.php +++ b/templates/provider/general.php @@ -6,7 +6,7 @@
    - +
    @@ -33,8 +33,11 @@
    +
    + Save settings will connect to the selected country."); ?> +
    - +
    diff --git a/templates/provider/status.php b/templates/provider/status.php index 90d99dce..ad648ebe 100644 --- a/templates/provider/status.php +++ b/templates/provider/status.php @@ -1,6 +1,6 @@
    -

    +

    ".$providerVersion."") ?>

    ".strtolower($providerName)." connection status is displayed below.") ?>

    From 9a1457c6c8a63095dce91bb8d99597ede045652d Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 19 Oct 2023 14:07:26 +0200 Subject: [PATCH 15/39] Refactor getCountries w/ regexes, add getAccountInfo() --- app/css/all.css | 2 +- config/vpn-providers.json | 18 ++++++---- includes/provider.php | 73 +++++++++++++++++++++++++++++++-------- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/app/css/all.css b/app/css/all.css index 7f07c51f..023eb15b 100644 --- a/app/css/all.css +++ b/app/css/all.css @@ -89,7 +89,7 @@ License: GNU General Public License v3.0 border: 1px solid #d1d3e2; border-radius: .35rem; font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace; - font-size: 0.9rem; + font-size: 0.8rem; } .dhcp-static-leases { diff --git a/config/vpn-providers.json b/config/vpn-providers.json index 45b3bb96..029c534a 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -6,10 +6,14 @@ "bin_path": "/usr/bin/expressvpn", "install_page": "https://www.expressvpn.com/support/vpn-setup/app-for-linux/", "cmd_overrides": { - "countries": "list" + "countries": "list all", + "log": "diagnostics" }, - "status": { - "connected": "connected" + "regex": { + "status": "\/not connected\/", + "pattern": "\/^(.{2,5})\\s(?:.{1,28})(.{1,26}).*$\/", + "replace": "$1,$2", + "slice": 3 } }, { @@ -26,10 +30,12 @@ "bin_path": "/usr/bin/nordvpn", "install_page": "https://nordvpn.com/download/linux/", "cmd_overrides": { + "log": "status" }, - "status": { - "connected": "connected", - "disconnected": "disconnected" + "regex": { + "status": "\/status: (\\w+)\/", + "pattern": "(\\w+)\\s+", + "replace": "$1,$1\\n" } }, { diff --git a/includes/provider.php b/includes/provider.php index 521ae7f7..fce7e8dd 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -32,9 +32,7 @@ function DisplayProviderConfig() $providerVersion = shell_exec("sudo $binPath -v"); // fetch account info - $cmd = getCliOverride($id, 'cmd_overrides', 'account'); - exec("sudo $binPath $cmd", $acct); - $accountInfo = stripArtifacts($acct); + $accountInfo = getAccountInfo($id, $binPath, $providerName); // fetch available countries $countries = getCountries($id, $binPath); @@ -150,11 +148,13 @@ function getCliOverride($id, $group, $item) function getProviderStatus($id, $binPath) { $cmd = getCliOverride($id, 'cmd_overrides', 'status'); + $pattern = getCliOverride($id, 'regex', 'status'); exec("sudo $binPath $cmd", $cmd_raw); - $cmd_raw = stripArtifacts($cmd_raw[0]); - if (preg_match('/Status: (\w+)/', $cmd_raw, $match)) { - $cli = getCliOverride($id, 'status', 'connected'); - $status = strtolower($match[1]) == $cli ? "up" : "down"; + $cmd_raw = strtolower(stripArtifacts($cmd_raw[0])); + if (preg_match($pattern, $cmd_raw, $match)) { + $status = "down"; + } else { + $status = "up"; } return $status; } @@ -168,16 +168,39 @@ function getProviderStatus($id, $binPath) */ function getCountries($id, $binPath) { + $countries = []; $cmd = getCliOverride($id, 'cmd_overrides', 'countries'); - $output = shell_exec("sudo $binPath $cmd"); - $output = stripArtifacts($output, '\s'); - $arrTmp = explode(",", $output); - $countries = array_combine($arrTmp, $arrTmp); + $pattern = getCliOverride($id, 'regex', 'pattern'); + $replace = getCliOverride($id, 'regex', 'replace'); + $slice = getCliOverride($id, 'regex', 'slice'); + exec("sudo $binPath $cmd", $output); + + // CLI country output differs considerably between different providers. + // Ideally, custom parsing would be avoided in favor of a pure regex solution + switch ($id) { + case 1: // expressvpn + $output = array_slice($output, $slice); + foreach ($output as $item) { + $item = preg_replace($pattern, $replace, $item); + $parts = explode(',', $item); + $key = trim($parts[0]); + $value = trim($parts[1]); + $countries[$key] = $value; + } + break; + case 3: // nordvpn + $output = stripArtifacts($output,'\s'); + $arrTmp = explode(",", $output[0]); + $countries = array_combine($arrTmp, $arrTmp); + foreach ($countries as $key => $value) { + $countries[$key] = str_replace("_", " ", $value); + } + break; + default: + break; + } $select = array(' ' => 'Select a country...'); $countries = $select + $countries; - foreach ($countries as $key => $value) { - $countries[$key] = str_replace("_", " ", $value); - } return $countries; } @@ -191,7 +214,7 @@ function getCountries($id, $binPath) */ function getProviderLog($id, $binPath, &$country) { - $cmd = getCliOverride($id, 'cmd_overrides', 'status'); + $cmd = getCliOverride($id, 'cmd_overrides', 'log'); exec("sudo $binPath $cmd", $cmd_raw); $output = stripArtifacts($cmd_raw); foreach ($output as $item) { @@ -203,3 +226,23 @@ function getProviderLog($id, $binPath, &$country) return $providerLog; } +/** + * Retrieves provider account info + * + * @param integer $id + * @param string $binPath + * @param string $providerName + * @return array + */ +function getAccountInfo($id, $binPath, $providerName) +{ + $cmd = getCliOverride($id, 'cmd_overrides', 'account'); + exec("sudo $binPath $cmd", $acct); + $accountInfo = stripArtifacts($acct); + if (empty($accountInfo)) { + $msg = sprintf(_("Account details not available from %s's Linux CLI."), $providerName); + $accountInfo[] = $msg; + } + return $accountInfo; +} + From e51c6b0968c4af50e28c1d7f4db5ac72c4cf84b2 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 19 Oct 2023 18:18:14 +0200 Subject: [PATCH 16/39] Minor: label change --- includes/provider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/provider.php b/includes/provider.php index fce7e8dd..bb84debd 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -240,7 +240,7 @@ function getAccountInfo($id, $binPath, $providerName) exec("sudo $binPath $cmd", $acct); $accountInfo = stripArtifacts($acct); if (empty($accountInfo)) { - $msg = sprintf(_("Account details not available from %s's Linux CLI."), $providerName); + $msg = sprintf(_("Account information not available from %s's Linux CLI."), $providerName); $accountInfo[] = $msg; } return $accountInfo; From 1e6d94585acfd89fc54f7bf2a99e3348d12d8b61 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 20 Oct 2023 16:43:59 +0100 Subject: [PATCH 17/39] Parse mullvad relay list output, add getProviderVersion() --- config/vpn-providers.json | 9 ++++++ includes/provider.php | 61 ++++++++++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index 029c534a..b3a2296f 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -22,6 +22,15 @@ "bin_path": "/usr/bin/mullvad", "install_page": "https://mullvad.net/en/download/vpn/linux", "cmd_overrides": { + "account": "account get", + "countries": "relay list", + "log": "status -v", + "version": "--version" + }, + "regex": { + "status": "\/disconnected\/", + "pattern": "\/^(.*),.*$\/", + "replace": "$1" } }, { diff --git a/includes/provider.php b/includes/provider.php index bb84debd..2bb6bca7 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -29,7 +29,7 @@ function DisplayProviderConfig() $providerLog = getProviderLog($id, $binPath, $country); // fetch provider version - $providerVersion = shell_exec("sudo $binPath -v"); + $providerVersion = getProviderVersion($id, $binPath); // fetch account info $accountInfo = getAccountInfo($id, $binPath, $providerName); @@ -45,7 +45,7 @@ function DisplayProviderConfig() if (strlen($country) == 0) { $status->addMessage('Select a country from the server location list', 'danger'); } - $return = saveProviderConfig($status, $binPath, $country); + $return = saveProviderConfig($status, $binPath, $country, $id); } } elseif (isset($_POST['StartProviderVPN'])) { $status->addMessage('Attempting to connect VPN provider', 'info'); @@ -87,18 +87,29 @@ function DisplayProviderConfig() /** * Validates VPN provider settings * - * @param object $status - * @return string $someVar + * @param object $status + * @param string $binPath + * @param string $country + * @param integer $id (optional) */ -function saveProviderConfig($status, $binPath, $country) +function saveProviderConfig($status, $binPath, $country, $id = null) { $status->addMessage('Attempting to connect to '.$country, 'info'); $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); - exec("sudo $binPath $cmd $country", $return); - sleep(3); // required for connect delay + if ($id == 2) { // mullvad requires location set + exec("sudo $binPath set location $country", $return); + sleep(1); + exec("sudo $binPath $cmd $country", $return); + sleep(3); // required for connect delay + } else { + exec("sudo $binPath $cmd $country", $return); + sleep(3); + } $return = stripArtifacts($return); foreach ($return as $line) { - $status->addMessage($line, 'info'); + if ( strlen(trim($line)) >0 ) { + $status->addMessage($line, 'info'); + } } } @@ -188,6 +199,26 @@ function getCountries($id, $binPath) $countries[$key] = $value; } break; + case 2: // mullvad + foreach ($output as $item) { + $item = preg_replace($pattern, $replace, $item); + if (strlen(trim($item) >0)) { + preg_match('/\s+([a-z0-9-]+)\s.*$/', $item, $match); + if (count($match) > 1) { + $key = $match[1]; + $item = str_pad($item, strlen($item)+16,' ', STR_PAD_LEFT); + $countries[$key] = $item; + } else { + preg_match('/\(([a-z]+)\)/', $item, $match); + $key = $match[1]; + if (strlen($match[1]) == 3) { + $item = str_pad($item, strlen($item)+8,' ', STR_PAD_LEFT); + } + $countries[$key] = $item; + } + } + } + break; case 3: // nordvpn $output = stripArtifacts($output,'\s'); $arrTmp = explode(",", $output[0]); @@ -226,6 +257,20 @@ function getProviderLog($id, $binPath, &$country) return $providerLog; } +/** + * Retrieves provider version information + * + * @param integer $id + * @param string $binPath + * @return string $version + */ +function getProviderVersion($id, $binPath) +{ + $cmd = getCliOverride($id, 'cmd_overrides', 'version'); + $version = shell_exec("sudo $binPath $cmd"); + return $version; +} + /** * Retrieves provider account info * From ee662ada095c04c3839d8dfdb5ae03c83418e85e Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 21 Oct 2023 19:12:44 +0100 Subject: [PATCH 18/39] Update cmd_overrides + stripArtifacts regex --- config/vpn-providers.json | 3 ++- includes/provider.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index b3a2296f..cfed0f73 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -7,7 +7,8 @@ "install_page": "https://www.expressvpn.com/support/vpn-setup/app-for-linux/", "cmd_overrides": { "countries": "list all", - "log": "diagnostics" + "log": "diagnostics", + "version": "-v" }, "regex": { "status": "\/not connected\/", diff --git a/includes/provider.php b/includes/provider.php index 2bb6bca7..8398c288 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -122,7 +122,7 @@ function saveProviderConfig($status, $binPath, $country, $id = null) */ function stripArtifacts($output, $pattern = null) { - $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|]/', '', $output); + $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|\[0m\[1;33;49m]/', '', $output); return $result; } From dc65af90458c443a1076ff3e37dd3f7d654c30cb Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 21 Oct 2023 10:16:36 +0100 Subject: [PATCH 19/39] Read/set log-dhcp + log-queries in conf --- includes/dhcp.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/dhcp.php b/includes/dhcp.php index 65c04ceb..6c21fcea 100755 --- a/includes/dhcp.php +++ b/includes/dhcp.php @@ -47,6 +47,8 @@ function DisplayDHCPConfig() $ap_iface = $_SESSION['ap_interface']; $serviceStatus = $dnsmasq_state ? "up" : "down"; exec('cat '. RASPI_DNSMASQ_PREFIX.'raspap.conf', $return); + $log_dhcp = (preg_grep('/log-dhcp/', $return)); + $log_queries = (preg_grep('/log-queries/', $return)); $conf = ParseConfig($return); exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return); $conf = array_merge(ParseConfig($return)); @@ -55,6 +57,9 @@ function DisplayDHCPConfig() exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces); exec('cat ' . RASPI_DNSMASQ_LEASES, $leases); + count($log_dhcp) > 0 ? $conf['log-dhcp'] = true : false ; + count($log_queries) > 0 ? $conf['log-queries'] = true : false ; + echo renderTemplate( "dhcp", compact( "status", From a26a3b665e2d00655b3ae55a502f5bd6bfcf7bd1 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 20 Oct 2023 12:50:42 +0200 Subject: [PATCH 20/39] Detect unsupported Raspbian GNU/Linux 12 (bookworm) 32-bit --- installers/common.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/installers/common.sh b/installers/common.sh index 814b4088..e4b751b1 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -136,6 +136,17 @@ function _get_linux_distro() { else _install_status 1 "Unsupported Linux distribution" fi + + if [ ${OS,,} = "raspbian" ] && [[ ${RELEASE} =~ ^(12) ]]; then + echo "Detected OS: ${DESC} 32-bit" + echo "This OS introduces breaking changes to dhcpcd and is unsupported." + echo "If Raspberry Pi OS Lite (32-bit) is wanted, downgrade to bullseye." + echo "Note: Raspbian GNU/Linux 12 (bookworm) 64-bit is fully supported." + echo "See: https://docs.raspap.com/#compatible-operating-systems" + echo "The installer cannot continue." + _install_status 1 "Unsupported Linux distribution" + exit 0 + fi } # Sets php package option based on Linux version, abort if unsupported distro @@ -229,6 +240,7 @@ function _install_dependencies() { if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then dhcpcd_package="dhcpcd5" iw_package="iw" + echo "${dhcpcd_package} and ${iw_package} will be installed from the main deb sources list" fi # Set dconf-set-selections From 1b3e1c3372e9c73f4256ae3cd2073723f9023eb3 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 21 Oct 2023 08:53:09 +0100 Subject: [PATCH 21/39] Install dhcpcd-base dependency + systemd unit control file --- installers/common.sh | 26 +++++++++++++++----------- installers/dhcpcd.service | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 installers/dhcpcd.service diff --git a/installers/common.sh b/installers/common.sh index e4b751b1..1ad76937 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -136,17 +136,6 @@ function _get_linux_distro() { else _install_status 1 "Unsupported Linux distribution" fi - - if [ ${OS,,} = "raspbian" ] && [[ ${RELEASE} =~ ^(12) ]]; then - echo "Detected OS: ${DESC} 32-bit" - echo "This OS introduces breaking changes to dhcpcd and is unsupported." - echo "If Raspberry Pi OS Lite (32-bit) is wanted, downgrade to bullseye." - echo "Note: Raspbian GNU/Linux 12 (bookworm) 64-bit is fully supported." - echo "See: https://docs.raspap.com/#compatible-operating-systems" - echo "The installer cannot continue." - _install_status 1 "Unsupported Linux distribution" - exit 0 - fi } # Sets php package option based on Linux version, abort if unsupported distro @@ -243,6 +232,11 @@ function _install_dependencies() { echo "${dhcpcd_package} and ${iw_package} will be installed from the main deb sources list" fi + if [ ${OS,,} = "raspbian" ] && [[ ${RELEASE} =~ ^(12) ]]; then + dhcpcd_package="dhcpcd dhcpcd-base" + echo "${dhcpcd_package} will be installed from the main deb sources list" + fi + # Set dconf-set-selections echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections @@ -633,6 +627,7 @@ function _check_for_old_configs() { sudo ln -sf "${raspap_dir}/backups/${filename}.`date +%F-%R`" "${raspap_dir}/backups/${filename}" fi done + fi _install_status 0 } @@ -668,7 +663,16 @@ function _default_configuration() { if [ ! -f "$webroot_dir/includes/config.php" ]; then sudo cp "$webroot_dir/config/config.php" "$webroot_dir/includes/config.php" fi + + if [ ${OS,,} = "raspbian" ] && [[ ${RELEASE} =~ ^(12) ]]; then + echo "Moving dhcpcd systemd unit control file to /lib/systemd/system/" + sudo mv $webroot_dir/installers/dhcpcd.service /lib/systemd/system/ || _install_status 1 "Unable to move dhcpcd.service file" + sudo systemctl daemon-reload + sudo systemctl enable dhcpcd.service || _install_status 1 "Failed to enable raspap.service" + fi + _install_status 0 + exit 0 fi } diff --git a/installers/dhcpcd.service b/installers/dhcpcd.service new file mode 100644 index 00000000..b9443a97 --- /dev/null +++ b/installers/dhcpcd.service @@ -0,0 +1,14 @@ +[Unit] +Description=DHCP Client Daemon +Wants=network.target +Before=network-online.target +Documentation=man:dhcpcd(8) + +[Service] +Type=forking +ExecStart=/usr/sbin/dhcpcd -b -q +Restart=always + +[Install] +WantedBy=multi-user.target + From ada6cbf4d32f8e480eaede40108842c62a11756f Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 21 Oct 2023 08:59:13 +0100 Subject: [PATCH 22/39] Minor: remove whitespace + exit status --- installers/common.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index 1ad76937..cae95f76 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -627,7 +627,6 @@ function _check_for_old_configs() { sudo ln -sf "${raspap_dir}/backups/${filename}.`date +%F-%R`" "${raspap_dir}/backups/${filename}" fi done - fi _install_status 0 } @@ -672,7 +671,6 @@ function _default_configuration() { fi _install_status 0 - exit 0 fi } From 43d4bb2a2fcab9b21468609bcc9363851cfa695e Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 21 Oct 2023 11:02:57 +0100 Subject: [PATCH 23/39] More robust method to parse phy from selected interface --- ajax/networking/get_frequencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ajax/networking/get_frequencies.php b/ajax/networking/get_frequencies.php index 28d5ecd2..156413b0 100644 --- a/ajax/networking/get_frequencies.php +++ b/ajax/networking/get_frequencies.php @@ -12,7 +12,7 @@ if (isset($_POST['interface'])) { $flags = 0; // get physical device for selected interface - exec("iw dev | awk '/$iface/ {print line}{line = $0}'", $return); + exec("iw dev | awk -v iface=".$iface." '/^phy#/ { phy = $0 } $1 == \"Interface\" { interface = $2 } interface == iface { print phy }'", $return); $phy = $return[0]; // get frequencies supported by device From 45dc1142cbd0b804a73da6026bae316ff8acd0b7 Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 21 Oct 2023 15:43:49 +0100 Subject: [PATCH 24/39] Reduce service restart speed + UI tweaks --- app/js/custom.js | 7 ++++--- includes/hostapd.php | 6 +++--- templates/hostapd.php | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/js/custom.js b/app/js/custom.js index e7ec3b45..1d679dfd 100644 --- a/app/js/custom.js +++ b/app/js/custom.js @@ -274,15 +274,16 @@ function loadChannel() { } $('#hostapdModal').on('shown.bs.modal', function (e) { - var seconds = 9; + var seconds = 3; + var pct = 0; var countDown = setInterval(function(){ if(seconds <= 0){ clearInterval(countDown); } - var pct = Math.floor(100-(seconds*100/9)); document.getElementsByClassName('progress-bar').item(0).setAttribute('style','width:'+Number(pct)+'%'); seconds --; - }, 1000); + pct = Math.floor(100-(seconds*100/4)); + }, 500); }); $('#configureClientModal').on('shown.bs.modal', function (e) { diff --git a/includes/hostapd.php b/includes/hostapd.php index af488278..a052e4c2 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -49,11 +49,11 @@ function DisplayHostAPDConfig() if (isset($_POST['StartHotspot']) || isset($_POST['RestartHotspot'])) { $status->addMessage('Attempting to start hotspot', 'info'); if ($arrHostapdConf['BridgedEnable'] == 1) { - exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --interface br0 --seconds 3', $return); + exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --interface br0 --seconds 2', $return); } elseif ($arrHostapdConf['WifiAPEnable'] == 1) { - exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --interface uap0 --seconds 3', $return); + exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --interface uap0 --seconds 2', $return); } else { - exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --seconds 3', $return); + exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --seconds 2', $return); } foreach ($return as $line) { $status->addMessage($line, 'info'); diff --git a/templates/hostapd.php b/templates/hostapd.php index b6f2fce7..87a0c761 100755 --- a/templates/hostapd.php +++ b/templates/hostapd.php @@ -12,7 +12,7 @@
    - +
    ...
    From 65578d33ebf13e3d626a17614258b175ca9aaf80 Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2023 10:30:22 +0100 Subject: [PATCH 25/39] Create vnstat db entry for AP interface --- includes/dashboard.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/dashboard.php b/includes/dashboard.php index 724a0175..0d80a8f4 100755 --- a/includes/dashboard.php +++ b/includes/dashboard.php @@ -88,6 +88,11 @@ function DisplayDashboard(&$extraFooterScripts) $strTxBytes .= getHumanReadableDatasize($strTxBytes); } + exec ('vnstat --dbiflist', $stdoutVnStatDB); + if (!preg_match('/'.$_SESSION['ap_interface'].'/', $stdoutVnStatDB[0])) { + exec('sudo vnstat --add --iface '.$_SESSION['ap_interface'], $return); + } + define('SSIDMAXLEN', 32); // Warning iw comes with: "Do NOT screenscrape this tool, we don't consider its output stable." exec('iw dev ' .$_SESSION['wifi_client_interface']. ' link ', $stdoutIw); From a8f541c65997f47664357e3405b01b0f89edfe2e Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2023 10:31:01 +0100 Subject: [PATCH 26/39] Update raspap.sudoers with vnstat --- installers/raspap.sudoers | 1 + 1 file changed, 1 insertion(+) diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers index 8e7b3e72..2e97f4fc 100644 --- a/installers/raspap.sudoers +++ b/installers/raspap.sudoers @@ -64,3 +64,4 @@ www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/wireguard/*.conf www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/wireguard/wg-*.key www-data ALL=(ALL) NOPASSWD:/usr/sbin/netplan www-data ALL=(ALL) NOPASSWD:/bin/truncate -s 0 /tmp/*.log,/bin/truncate -s 0 /var/log/dnsmasq.log +www-data ALL=(ALL) NOPASSWD:/usr/bin/vnstat * From b93a12fcf474a4151938949da9e720a3be354aca Mon Sep 17 00:00:00 2001 From: billz Date: Mon, 23 Oct 2023 12:39:35 +0100 Subject: [PATCH 27/39] Update release version --- README.md | 2 +- includes/defaults.php | 2 +- index.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index de826dda..3dd1fc59 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![](https://i.imgur.com/xeKD93p.png) -[![Release 2.9.6](https://img.shields.io/badge/release-v2.9.6-green)](https://github.com/raspap/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Join Insiders](https://img.shields.io/static/v1?label=Join%20Insiders&message=%E2%9D%A4&logo=GitHub&color=ff69b4)](https://github.com/sponsors/RaspAP) [![Build Status](https://app.travis-ci.com/RaspAP/raspap-webgui.svg?branch=master)](https://app.travis-ci.com/RaspAP/raspap-webgui) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/) [![Join the chat at https://app.gitter.im/#/room/#RaspAP:gitter.im](https://img.shields.io/badge/chat-on%20gitter-brightgreen)](https://app.gitter.im/#/room/#RaspAP:gitter.im) +[![Release 2.9.7](https://img.shields.io/badge/release-v2.9.7-green)](https://github.com/raspap/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Join Insiders](https://img.shields.io/static/v1?label=Join%20Insiders&message=%E2%9D%A4&logo=GitHub&color=ff69b4)](https://github.com/sponsors/RaspAP) [![Build Status](https://app.travis-ci.com/RaspAP/raspap-webgui.svg?branch=master)](https://app.travis-ci.com/RaspAP/raspap-webgui) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/) [![Join the chat at https://app.gitter.im/#/room/#RaspAP:gitter.im](https://img.shields.io/badge/chat-on%20gitter-brightgreen)](https://app.gitter.im/#/room/#RaspAP:gitter.im) RaspAP is feature-rich wireless router software that _just works_ on many popular [Debian-based devices](#supported-operating-systems), including the Raspberry Pi. Our popular [Quick installer](#quick-installer) creates a known-good default configuration for all current Raspberry Pis with onboard wireless. A fully responsive, mobile-ready interface gives you control over the relevant services and networking options. Advanced DHCP settings, WireGuard and OpenVPN support, [SSL certificates](https://docs.raspap.com/ssl-quick/), security audits, [captive portal integration](https://docs.raspap.com/captive/), themes and [multilingual options](https://docs.raspap.com/translations/) are included. diff --git a/includes/defaults.php b/includes/defaults.php index dd5c588f..cd109b1c 100755 --- a/includes/defaults.php +++ b/includes/defaults.php @@ -6,7 +6,7 @@ if (!defined('RASPI_CONFIG')) { $defaults = [ 'RASPI_BRAND_TEXT' => 'RaspAP', - 'RASPI_VERSION' => '2.9.6', + 'RASPI_VERSION' => '2.9.7', 'RASPI_CONFIG_NETWORK' => RASPI_CONFIG.'/networking/defaults.json', 'RASPI_CONFIG_PROVIDERS' => 'config/vpn-providers.json', 'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth', diff --git a/index.php b/index.php index d0ec6b6a..eed98948 100755 --- a/index.php +++ b/index.php @@ -8,13 +8,13 @@ * Recommended distribution is Raspberry Pi OS (64-bit) Lite. Specific instructions to install the supported software are * in the README and original post by @SirLagz. For a quick run through, the packages required for the WebGUI are: * lighttpd (version 1.4.59 installed via apt) - * php-cgi (version 7.4.33 installed via apt) + * php-cgi (version 8.2.7 installed via apt) * along with their supporting packages, php7.4 will also need to be enabled. * * @author Lawrence Yau * @author Bill Zimmerman * @license GNU General Public License, version 3 (GPL-3.0) - * @version 2.9.6 + * @version 2.9.7 * @link https://github.com/RaspAP/raspap-webgui/ * @link https://raspap.com/ * @see http://sirlagz.net/2013/02/08/raspap-webgui/ From f254c015497f10f2a566599eabc0d1b548747c66 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 25 Oct 2023 11:14:23 +0100 Subject: [PATCH 28/39] Add msgs to locale/en_US + compile .mo --- locale/en_US/LC_MESSAGES/messages.mo | Bin 34375 -> 35831 bytes locale/en_US/LC_MESSAGES/messages.po | 45 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index ae9de85f81377b36527b6b58e5b47825421f1b5d..61815f7ddd2b8f630c8fe9bbaa304205426536c6 100644 GIT binary patch literal 35831 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 diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 368341c4..ab3424e4 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -1293,3 +1293,48 @@ msgstr "Enable Firewall" msgid "Apply changes" msgstr "Apply changes" + +#: includes/provider.php + +msgid "Account details" +msgstr "Account details" + +msgid "My account" +msgstr "My account" + +msgid "Server location" +msgstr "Server location" + +msgid "Choosing Save settings will connect to the selected country." +msgstr "Choosing Save settings will connect to the selected country." + +msgid "Select a country from the server location list" +msgstr "Select a country from the server location list" + +msgid "Select a country..." +msgstr "Select a country..." + +msgid "Account information not available from %s's Linux CLI." +msgstr "Account information not available from %s's Linux CLI." + +msgid "Attempting to connect to %s" +msgstr "Attempting to connect to %s" + +msgid "Attempting to connect VPN provider" +msgstr "Attempting to connect VPN provider" + +msgid "Attempting to disconnect VPN provider" +msgstr "Attempting to disconnect VPN provider" + +msgid "Expected %s binary not found at: %s" +msgstr "Expected %s binary not found at: %s" + +msgid "Visit the installation instructions for %s's Linux CLI." +msgstr "Visit the installation instructions for %s's Linux CLI." + +msgid "Installed Linux CLI: %s" +msgstr "Installed Linux CLI: %s" + +msgid "Current %s connection status is displayed below." +msgstr "Current %s connection status is displayed below." + From c4947eacba885ce3eff2f886fd508555d8bf9a97 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 25 Oct 2023 11:15:49 +0100 Subject: [PATCH 29/39] Update w/ provider account_pages --- config/vpn-providers.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index cfed0f73..854a661a 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -5,6 +5,7 @@ "name": "ExpressVPN", "bin_path": "/usr/bin/expressvpn", "install_page": "https://www.expressvpn.com/support/vpn-setup/app-for-linux/", + "account_page": "https://www.expressvpn.com/subscriptions", "cmd_overrides": { "countries": "list all", "log": "diagnostics", @@ -22,6 +23,7 @@ "name": "Mullvad VPN", "bin_path": "/usr/bin/mullvad", "install_page": "https://mullvad.net/en/download/vpn/linux", + "account_page": "https://mullvad.net/en/account", "cmd_overrides": { "account": "account get", "countries": "relay list", @@ -39,6 +41,7 @@ "name": "NordVPN", "bin_path": "/usr/bin/nordvpn", "install_page": "https://nordvpn.com/download/linux/", + "account_page": "https://my.nordaccount.com/dashboard/", "cmd_overrides": { "log": "status" }, @@ -47,14 +50,6 @@ "pattern": "(\\w+)\\s+", "replace": "$1,$1\\n" } - }, - { - "id": 4, - "name": "Proton VPN", - "bin_path": "/usr/bin/protonvpn-cli", - "install_page": "https://protonvpn.com/support/linux-vpn-tool/", - "cmd_overrides": { - } } ] } From 3008f514506ec317a704fbc2d341c12b34da54e8 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 25 Oct 2023 14:00:58 +0100 Subject: [PATCH 30/39] Update template gettext msgs + locale --- locale/en_US/LC_MESSAGES/messages.mo | Bin 35831 -> 36241 bytes locale/en_US/LC_MESSAGES/messages.po | 15 +++++++++++++++ templates/provider.php | 26 ++++---------------------- templates/provider/general.php | 5 +++-- templates/provider/status.php | 4 ++-- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 61815f7ddd2b8f630c8fe9bbaa304205426536c6..412bad3c5c7a3478e1d8b2fbfbd7497cb23bb7b1 100644 GIT binary patch delta 9740 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 LVfFm~|GM=*O&6ql delta 9421 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 YvIjHv)GGV3`27lHD@N7}_installation instructions for %s's Linux CLI." msgstr "Visit the installation instructions for %s's Linux CLI." +msgid "Unable to execute %s binary found at: %s" +msgstr "Unable to execute %s binary found at: %s" + +msgid "Check that binary is executable and permissions exist in raspap.sudoers" +msgstr "Check that binary is executable and permissions exist in raspap.sudoers" + msgid "Installed Linux CLI: %s" msgstr "Installed Linux CLI: %s" msgid "Current %s connection status is displayed below." msgstr "Current %s connection status is displayed below." +msgid "Information provided by %s" +msgstr "Information provided by %s" + +msgid "Connect %s" +msgstr "Connect %s" + +msgid "Disconnect %s" +msgstr "Disconnect %s" + diff --git a/templates/provider.php b/templates/provider.php index a0f6648c..810a0c04 100755 --- a/templates/provider.php +++ b/templates/provider.php @@ -1,10 +1,10 @@ - class="btn btn-outline btn-primary " name="SaveProviderSettings" value="Save settings" /> + class="btn btn-outline btn-primary " name="SaveProviderSettings" value="" /> - class="btn btn-success " name="StartProviderVPN" value="Connect " /> + class="btn btn-success " name="StartProviderVPN" value="" /> - class="btn btn-warning " name="StopProviderVPN" value="Disconnect " /> + class="btn btn-warning " name="StopProviderVPN" value="" /> @@ -44,26 +44,8 @@
    -
    +
    - - - diff --git a/templates/provider/general.php b/templates/provider/general.php index 41538aff..353d5494 100644 --- a/templates/provider/general.php +++ b/templates/provider/general.php @@ -16,20 +16,21 @@
    +
    -
    '. $item .'
    '; } ?> - " /> +
    +
    diff --git a/templates/provider/status.php b/templates/provider/status.php index ad648ebe..90f80f9a 100644 --- a/templates/provider/status.php +++ b/templates/provider/status.php @@ -2,8 +2,8 @@

    -

    ".$providerVersion."") ?>

    -

    ".strtolower($providerName)." connection status is displayed below.") ?>

    +

    %s"), $providerVersion); ?>

    +

    %s connection status is displayed below."), strtolower($providerName)); ?>

    From 20e36335414526ae9ddd906a4a3f0802c4f669b3 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 25 Oct 2023 14:07:46 +0100 Subject: [PATCH 31/39] Set defaults, check if binary is executable --- includes/provider.php | 55 ++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/includes/provider.php b/includes/provider.php index 8398c288..18452cf3 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -3,21 +3,31 @@ require_once 'includes/config.php'; /* - * Manage VPN provider configuration + * Display VPN provider configuration */ function DisplayProviderConfig() { + // initialize status object $status = new \RaspAP\Messages\StatusMessage; + // set defaults $id = $_SESSION["providerID"]; - $providerName = getProviderValue($id, "name"); $binPath = getProviderValue($id, "bin_path"); + $providerName = getProviderValue($id, "name"); + $providerVersion = getProviderVersion($id, $binPath); + $installPage = getProviderValue($id, "install_page"); $publicIP = get_public_ip(); + $serviceStatus = 'down'; + $statusDisplay = 'down'; if (!file_exists($binPath)) { - $installPage = getProviderValue($id, "install_page"); - $status->addMessage('Expected '.$providerName.' binary not found at: '.$binPath, 'warning'); - $status->addMessage('Visit the installation instructions for '.$providerName.'\'s Linux CLI.', 'warning'); + $status->addMessage(sprintf(_('Expected %s binary not found at: %s'), $providerName, $binPath), 'warning'); + $status->addMessage(sprintf(_('Visit the installation instructions for %s\'s Linux CLI.'), $installPage, $providerName), 'warning'); + $ctlState = 'disabled'; + $providerVersion = 'not found'; + } elseif (empty($providerVersion)) { + $status->addMessage(sprintf(_('Unable to execute %s binary found at: %s'), $providerName, $binPath), 'warning'); + $status->addMessage(_('Check that binary is executable and permissions exist in raspap.sudoers'), 'warning'); $ctlState = 'disabled'; $providerVersion = 'not found'; } else { @@ -28,11 +38,9 @@ function DisplayProviderConfig() // fetch provider log $providerLog = getProviderLog($id, $binPath, $country); - // fetch provider version - $providerVersion = getProviderVersion($id, $binPath); - // fetch account info $accountInfo = getAccountInfo($id, $binPath, $providerName); + $accountLink = getProviderValue($id, "account_page"); // fetch available countries $countries = getCountries($id, $binPath); @@ -75,6 +83,7 @@ function DisplayProviderConfig() "providerName", "providerVersion", "accountInfo", + "accountLink", "countries", "country", "providerLog", @@ -94,7 +103,7 @@ function DisplayProviderConfig() */ function saveProviderConfig($status, $binPath, $country, $id = null) { - $status->addMessage('Attempting to connect to '.$country, 'info'); + $status->addMessage(sprintf(_('Attempting to connect to %s',$country)), 'info'); $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); if ($id == 2) { // mullvad requires location set exec("sudo $binPath set location $country", $return); @@ -122,7 +131,7 @@ function saveProviderConfig($status, $binPath, $country, $id = null) */ function stripArtifacts($output, $pattern = null) { - $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|\[0m\[1;33;49m]/', '', $output); + $result = preg_replace('/[-\/\n\t\\\\'.$pattern.'|]/', '', $output); return $result; } @@ -162,10 +171,14 @@ function getProviderStatus($id, $binPath) $pattern = getCliOverride($id, 'regex', 'status'); exec("sudo $binPath $cmd", $cmd_raw); $cmd_raw = strtolower(stripArtifacts($cmd_raw[0])); - if (preg_match($pattern, $cmd_raw, $match)) { - $status = "down"; + if (!empty($cmd_raw[0])) { + if (preg_match($pattern, $cmd_raw, $match)) { + $status = "down"; + } else { + $status = "up"; + } } else { - $status = "up"; + $status = "down"; } return $status; } @@ -230,7 +243,7 @@ function getCountries($id, $binPath) default: break; } - $select = array(' ' => 'Select a country...'); + $select = array(' ' => _("Select a country...")); $countries = $select + $countries; return $countries; } @@ -268,6 +281,7 @@ function getProviderVersion($id, $binPath) { $cmd = getCliOverride($id, 'cmd_overrides', 'version'); $version = shell_exec("sudo $binPath $cmd"); + $version = preg_replace('/^[^\w]+\s*/', '', $version); return $version; } @@ -283,11 +297,14 @@ function getAccountInfo($id, $binPath, $providerName) { $cmd = getCliOverride($id, 'cmd_overrides', 'account'); exec("sudo $binPath $cmd", $acct); - $accountInfo = stripArtifacts($acct); - if (empty($accountInfo)) { - $msg = sprintf(_("Account information not available from %s's Linux CLI."), $providerName); - $accountInfo[] = $msg; + + foreach ($acct as &$item) { + $item = preg_replace('/^[^\w]+\s*/', '', $item); } - return $accountInfo; + if (empty($acct)) { + $msg = sprintf(_("Account information not available from %s's Linux CLI."), $providerName); + $acct[] = $msg; + } + return $acct; } From 63f2c38f4c9fadda7c65e6812e8b1cd7abade591 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 25 Oct 2023 14:38:49 +0100 Subject: [PATCH 32/39] Update provider status regex, validate country select --- config/vpn-providers.json | 2 +- includes/provider.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/vpn-providers.json b/config/vpn-providers.json index 854a661a..3108295f 100644 --- a/config/vpn-providers.json +++ b/config/vpn-providers.json @@ -46,7 +46,7 @@ "log": "status" }, "regex": { - "status": "\/status: (\\w+)\/", + "status": "\/status: disconnected\/", "pattern": "(\\w+)\\s+", "replace": "$1,$1\\n" } diff --git a/includes/provider.php b/includes/provider.php index 18452cf3..2624c169 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -52,8 +52,9 @@ function DisplayProviderConfig() $country = trim($_POST['country']); if (strlen($country) == 0) { $status->addMessage('Select a country from the server location list', 'danger'); + } else { + $return = saveProviderConfig($status, $binPath, $country, $id); } - $return = saveProviderConfig($status, $binPath, $country, $id); } } elseif (isset($_POST['StartProviderVPN'])) { $status->addMessage('Attempting to connect VPN provider', 'info'); @@ -70,7 +71,9 @@ function DisplayProviderConfig() exec("sudo $binPath $cmd", $return); $return = stripArtifacts($return); foreach ($return as $line) { - $status->addMessage($line, 'info'); + if (strlen(trim($line)) > 0) { + $status->addMessage($line, 'info'); + } } } } @@ -103,7 +106,7 @@ function DisplayProviderConfig() */ function saveProviderConfig($status, $binPath, $country, $id = null) { - $status->addMessage(sprintf(_('Attempting to connect to %s',$country)), 'info'); + $status->addMessage(sprintf(_('Attempting to connect to %s'),$country), 'info'); $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); if ($id == 2) { // mullvad requires location set exec("sudo $binPath set location $country", $return); @@ -171,6 +174,7 @@ function getProviderStatus($id, $binPath) $pattern = getCliOverride($id, 'regex', 'status'); exec("sudo $binPath $cmd", $cmd_raw); $cmd_raw = strtolower(stripArtifacts($cmd_raw[0])); + if (!empty($cmd_raw[0])) { if (preg_match($pattern, $cmd_raw, $match)) { $status = "down"; From 601f587cb0ae078946bb997e05dea633656f293e Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 25 Oct 2023 17:01:26 +0100 Subject: [PATCH 33/39] Cleanup provider disconnect status msgs --- includes/provider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/provider.php b/includes/provider.php index 2624c169..59014ecf 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -72,6 +72,7 @@ function DisplayProviderConfig() $return = stripArtifacts($return); foreach ($return as $line) { if (strlen(trim($line)) > 0) { + $line = preg_replace('/\[1;33;49m(.*)\[0m/', '$1', $line); $status->addMessage($line, 'info'); } } From bc03b329cae0ddfde9009048f4ae9eb03a6b7b2e Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 26 Oct 2023 09:57:06 +0100 Subject: [PATCH 34/39] Remove connect delay, strip ANSI sequences from connect output --- includes/provider.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/provider.php b/includes/provider.php index 59014ecf..42e5a403 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -60,10 +60,13 @@ function DisplayProviderConfig() $status->addMessage('Attempting to connect VPN provider', 'info'); $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); exec("sudo $binPath $cmd", $return); - sleep(3); // required for connect delay $return = stripArtifacts($return); foreach ($return as $line) { - $status->addMessage($line, 'info'); + if (strlen(trim($line)) > 0) { + $line = preg_replace('/\e\[\?[0-9]*l\s(.*)\e.*$/', '$1', $line); + $line = preg_replace('/\e\[0m\e\[[0-9;]*m(.*)/', '$1', $line); + $status->addMessage($line, 'info'); + } } } elseif (isset($_POST['StopProviderVPN'])) { $status->addMessage('Attempting to disconnect VPN provider', 'info'); From 0136c32403f8673c88a5ef49ce3db63ba544a210 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 26 Oct 2023 13:59:08 +0100 Subject: [PATCH 35/39] Add jq to _install_dependencies(), modify sudoers entry --- installers/common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installers/common.sh b/installers/common.sh index cae95f76..5207973f 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -240,7 +240,7 @@ function _install_dependencies() { # Set dconf-set-selections echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections - sudo apt-get install -y lighttpd git hostapd dnsmasq iptables-persistent $php_package $dhcpcd_package $iw_package vnstat qrencode || _install_status 1 "Unable to install dependencies" + sudo apt-get install -y lighttpd git hostapd dnsmasq iptables-persistent $php_package $dhcpcd_package $iw_package vnstat qrencode jq || _install_status 1 "Unable to install dependencies" _install_status 0 } @@ -410,7 +410,7 @@ function _install_adblock() { # Prompt to install VPN providers function _prompt_install_vpn_providers() { - _install_log "Configure VPN provider support" + _install_log "Configure VPN provider support (Beta)" echo -n "Enable VPN provider client configuration? [Y/n]: " if [ "$assume_yes" == 0 ]; then read answer < /dev/tty @@ -450,7 +450,7 @@ function _install_provider() { bin_path=${selected#*|} if ! grep -q "$bin_path" "$webroot_dir/installers/raspap.sudoers"; then echo "Adding $bin_path to raspap.sudoers" - echo "www-data ALL=(ALL) NOPASSWD:$bin_path" | sudo tee -a "$webroot_dir/installers/raspap.sudoers" > /dev/null || _install_status 1 "Unable to modify raspap.sudoers" + echo "www-data ALL=(ALL) NOPASSWD:$bin_path *" | sudo tee -a "$webroot_dir/installers/raspap.sudoers" > /dev/null || _install_status 1 "Unable to modify raspap.sudoers" fi echo "Enabling administration option for ${selected%%|*}" sudo sed -i "s/\('RASPI_VPN_PROVIDER_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php" From 574113bf28f4e40e0be3870274c7a5e2ae2a88e1 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 26 Oct 2023 15:29:32 +0100 Subject: [PATCH 36/39] Update exec mullvad connect w/ location set --- includes/provider.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/includes/provider.php b/includes/provider.php index 42e5a403..b117e693 100755 --- a/includes/provider.php +++ b/includes/provider.php @@ -112,14 +112,12 @@ function saveProviderConfig($status, $binPath, $country, $id = null) { $status->addMessage(sprintf(_('Attempting to connect to %s'),$country), 'info'); $cmd = getCliOverride($id, 'cmd_overrides', 'connect'); - if ($id == 2) { // mullvad requires location set - exec("sudo $binPath set location $country", $return); - sleep(1); - exec("sudo $binPath $cmd $country", $return); - sleep(3); // required for connect delay + // mullvad requires relay set location before connect + if ($id == 2) { + exec("sudo $binPath relay set location $country", $return); + exec("sudo $binPath $cmd", $return); } else { exec("sudo $binPath $cmd $country", $return); - sleep(3); } $return = stripArtifacts($return); foreach ($return as $line) { From f481b51c9d205e6af87c3a201fae4247954eb652 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 27 Oct 2023 09:26:19 +0100 Subject: [PATCH 37/39] Update _download_latest_files() exit on clone failure --- installers/common.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/installers/common.sh b/installers/common.sh index 5207973f..05c15ee0 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -562,7 +562,13 @@ function _download_latest_files() { _install_status 3 echo "Insiders please read this: https://docs.raspap.com/insiders/#authentication" fi - git clone --branch $branch --depth 1 -c advice.detachedHead=false $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github" + git clone --branch $branch --depth 1 -c advice.detachedHead=false $git_source_url /tmp/raspap-webgui || clone=false + if [ "$clone" = false ]; then + _install_status 1 "Unable to download files from github" + echo "The installer cannot continue." >&2 + exit 1 + fi + sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root" if [ "$upgrade" == 1 ]; then From 5ec7d4908eb33f5e07447f53c2aa945ee448effc Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 27 Oct 2023 11:22:18 +0100 Subject: [PATCH 38/39] Add descriptive text for connect provider, update en_US locale msgs --- locale/en_US/LC_MESSAGES/messages.mo | Bin 36241 -> 36407 bytes locale/en_US/LC_MESSAGES/messages.po | 3 +++ templates/provider/general.php | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 412bad3c5c7a3478e1d8b2fbfbd7497cb23bb7b1..36af0739751cc78e493e729fd9e6819efab63a7d 100644 GIT binary patch delta 9534 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 delta 9451 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 diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index f93c5a6c..0f48a1ed 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -1308,6 +1308,9 @@ msgstr "Server location" msgid "Choosing Save settings will connect to the selected country." msgstr "Choosing Save settings will connect to the selected country." +msgid "Choosing Connect %s will connect to a recommended server." +msgstr "Choosing Connect %s will connect to a recommended server." + msgid "Select a country from the server location list" msgstr "Select a country from the server location list" diff --git a/templates/provider/general.php b/templates/provider/general.php index 353d5494..b7e7c5dd 100644 --- a/templates/provider/general.php +++ b/templates/provider/general.php @@ -34,9 +34,12 @@
    -
    +
    Save settings will connect to the selected country."); ?>
    +
    + Connect %s will connect to a recommended server."), $providerName); ?> +
    From 516de1f08087df4986ed58705522bf1caa8560cd Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 27 Oct 2023 11:36:44 +0100 Subject: [PATCH 39/39] Update installer output LONG_BIT --- installers/common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installers/common.sh b/installers/common.sh index 05c15ee0..34975cbf 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -91,7 +91,7 @@ function _config_installation() { fi _install_log "Configure ${opt[2]}" _get_linux_distro - echo "Detected OS: ${DESC}" + echo "Detected OS: ${DESC} ${LONG_BIT}-bit" echo "Using GitHub repository: ${repo} ${branch} branch" echo "Configuration directory: ${raspap_dir}" echo -n "lighttpd root: ${webroot_dir}? [Y/n]: " @@ -127,6 +127,7 @@ function _get_linux_distro() { RELEASE=$(lsb_release -sr) CODENAME=$(lsb_release -sc) DESC=$(lsb_release -sd) + LONG_BIT=$(getconf LONG_BIT) elif [ -f /etc/os-release ]; then # freedesktop.org . /etc/os-release OS=$ID