2016-04-19 18:01:55 +00:00
#!/usr/bin/env bash
2019-11-07 16:29:21 +00:00
# PiVPN: Trivial OpenVPN or WireGuard setup and configuration
2019-10-14 10:11:16 +00:00
# Easiest setup and mangement of OpenVPN or WireGuard on Raspberry Pi
2020-02-05 19:29:14 +00:00
# https://pivpn.io
2016-04-20 21:33:54 +00:00
# Heavily adapted from the pi-hole.net project and...
2016-04-19 18:01:55 +00:00
# https://github.com/StarshipEngineer/OpenVPN-Setup/
#
# Install with this command (from your Pi):
#
2020-02-05 19:29:14 +00:00
# curl -L https://install.pivpn.io | bash
2016-11-05 13:42:37 +00:00
# Make sure you have `curl` installed
2016-04-19 18:01:55 +00:00
2019-03-03 09:18:45 +00:00
######## VARIABLES #########
2020-10-25 10:54:14 +00:00
pivpnGitUrl = "https://github.com/pivpn/pivpn.git"
2020-05-25 14:54:39 +00:00
#pivpnGitUrl="/home/pi/repos/pivpn"
2020-04-28 22:44:56 +00:00
setupVarsFile = "setupVars.conf"
2020-09-03 10:39:26 +00:00
setupConfigDir = "/etc/pivpn"
2020-04-28 22:44:56 +00:00
tempsetupVarsFile = "/tmp/setupVars.conf"
2020-05-27 14:36:26 +00:00
pivpnFilesDir = "/usr/local/src/pivpn"
2020-05-01 23:06:09 +00:00
pivpnScriptDir = "/opt/pivpn"
2020-03-04 11:48:14 +00:00
2020-02-13 10:30:13 +00:00
piholeSetupVars = "/etc/pihole/setupVars.conf"
2020-02-07 17:07:15 +00:00
dnsmasqConfig = "/etc/dnsmasq.d/02-pivpn.conf"
2016-12-24 05:20:45 +00:00
2020-03-04 11:48:14 +00:00
dhcpcdFile = "/etc/dhcpcd.conf"
subnetClass = "24"
debianOvpnUserGroup = "openvpn:openvpn"
######## PKG Vars ########
2016-12-24 05:20:45 +00:00
PKG_MANAGER = "apt-get"
PKG_CACHE = "/var/lib/apt/lists/"
2019-12-10 18:07:08 +00:00
### FIXME: quoting UPDATE_PKG_CACHE and PKG_INSTALL hangs the script, shellcheck SC2086
2021-01-12 15:30:11 +00:00
UPDATE_PKG_CACHE = " ${ PKG_MANAGER } update -y "
2016-12-24 05:20:45 +00:00
PKG_INSTALL = " ${ PKG_MANAGER } --yes --no-install-recommends install "
PKG_COUNT = " ${ PKG_MANAGER } -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true "
2019-11-14 14:07:01 +00:00
2019-11-07 16:29:21 +00:00
# Dependencies that are required by the script, regardless of the VPN protocol chosen
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
BASE_DEPS = ( git tar wget curl grep dnsutils whiptail net-tools bsdmainutils)
2019-11-14 14:07:01 +00:00
2019-11-07 16:29:21 +00:00
# Dependencies that where actually installed by the script. For example if the script requires
# grep and dnsutils but dnsutils is already installed, we save grep here. This way when uninstalling
# PiVPN we won't prompt to remove packages that may have been installed by the user for other reasons
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
INSTALLED_PACKAGES = ( )
2016-12-24 05:20:45 +00:00
2020-03-04 11:48:14 +00:00
######## URLs ########
2020-06-06 13:39:37 +00:00
easyrsaVer = "3.0.7"
easyrsaRel = " https://github.com/OpenVPN/easy-rsa/releases/download/v ${ easyrsaVer } /EasyRSA- ${ easyrsaVer } .tgz "
2018-09-04 10:06:52 +00:00
2020-03-04 11:48:14 +00:00
######## Undocumented Flags. Shhh ########
runUnattended = false
skipSpaceCheck = false
reconfigure = false
2020-05-28 11:59:18 +00:00
showUnsupportedNICs = false
2020-03-04 11:48:14 +00:00
######## SCRIPT ########
2020-02-10 20:57:09 +00:00
2016-11-08 17:03:42 +00:00
# Find the rows and columns. Will default to 80x24 if it can not be detected.
2017-01-22 11:44:36 +00:00
screen_size = $( stty size 2>/dev/null || echo 24 80)
2019-12-08 19:14:23 +00:00
rows = $( echo " $screen_size " | awk '{print $1}' )
columns = $( echo " $screen_size " | awk '{print $2}' )
2016-04-19 18:01:55 +00:00
# Divide by two so the dialogs take up half of the screen, which looks nice.
r = $(( rows / 2 ))
c = $(( columns / 2 ))
2016-11-08 17:03:42 +00:00
# Unless the screen is tiny
r = $(( r < 20 ? 20 : r ))
c = $(( c < 70 ? 70 : c ))
2016-04-19 18:01:55 +00:00
2020-03-10 12:02:35 +00:00
# Override localization settings so the output is in English language.
export LC_ALL = C
2020-10-24 11:16:56 +00:00
# Enable recursive globbing to find wireguard.ko in /lib/modules.
shopt -s globstar
2019-12-29 17:25:35 +00:00
main( ) {
######## FIRST CHECK ########
# Must be root to install
echo ":::"
if [ [ $EUID -eq 0 ] ] ; then
echo "::: You are root."
else
echo "::: sudo will be used for the install."
# Check if it is actually installed
# If it isn't, exit because the install cannot complete
if [ [ $( dpkg-query -s sudo) ] ] ; then
export SUDO = "sudo"
export SUDOE = "sudo -E"
else
echo "::: Please install sudo or run this as root."
exit 1
fi
fi
# Check arguments for the undocumented flags
2020-05-28 13:16:45 +00:00
for ( ( i = 1; i <= " $# " ; i++) ) ; do
j = " $(( i+1)) "
case " ${ !i } " in
"--skip-space-check" ) skipSpaceCheck = true; ;
"--unattended" ) runUnattended = true; unattendedConfig = " ${ !j } " ; ;
"--reconfigure" ) reconfigure = true; ;
2020-05-28 11:59:18 +00:00
"--show-unsupported-nics" ) showUnsupportedNICs = true; ;
2019-12-29 17:25:35 +00:00
esac
done
if [ [ " ${ runUnattended } " = = true ] ] ; then
echo "::: --unattended passed to install script, no whiptail dialogs will be displayed"
2020-05-28 13:16:45 +00:00
if [ -z " $unattendedConfig " ] ; then
echo "::: No configuration file passed"
exit 1
2019-12-29 17:25:35 +00:00
else
2020-05-28 13:16:45 +00:00
if [ -r " $unattendedConfig " ] ; then
# shellcheck disable=SC1090
source " $unattendedConfig "
2019-12-29 17:25:35 +00:00
else
2020-05-28 13:16:45 +00:00
echo " ::: Can't open $unattendedConfig "
2019-12-29 17:25:35 +00:00
exit 1
fi
fi
fi
2020-04-28 22:44:56 +00:00
# see which setup already exists
2020-05-10 16:37:30 +00:00
if [ -r " ${ setupConfigDir } /wireguard/ ${ setupVarsFile } " ] ; then
2020-05-22 11:46:37 +00:00
setupVars = " ${ setupConfigDir } /wireguard/ ${ setupVarsFile } "
2020-05-10 16:37:30 +00:00
elif [ -r " ${ setupConfigDir } /openvpn/ ${ setupVarsFile } " ] ; then
2020-05-22 11:46:37 +00:00
setupVars = " ${ setupConfigDir } /openvpn/ ${ setupVarsFile } "
2020-09-03 10:39:26 +00:00
fi
2020-04-28 22:44:56 +00:00
2020-09-03 10:39:26 +00:00
if [ -r " $setupVars " ] ; then
2019-12-29 17:25:35 +00:00
if [ [ " ${ reconfigure } " = = true ] ] ; then
echo "::: --reconfigure passed to install script, will reinstall PiVPN overwriting existing settings"
UpdateCmd = "Reconfigure"
elif [ [ " ${ runUnattended } " = = true ] ] ; then
### What should the script do when passing --unattended to an existing installation?
UpdateCmd = "Reconfigure"
else
2020-05-10 16:37:30 +00:00
askAboutExistingInstall ${ setupVars }
2019-12-29 17:25:35 +00:00
fi
fi
if [ -z " $UpdateCmd " ] || [ " $UpdateCmd " = "Reconfigure" ] ; then
:
elif [ " $UpdateCmd " = "Update" ] ; then
2020-05-01 23:06:09 +00:00
$SUDO ${ pivpnScriptDir } /update.sh " $@ "
2019-12-30 10:44:33 +00:00
exit 0
2019-12-29 17:25:35 +00:00
elif [ " $UpdateCmd " = "Repair" ] ; then
2020-01-06 01:06:47 +00:00
# shellcheck disable=SC1090
2020-09-03 10:39:26 +00:00
source " $setupVars "
2019-12-29 17:25:35 +00:00
runUnattended = true
fi
# Check for supported distribution
distroCheck
# Checks for hostname Length
checkHostname
# Start the installer
# Verify there is enough disk space for the install
if [ [ " ${ skipSpaceCheck } " = = true ] ] ; then
2020-05-28 13:16:45 +00:00
echo "::: --skip-space-check passed to script, skipping free disk space verification!"
2019-12-29 17:25:35 +00:00
else
verifyFreeDiskSpace
fi
updatePackageCache
# Notify user of package availability
notifyPackageUpdatesAvailable
# Install packages used by this installation script
preconfigurePackages
installDependentPackages BASE_DEPS[ @]
# Display welcome dialogs
welcomeDialogs
# Find interfaces and let the user choose one
chooseInterface
if [ " $PLAT " != "Raspbian" ] ; then
avoidStaticIPv4Ubuntu
else
getStaticIPv4Settings
2020-01-20 08:34:43 +00:00
if [ -z " $dhcpReserv " ] || [ " $dhcpReserv " -ne 1 ] ; then
2020-01-07 00:30:17 +00:00
setStaticIPv4
fi
2019-12-29 17:25:35 +00:00
fi
# Choose the user for the ovpns
chooseUser
# Clone/Update the repos
cloneOrUpdateRepos
# Install
if installPiVPN; then
echo "::: Install Complete..."
else
exit 1
fi
# Start services
restartServices
# Ask if unattended-upgrades will be enabled
askUnattendedUpgrades
if [ " $UNATTUPG " -eq 1 ] ; then
confUnattendedUpgrades
fi
# Save installation setting to the final location
2020-04-28 22:44:56 +00:00
echo " INSTALLED_PACKAGES=( ${ INSTALLED_PACKAGES [*] } ) " >> ${ tempsetupVarsFile }
2020-05-01 23:06:09 +00:00
echo " ::: Setupfiles copied to ${ setupConfigDir } / ${ VPN } / ${ setupVarsFile } "
2020-12-05 11:28:14 +00:00
$SUDO mkdir -p " ${ setupConfigDir } / ${ VPN } / "
2020-09-03 10:39:26 +00:00
$SUDO cp ${ tempsetupVarsFile } " ${ setupConfigDir } / ${ VPN } / ${ setupVarsFile } "
2019-12-29 17:25:35 +00:00
installScripts
# Ensure that cached writes reach persistent storage
echo "::: Flushing writes to disk..."
sync
echo "::: done."
displayFinalMessage
echo ":::"
}
2020-01-06 01:06:47 +00:00
####### FUNCTIONS ##########
2019-12-29 17:25:35 +00:00
askAboutExistingInstall( ) {
opt1a = "Update"
opt1b = "Get the latest PiVPN scripts"
opt2a = "Repair"
opt2b = "Reinstall PiVPN using existing settings"
opt3a = "Reconfigure"
opt3b = "Reinstall PiVPN with new settings"
2020-05-22 11:46:37 +00:00
UpdateCmd = $( whiptail --title "Existing Install Detected!" --menu " \nWe have detected an existing install.\n $1 \n\nPlease choose from the following options (Reconfigure can be used to add a second VPN type): " ${ r } ${ c } 3 \
2019-12-29 17:25:35 +00:00
" ${ opt1a } " " ${ opt1b } " \
" ${ opt2a } " " ${ opt2b } " \
" ${ opt3a } " " ${ opt3b } " 3>& 2 2>& 1 1>& 3) || \
{ echo "::: Cancel selected. Exiting" ; exit 1; }
2020-01-06 10:53:29 +00:00
echo " ::: ${ UpdateCmd } option selected. "
2019-12-29 17:25:35 +00:00
}
2016-04-19 18:01:55 +00:00
2016-04-22 19:16:48 +00:00
2020-01-06 01:06:47 +00:00
# Compatibility, functions to check for supported OS
# distroCheck, maybeOSSupport, noOSSupport
2019-10-14 10:11:16 +00:00
distroCheck( ) {
# if lsb_release command is on their system
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if command -v lsb_release > /dev/null; then
2019-10-14 10:11:16 +00:00
PLAT = $( lsb_release -si)
2019-11-19 16:29:41 +00:00
OSCN = $( lsb_release -sc)
2019-10-14 10:11:16 +00:00
else # else get info from os-release
2019-12-08 19:14:23 +00:00
# shellcheck disable=SC1091
2019-10-14 10:11:16 +00:00
source /etc/os-release
PLAT = $( awk '{print $1}' <<< " $NAME " )
VER = " $VERSION_ID "
2020-08-31 19:24:47 +00:00
declare -A VER_MAP = ( [ "9" ] = "stretch" [ "10" ] = "buster" [ "16.04" ] = "xenial" [ "18.04" ] = "bionic" [ "20.04" ] = "focal" )
2019-10-14 10:11:16 +00:00
OSCN = ${ VER_MAP [ " ${ VER } " ] }
fi
case ${ PLAT } in
2019-11-19 16:29:41 +00:00
Debian| Raspbian| Ubuntu)
2020-01-06 01:06:47 +00:00
case ${ OSCN } in
2020-09-14 10:25:31 +00:00
stretch| buster| xenial| bionic| focal)
2020-01-06 10:53:29 +00:00
:
2020-01-06 01:06:47 +00:00
; ;
*)
maybeOSSupport
; ;
esac
2019-10-14 10:11:16 +00:00
; ;
*)
2019-11-19 16:29:41 +00:00
noOSSupport
2019-10-14 10:11:16 +00:00
; ;
esac
2020-04-28 22:44:56 +00:00
echo " PLAT= ${ PLAT } " > ${ tempsetupVarsFile }
echo " OSCN= ${ OSCN } " >> ${ tempsetupVarsFile }
2017-03-13 04:00:28 +00:00
}
2016-05-06 01:04:57 +00:00
2020-01-06 01:06:47 +00:00
noOSSupport( ) {
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: Invalid OS detected"
echo "::: We have not been able to detect a supported OS."
echo "::: Currently this installer supports Raspbian, Debian and Ubuntu."
exit 1
fi
whiptail --msgbox --backtitle "INVALID OS DETECTED" --title "Invalid OS" " We have not been able to detect a supported OS.
Currently this installer supports Raspbian, Debian and Ubuntu.
For more details, check our documentation at https://github.com/pivpn/pivpn/wiki " ${ r } ${ c }
exit 1
}
maybeOSSupport( ) {
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: OS Not Supported"
echo "::: You are on an OS that we have not tested but MAY work, continuing anyway..."
return
fi
if ( whiptail --backtitle "Untested OS" --title "Untested OS" --yesno " You are on an OS that we have not tested but MAY work.
Currently this installer supports Raspbian, Debian and Ubuntu.
For more details about supported OS please check our documentation at https://github.com/pivpn/pivpn/wiki
Would you like to continue anyway?" ${ r } ${ c } ) then
echo "::: Did not detect perfectly supported OS but,"
echo "::: Continuing installation at user's own risk..."
else
echo "::: Exiting due to untested OS"
exit 1
fi
}
2019-10-14 10:11:16 +00:00
checkHostname( ) {
###Checks for hostname size
host_name = $( hostname -s)
if [ [ ! ${# host_name } -le 28 ] ] ; then
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: Your hostname is too long."
echo "::: Use 'hostnamectl set-hostname YOURHOSTNAME' to set a new hostname"
echo "::: It must be less then 28 characters long and it must not use special characters"
exit 1
fi
2019-10-14 10:11:16 +00:00
until [ [ ${# host_name } -le 28 && $host_name = ~ ^[ a-zA-Z0-9] [ a-zA-Z0-9-] { 1,28} $ ] ] ; do
2019-12-08 19:14:23 +00:00
host_name = $( whiptail --inputbox "Your hostname is too long.\\nEnter new hostname with less then 28 characters\\nNo special characters allowed." \
2019-10-14 10:11:16 +00:00
--title "Hostname too long" ${ r } ${ c } 3>& 1 1>& 2 2>& 3)
$SUDO hostnamectl set-hostname " ${ host_name } "
if [ [ ${# host_name } -le 28 && $host_name = ~ ^[ a-zA-Z0-9] [ a-zA-Z0-9-] { 1,28} $ ] ] ; then
echo "::: Hostname valid and length OK, proceeding..."
fi
2019-10-14 13:06:34 +00:00
done
2019-10-14 10:11:16 +00:00
else
echo "::: Hostname length OK"
fi
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
spinner( ) {
local pid = $1
local delay = 0.50
local spinstr = '/-\|'
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
while ps a | awk '{print $1}' | grep -q " $pid " ; do
2019-10-14 10:11:16 +00:00
local temp = ${ spinstr #? }
printf " [%c] " " ${ spinstr } "
local spinstr = ${ temp } ${ spinstr % " $temp " }
sleep ${ delay }
2019-12-08 19:14:23 +00:00
printf "\\b\\b\\b\\b\\b\\b"
2019-10-14 10:11:16 +00:00
done
2019-12-08 19:14:23 +00:00
printf " \\b\\b\\b\\b"
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
verifyFreeDiskSpace( ) {
# If user installs unattended-upgrades we'd need about 60MB so will check for 75MB free
echo "::: Verifying free disk space..."
local required_free_kilobytes = 76800
2019-12-08 19:14:23 +00:00
local existing_free_kilobytes
existing_free_kilobytes = $( df -Pk | grep -m1 '\/$' | awk '{print $4}' )
2019-10-14 10:11:16 +00:00
# - Unknown free disk space , not a integer
if ! [ [ " ${ existing_free_kilobytes } " = ~ ^( [ 0-9] ) +$ ] ] ; then
echo "::: Unknown free disk space!"
echo "::: We were unable to determine available free disk space on this system."
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
exit 1
fi
2019-10-14 10:11:16 +00:00
echo "::: You may continue with the installation, however, it is not recommended."
read -r -p "::: If you are sure you want to continue, type YES and press enter :: " response
case $response in
[ Y] [ E] [ S] )
; ;
*)
echo "::: Confirmation not received, exiting..."
exit 1
; ;
esac
# - Insufficient free disk space
elif [ [ ${ existing_free_kilobytes } -lt ${ required_free_kilobytes } ] ] ; then
echo "::: Insufficient Disk Space!"
echo " ::: Your system appears to be low on disk space. PiVPN recommends a minimum of $required_free_kilobytes KiloBytes. "
echo " ::: You only have ${ existing_free_kilobytes } KiloBytes free. "
echo "::: If this is a new install on a Raspberry Pi you may need to expand your disk."
echo "::: Try running 'sudo raspi-config', and choose the 'expand file system option'"
2020-02-05 19:29:14 +00:00
echo "::: After rebooting, run this installation again. (curl -L https://install.pivpn.io | bash)"
2019-10-14 10:11:16 +00:00
echo "Insufficient free space, exiting..."
exit 1
fi
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
updatePackageCache( ) {
#update package lists
echo ":::"
2021-01-12 15:30:11 +00:00
echo -ne " ::: Package Cache update is needed, running ${ UPDATE_PKG_CACHE } ...\\n "
2020-01-08 23:45:04 +00:00
# shellcheck disable=SC2086
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
$SUDO ${ UPDATE_PKG_CACHE } & > /dev/null & spinner $!
2019-10-14 10:11:16 +00:00
echo " done!"
2016-04-22 19:16:48 +00:00
}
2019-10-14 10:11:16 +00:00
notifyPackageUpdatesAvailable( ) {
# Let user know if they have outdated packages on their system and
# advise them to run a package update at soonest possible.
echo ":::"
echo -n " ::: Checking ${ PKG_MANAGER } for upgraded packages.... "
updatesToInstall = $( eval " ${ PKG_COUNT } " )
echo " done!"
echo ":::"
if [ [ ${ updatesToInstall } -eq "0" ] ] ; then
echo "::: Your system is up to date! Continuing with PiVPN installation..."
else
echo " ::: There are ${ updatesToInstall } updates available for your system! "
echo "::: We recommend you update your OS after installing PiVPN! "
echo ":::"
fi
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
preconfigurePackages( ) {
2020-05-29 13:56:43 +00:00
# If apt is older than 1.5 we need to install an additional package to add
# support for https repositories that will be used later on
2020-02-10 16:34:11 +00:00
if [ [ -f /etc/apt/sources.list ] ] ; then
2020-05-29 13:56:43 +00:00
INSTALLED_APT = " $( apt-cache policy apt | grep -m1 'Installed: ' | grep -v '(none)' | awk '{print $2}' ) "
if dpkg --compare-versions " $INSTALLED_APT " lt 1.5; then
2020-02-10 16:34:11 +00:00
BASE_DEPS += ( "apt-transport-https" )
2020-01-06 01:06:47 +00:00
fi
2020-02-10 16:34:11 +00:00
fi
2019-10-14 10:11:16 +00:00
2020-05-29 15:49:25 +00:00
# We set static IP only on Raspbian
if [ " $PLAT " = "Raspbian" ] ; then
BASE_DEPS += ( dhcpcd5)
fi
2020-09-14 10:25:31 +00:00
AVAILABLE_OPENVPN = " $( apt-cache policy openvpn | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}' ) "
DPKG_ARCH = " $( dpkg --print-architecture) "
NEED_OPENVPN_REPO = 0
# We require OpenVPN 2.4 or later for ECC support. If not available in the
# repositories but we are running x86 Debian or Ubuntu, add the official repo
# which provides the updated package.
if [ -n " $AVAILABLE_OPENVPN " ] && dpkg --compare-versions " $AVAILABLE_OPENVPN " ge 2.4; then
OPENVPN_SUPPORT = 1
else
if [ " $PLAT " = "Debian" ] || [ " $PLAT " = "Ubuntu" ] ; then
if [ " $DPKG_ARCH " = "amd64" ] || [ " $DPKG_ARCH " = "i386" ] ; then
NEED_OPENVPN_REPO = 1
OPENVPN_SUPPORT = 1
else
OPENVPN_SUPPORT = 0
fi
else
OPENVPN_SUPPORT = 0
fi
fi
AVAILABLE_WIREGUARD = " $( apt-cache policy wireguard | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}' ) "
2020-12-11 23:35:49 +00:00
# If a wireguard kernel object is found and is part of any installed package, then
# it has not been build via DKMS or manually (installing via wireguard-dkms does not
# make the module part of the package since the module itself is built at install time
# and not part of the .deb).
# Source: https://github.com/MichaIng/DietPi/blob/7bf5e1041f3b2972d7827c48215069d1c90eee07/dietpi/dietpi-software#L1807-L1815
2020-09-14 10:25:31 +00:00
WIREGUARD_BUILTIN = 0
2020-12-11 23:35:49 +00:00
for i in /lib/modules/**/wireguard.ko; do
[ [ -f $i ] ] || continue
dpkg-query -S " $i " & > /dev/null || continue
WIREGUARD_BUILTIN = 1
break
done
2020-09-14 10:25:31 +00:00
2020-12-11 23:35:49 +00:00
if
# If the module is builtin and the package available, we only need to install wireguard-tools.
[ [ $WIREGUARD_BUILTIN = = 1 && -n $AVAILABLE_WIREGUARD ] ] ||
# If the package is not available, on Debian and Raspbian we can add it via Bullseye repository.
[ [ $WIREGUARD_BUILTIN = = 1 && ( $PLAT = = 'Debian' || $PLAT = = 'Raspbian' ) ] ] ||
# If the module is not builtin, on Raspbian we know the headers package: raspberrypi-kernel-headers
[ [ $PLAT = = 'Raspbian' ] ] ||
# On Debian (and Ubuntu), we can only reliably assume the headers package for amd64: linux-image-amd64
[ [ $PLAT = = 'Debian' && $DPKG_ARCH = = 'amd64' ] ] ||
# On Ubuntu, additionally the WireGuard package needs to be available, since we didn't test mixing Ubuntu repositories.
[ [ $PLAT = = 'Ubuntu' && $DPKG_ARCH = = 'amd64' && -n $AVAILABLE_WIREGUARD ] ]
then
2020-09-14 10:25:31 +00:00
WIREGUARD_SUPPORT = 1
fi
if [ " $OPENVPN_SUPPORT " -eq 0 ] && [ " $WIREGUARD_SUPPORT " -eq 0 ] ; then
echo "::: Neither OpenVPN nor WireGuard are available to install by PiVPN, exiting..."
exit 1
fi
2020-01-06 01:06:47 +00:00
# if ufw is enabled, configure that.
# running as root because sometimes the executable is not in the user's $PATH
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if $SUDO bash -c 'command -v ufw' > /dev/null; then
2020-03-10 12:02:35 +00:00
if $SUDO ufw status | grep -q inactive; then
2019-12-29 17:25:35 +00:00
USING_UFW = 0
else
USING_UFW = 1
fi
else
USING_UFW = 0
fi
if [ " $USING_UFW " -eq 0 ] ; then
BASE_DEPS += ( iptables-persistent)
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | $SUDO debconf-set-selections
echo iptables-persistent iptables-persistent/autosave_v6 boolean false | $SUDO debconf-set-selections
fi
2020-04-28 22:44:56 +00:00
echo " USING_UFW= ${ USING_UFW } " >> ${ tempsetupVarsFile }
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
installDependentPackages( ) {
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
declare -a TO_INSTALL = ( )
2019-10-14 10:11:16 +00:00
# Install packages passed in via argument array
# No spinner - conflicts with set -e
declare -a argArray1 = ( " ${ !1 } " )
2019-11-07 16:29:21 +00:00
for i in " ${ argArray1 [@] } " ; do
echo -n " ::: Checking for $i ... "
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if dpkg-query -W -f= '${Status}' " ${ i } " 2>/dev/null | grep -q "ok installed" ; then
echo " already installed!"
else
echo " not installed!"
# Add this package to the list of packages in the argument array that need to be installed
TO_INSTALL += ( " ${ i } " )
fi
2019-11-07 16:29:21 +00:00
done
2020-12-05 11:24:22 +00:00
local APTLOGFILE = " $( $SUDO mktemp) "
2020-10-27 07:52:51 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if command -v debconf-apt-progress > /dev/null; then
2020-01-08 23:45:04 +00:00
# shellcheck disable=SC2086
2020-10-27 07:52:51 +00:00
$SUDO debconf-apt-progress --logfile " ${ APTLOGFILE } " -- ${ PKG_INSTALL } " ${ TO_INSTALL [@] } "
2019-10-14 10:11:16 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# shellcheck disable=SC2086
$SUDO ${ PKG_INSTALL } " ${ TO_INSTALL [@] } "
fi
local FAILED = 0
for i in " ${ TO_INSTALL [@] } " ; do
if dpkg-query -W -f= '${Status}' " ${ i } " 2>/dev/null | grep -q "ok installed" ; then
echo " ::: Package $i successfully installed! "
# Add this package to the total list of packages that were actually installed by the script
INSTALLED_PACKAGES += ( " ${ i } " )
else
echo " ::: Failed to install $i ! "
( ( FAILED++) )
fi
done
if [ " $FAILED " -gt 0 ] ; then
2020-12-14 14:15:29 +00:00
$SUDO cat " ${ APTLOGFILE } "
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
exit 1
2019-10-14 10:11:16 +00:00
fi
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
welcomeDialogs( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: PiVPN Automated Installer"
2019-12-08 19:35:41 +00:00
echo " ::: This installer will transform your ${ PLAT } host into an OpenVPN or WireGuard server! "
2019-11-14 14:07:01 +00:00
echo "::: Initiating network interface"
return
fi
2019-10-14 10:11:16 +00:00
# Display the welcome dialog
whiptail --msgbox --backtitle "Welcome" --title "PiVPN Automated Installer" "This installer will transform your Raspberry Pi into an OpenVPN or WireGuard server!" ${ r } ${ c }
2019-03-11 00:06:49 +00:00
2019-10-14 10:11:16 +00:00
# Explain the need for a static address
whiptail --msgbox --backtitle "Initiating network interface" --title "Static IP Needed" " The PiVPN is a SERVER so it needs a STATIC IP ADDRESS to function properly.
2019-10-12 16:34:37 +00:00
2019-10-14 10:11:16 +00:00
In the next section, you can choose to use your current network settings ( DHCP) or to manually edit them." ${ r } ${ c }
2019-03-11 00:06:49 +00:00
}
2019-10-14 10:11:16 +00:00
chooseInterface( ) {
2020-01-06 01:06:47 +00:00
# Turn the available interfaces into an array so it can be used with a whiptail dialog
local interfacesArray = ( )
# Number of available interfaces
local interfaceCount
# Whiptail variable storage
local chooseInterfaceCmd
# Temporary Whiptail options storage
local chooseInterfaceOptions
# Loop sentinel variable
local firstloop = 1
2020-05-28 11:59:18 +00:00
if [ [ " ${ showUnsupportedNICs } " = = true ] ] ; then
# Show every network interface, could be useful for those who install PiVPN inside virtual machines
# or on Raspberry Pis with USB adapters (the loopback interfaces is still skipped)
availableInterfaces = $( ip -o link | awk '{print $2}' | cut -d':' -f1 | cut -d'@' -f1 | grep -v -w 'lo' )
else
# Find network interfaces whose state is UP, so as to skip virtual interfaces and the loopback interface
availableInterfaces = $( ip -o link | awk '/state UP/ {print $2}' | cut -d':' -f1 | cut -d'@' -f1)
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2020-01-06 01:06:47 +00:00
if [ -z " $availableInterfaces " ] ; then
echo "::: Could not find any active network interface, exiting"
exit 1
else
while read -r line; do
mode = "OFF"
if [ [ ${ firstloop } -eq 1 ] ] ; then
firstloop = 0
mode = "ON"
fi
interfacesArray += ( " ${ line } " "available" " ${ mode } " )
( ( interfaceCount++) )
done <<< " ${ availableInterfaces } "
fi
2019-10-14 10:11:16 +00:00
2020-01-06 01:06:47 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $IPv4dev " ] ; then
if [ $interfaceCount -eq 1 ] ; then
IPv4dev = " ${ availableInterfaces } "
echo " ::: No interface specified, but only ${ IPv4dev } is available, using it "
else
echo "::: No interface specified and failed to determine one"
exit 1
fi
else
if ip -o link | grep -qw " ${ IPv4dev } " ; then
echo " ::: Using interface: ${ IPv4dev } "
else
echo " ::: Interface ${ IPv4dev } does not exist "
exit 1
fi
fi
2020-04-28 22:44:56 +00:00
echo " IPv4dev= ${ IPv4dev } " >> ${ tempsetupVarsFile }
2020-01-06 01:06:47 +00:00
return
else
if [ " $interfaceCount " -eq 1 ] ; then
IPv4dev = " ${ availableInterfaces } "
2020-04-28 22:44:56 +00:00
echo " IPv4dev= ${ IPv4dev } " >> ${ tempsetupVarsFile }
2020-01-06 01:06:47 +00:00
return
fi
fi
2019-10-14 10:11:16 +00:00
2020-01-06 01:06:47 +00:00
chooseInterfaceCmd = ( whiptail --separate-output --radiolist "Choose An interface (press space to select):" " ${ r } " " ${ c } " " ${ interfaceCount } " )
if chooseInterfaceOptions = $( " ${ chooseInterfaceCmd [@] } " " ${ interfacesArray [@] } " 2>& 1 >/dev/tty) ; then
for desiredInterface in ${ chooseInterfaceOptions } ; do
IPv4dev = ${ desiredInterface }
echo " ::: Using interface: $IPv4dev "
2020-04-28 22:44:56 +00:00
echo " IPv4dev= ${ IPv4dev } " >> ${ tempsetupVarsFile }
2020-01-06 01:06:47 +00:00
done
else
echo "::: Cancel selected, exiting...."
exit 1
fi
2016-04-19 18:01:55 +00:00
}
2019-10-14 14:51:43 +00:00
avoidStaticIPv4Ubuntu( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: Since we think you are not using Raspbian, we will not configure a static IP for you."
return
fi
2019-11-07 16:29:21 +00:00
# If we are in Ubuntu then they need to have previously set their network, so just use what you have.
whiptail --msgbox --backtitle "IP Information" --title "IP Information" " Since we think you are not using Raspbian, we will not configure a static IP for you.
2019-10-14 14:51:43 +00:00
If you are in Amazon then you can not configure a static IP anyway. Just ensure before this installer started you had set an elastic IP on your instance." ${ r } ${ c }
2019-11-14 14:07:01 +00:00
}
validIP( ) {
local ip = $1
local stat = 1
if [ [ $ip = ~ ^[ 0-9] { 1,3} \. [ 0-9] { 1,3} \. [ 0-9] { 1,3} \. [ 0-9] { 1,3} $ ] ] ; then
OIFS = $IFS
IFS = '.'
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
read -r -a ip <<< " $ip "
2019-11-14 14:07:01 +00:00
IFS = $OIFS
[ [ ${ ip [0] } -le 255 && ${ ip [1] } -le 255 \
&& ${ ip [2] } -le 255 && ${ ip [3] } -le 255 ] ]
stat = $?
fi
return $stat
2019-10-14 14:51:43 +00:00
}
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
validIPAndNetmask( ) {
local ip = $1
local stat = 1
ip = " ${ ip / \/ /. } "
if [ [ $ip = ~ ^[ 0-9] { 1,3} \. [ 0-9] { 1,3} \. [ 0-9] { 1,3} \. [ 0-9] { 1,3} \. [ 0-9] { 1,2} $ ] ] ; then
OIFS = $IFS
IFS = '.'
read -r -a ip <<< " $ip "
IFS = $OIFS
[ [ ${ ip [0] } -le 255 && ${ ip [1] } -le 255 \
&& ${ ip [2] } -le 255 && ${ ip [3] } -le 255 \
&& ${ ip [4] } -le 32 ] ]
stat = $?
fi
return $stat
}
2019-10-14 10:11:16 +00:00
getStaticIPv4Settings( ) {
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# Find the gateway IP used to route to outside world
CurrentIPv4gw = " $( ip -o route get 192.0.2.1 | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | awk 'NR==2' ) "
# Find the IP address (and netmask) of the desidered interface
CurrentIPv4addr = " $( ip -o -f inet address show dev " ${ IPv4dev } " | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2}' ) "
# Grab their current DNS servers
IPv4dns = $( grep -v "^#" /etc/resolv.conf | grep -w nameserver | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | xargs)
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
2020-01-20 08:34:43 +00:00
if [ -z " $dhcpReserv " ] || [ " $dhcpReserv " -ne 1 ] ; then
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
local MISSING_STATIC_IPV4_SETTINGS = 0
2019-11-14 14:07:01 +00:00
2020-01-20 08:34:43 +00:00
if [ -z " $IPv4addr " ] ; then
echo "::: Missing static IP address"
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
( ( MISSING_STATIC_IPV4_SETTINGS++) )
2020-01-20 08:34:43 +00:00
fi
2019-11-14 14:07:01 +00:00
2020-01-20 08:34:43 +00:00
if [ -z " $IPv4gw " ] ; then
echo "::: Missing static IP gateway"
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
( ( MISSING_STATIC_IPV4_SETTINGS++) )
2020-01-20 08:34:43 +00:00
fi
2019-11-14 14:07:01 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if [ " $MISSING_STATIC_IPV4_SETTINGS " -eq 0 ] ; then
2019-11-14 14:07:01 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# If both settings are not empty, check if they are valid and proceed
if validIPAndNetmask " ${ IPv4addr } " ; then
2020-01-20 08:34:43 +00:00
echo " ::: Your static IPv4 address: ${ IPv4addr } "
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
echo " ::: ${ IPv4addr } is not a valid IP address "
2020-01-20 08:34:43 +00:00
exit 1
fi
if validIP " ${ IPv4gw } " ; then
echo " ::: Your static IPv4 gateway: ${ IPv4gw } "
else
echo " ::: ${ IPv4gw } is not a valid IP address "
exit 1
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
elif [ " $MISSING_STATIC_IPV4_SETTINGS " -eq 1 ] ; then
# If either of the settings is missing, consider the input inconsistent
echo "::: Incomplete static IP settings"
exit 1
elif [ " $MISSING_STATIC_IPV4_SETTINGS " -eq 2 ] ; then
# If both of the settings are missing, assume the user wants to use current settings
IPv4addr = " ${ CurrentIPv4addr } "
IPv4gw = " ${ CurrentIPv4gw } "
echo "::: No static IP settings, using current settings"
echo " ::: Your static IPv4 address: ${ IPv4addr } "
echo " ::: Your static IPv4 gateway: ${ IPv4gw } "
2019-11-14 14:07:01 +00:00
fi
2020-01-20 08:34:43 +00:00
else
echo "::: Skipping setting static IP address"
2019-11-14 14:07:01 +00:00
fi
2020-04-28 22:44:56 +00:00
echo " dhcpReserv= ${ dhcpReserv } " >> ${ tempsetupVarsFile }
echo " IPv4addr= ${ IPv4addr } " >> ${ tempsetupVarsFile }
echo " IPv4gw= ${ IPv4gw } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
local ipSettingsCorrect
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
local IPv4AddrValid
local IPv4gwValid
2020-01-07 00:30:17 +00:00
# Some users reserve IP addresses on another DHCP Server or on their routers,
# Lets ask them if they want to make any changes to their interfaces.
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if ( whiptail --backtitle "Calibrating network interface" --title "DHCP Reservation" --yesno --defaultno \
2020-01-07 00:30:17 +00:00
" Are you Using DHCP Reservation on your Router/DHCP Server?
These are your current Network Settings:
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
IP address: ${ CurrentIPv4addr }
Gateway: ${ CurrentIPv4gw }
2020-01-07 00:30:17 +00:00
Yes: Keep using DHCP reservation
No: Setup static IP address
Don' t know what DHCP Reservation is? Answer No." ${ r } ${ c } ); then
dhcpReserv = 1
2020-01-08 23:45:04 +00:00
# shellcheck disable=SC2129
2020-04-28 22:44:56 +00:00
echo " dhcpReserv= ${ dhcpReserv } " >> ${ tempsetupVarsFile }
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# We don't really need to save them as we won't set a static IP but they might be useful for debugging
2020-04-28 22:44:56 +00:00
echo " IPv4addr= ${ CurrentIPv4addr } " >> ${ tempsetupVarsFile }
echo " IPv4gw= ${ CurrentIPv4gw } " >> ${ tempsetupVarsFile }
2020-01-07 00:30:17 +00:00
else
# Ask if the user wants to use DHCP settings as their static IP
if ( whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno " Do you want to use your current network settings as a static address?
2019-10-16 10:01:50 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
IP address: ${ CurrentIPv4addr }
Gateway: ${ CurrentIPv4gw } " ${ r } ${ c } ); then
IPv4addr = ${ CurrentIPv4addr }
IPv4gw = ${ CurrentIPv4gw }
2020-04-28 22:44:56 +00:00
echo " IPv4addr= ${ IPv4addr } " >> ${ tempsetupVarsFile }
echo " IPv4gw= ${ IPv4gw } " >> ${ tempsetupVarsFile }
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict.
whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" " It is possible your router could still try to assign this IP to a device, which would cause a conflict. But in most cases the router is smart enough to not do that.
2019-10-14 10:11:16 +00:00
If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.
It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." ${ r } ${ c }
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# Nothing else to do since the variables are already set above
2020-01-07 00:30:17 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# Otherwise, we need to ask the user to input their desired settings.
# Start by getting the IPv4 address (pre-filling it with info gathered from DHCP)
# Start a loop to let the user enter their information with the chance to go back and edit it if necessary
2020-01-07 00:30:17 +00:00
until [ [ ${ ipSettingsCorrect } = True ] ] ; do
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
until [ [ ${ IPv4AddrValid } = True ] ] ; do
# Ask for the IPv4 address
if IPv4addr = $( whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" ${ r } ${ c } " ${ CurrentIPv4addr } " 3>& 1 1>& 2 2>& 3) ; then
if validIPAndNetmask " ${ IPv4addr } " ; then
echo " ::: Your static IPv4 address: ${ IPv4addr } "
IPv4AddrValid = True
else
whiptail --msgbox --backtitle "Calibrating network interface" --title "IPv4 address" " You've entered an invalid IP address: ${ IPv4addr } \\n\\nPlease enter an IP address in the CIDR notation, example: 192.168.23.211/24\\n\\nIf you are not sure, please just keep the default. " ${ r } ${ c }
echo " ::: Invalid IPv4 address: ${ IPv4addr } "
IPv4AddrValid = False
fi
else
# Cancelling IPv4 settings window
echo "::: Cancel selected. Exiting..."
exit 1
fi
done
until [ [ ${ IPv4gwValid } = True ] ] ; do
2020-01-07 00:30:17 +00:00
# Ask for the gateway
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if IPv4gw = $( whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" ${ r } ${ c } " ${ CurrentIPv4gw } " 3>& 1 1>& 2 2>& 3) ; then
if validIP " ${ IPv4gw } " ; then
echo " ::: Your static IPv4 gateway: ${ IPv4gw } "
IPv4gwValid = True
2020-01-07 00:30:17 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
whiptail --msgbox --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" " You've entered an invalid gateway IP: ${ IPv4gw } \\n\\nPlease enter the IP address of your gateway (router), example: 192.168.23.1\\n\\nIf you are not sure, please just keep the default. " ${ r } ${ c }
echo " ::: Invalid IPv4 gateway: ${ IPv4gw } "
IPv4gwValid = False
2020-01-07 00:30:17 +00:00
fi
else
# Cancelling gateway settings window
echo "::: Cancel selected. Exiting..."
exit 1
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
done
# Give the user a chance to review their settings before moving on
if ( whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno " Are these settings correct?
IP address: ${ IPv4addr }
Gateway: ${ IPv4gw } " ${ r } ${ c } ); then
# If the settings are correct, then we need to set the pivpnIP
2020-04-28 22:44:56 +00:00
echo " IPv4addr= ${ IPv4addr } " >> ${ tempsetupVarsFile }
echo " IPv4gw= ${ IPv4gw } " >> ${ tempsetupVarsFile }
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# After that's done, the loop ends and we move on
ipSettingsCorrect = True
2019-10-14 10:11:16 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
# If the settings are wrong, the loop continues
2019-10-14 10:11:16 +00:00
ipSettingsCorrect = False
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
IPv4AddrValid = False
IPv4gwValid = False
2019-10-14 10:11:16 +00:00
fi
2020-01-07 00:30:17 +00:00
done
# End the if statement for DHCP vs. static
2019-10-14 10:11:16 +00:00
fi
2020-01-07 00:30:17 +00:00
# End of If Statement for DCHCP Reservation
2019-10-14 10:11:16 +00:00
fi
2016-12-24 05:20:45 +00:00
}
2019-10-14 10:11:16 +00:00
setDHCPCD( ) {
# Append these lines to dhcpcd.conf to enable a static IP
2019-10-16 10:01:50 +00:00
echo " interface ${ IPv4dev }
2019-10-14 10:11:16 +00:00
static ip_address = ${ IPv4addr }
static routers = ${ IPv4gw }
static domain_name_servers = ${ IPv4dns } " | $SUDO tee -a ${ dhcpcdFile } >/dev/null
2018-04-02 10:07:58 +00:00
}
2019-10-14 10:11:16 +00:00
setStaticIPv4( ) {
# Tries to set the IPv4 address
if [ [ -f /etc/dhcpcd.conf ] ] ; then
if grep -q " ${ IPv4addr } " ${ dhcpcdFile } ; then
echo "::: Static IP already configured."
else
setDHCPCD
2019-10-16 10:01:50 +00:00
$SUDO ip addr replace dev " ${ IPv4dev } " " ${ IPv4addr } "
2019-10-14 10:11:16 +00:00
echo ":::"
echo " ::: Setting IP to ${ IPv4addr } . You may need to restart after the install is complete. "
echo ":::"
fi
else
echo "::: Critical: Unable to locate configuration file to set static IPv4 address!"
exit 1
fi
}
2016-12-24 05:20:45 +00:00
2019-10-14 10:11:16 +00:00
chooseUser( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $install_user " ] ; then
if [ " $( awk -F':' 'BEGIN {count=0} $3>=1000 && $3<=60000 { count++ } END{ print count }' /etc/passwd) " -eq 1 ] ; then
install_user = " $( awk -F':' '$3>=1000 && $3<=60000 {print $1}' /etc/passwd) "
echo " ::: No user specified, but only ${ install_user } is available, using it "
else
echo "::: No user specified"
exit 1
fi
else
if awk -F':' '$3>=1000 && $3<=60000 {print $1}' /etc/passwd | grep -qw " ${ install_user } " ; then
echo " ::: ${ install_user } will hold your ovpn configurations. "
else
2020-01-18 19:01:39 +00:00
echo " ::: User ${ install_user } does not exist, creating... "
$SUDO useradd -m -s /bin/bash " ${ install_user } "
echo " ::: User created without a password, please do sudo passwd $install_user to create one "
2019-11-14 14:07:01 +00:00
fi
fi
install_home = $( grep -m1 " ^ ${ install_user } : " /etc/passwd | cut -d: -f6)
install_home = ${ install_home %/ }
2020-04-28 22:44:56 +00:00
echo " install_user= ${ install_user } " >> ${ tempsetupVarsFile }
echo " install_home= ${ install_home } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
2019-10-14 10:11:16 +00:00
# Explain the local user
whiptail --msgbox --backtitle "Parsing User List" --title "Local Users" "Choose a local user that will hold your ovpn configurations." ${ r } ${ c }
# First, let's check if there is a user available.
numUsers = $( awk -F':' 'BEGIN {count=0} $3>=1000 && $3<=60000 { count++ } END{ print count }' /etc/passwd)
if [ " $numUsers " -eq 0 ]
then
# We don't have a user, let's ask to add one.
if userToAdd = $( whiptail --title "Choose A User" --inputbox "No non-root user account was found. Please type a new username." ${ r } ${ c } 3>& 1 1>& 2 2>& 3)
then
2019-12-20 22:30:00 +00:00
# See https://askubuntu.com/a/667842/459815
2019-10-14 10:11:16 +00:00
PASSWORD = $( whiptail --title "password dialog" --passwordbox "Please enter the new user password" ${ r } ${ c } 3>& 1 1>& 2 2>& 3)
CRYPT = $( perl -e 'printf("%s\n", crypt($ARGV[0], "password"))' " ${ PASSWORD } " )
2019-12-08 19:14:23 +00:00
if $SUDO useradd -m -p " ${ CRYPT } " -s /bin/bash " ${ userToAdd } " ; then
2019-10-14 10:11:16 +00:00
echo "Succeeded"
( ( numUsers += 1) )
else
exit 1
fi
else
exit 1
fi
fi
availableUsers = $( awk -F':' '$3>=1000 && $3<=60000 {print $1}' /etc/passwd)
local userArray = ( )
local firstloop = 1
while read -r line
do
mode = "OFF"
if [ [ $firstloop -eq 1 ] ] ; then
firstloop = 0
mode = "ON"
fi
userArray += ( " ${ line } " "" " ${ mode } " )
done <<< " ${ availableUsers } "
2019-12-08 19:14:23 +00:00
chooseUserCmd = ( whiptail --title "Choose A User" --separate-output --radiolist
"Choose (press space to select):" " ${ r } " " ${ c } " " ${ numUsers } " )
if chooseUserOptions = $( " ${ chooseUserCmd [@] } " " ${ userArray [@] } " 2>& 1 >/dev/tty) ; then
2019-10-14 10:11:16 +00:00
for desiredUser in ${ chooseUserOptions } ; do
install_user = ${ desiredUser }
echo " ::: Using User: $install_user "
install_home = $( grep -m1 " ^ ${ install_user } : " /etc/passwd | cut -d: -f6)
install_home = ${ install_home %/ } # remove possible trailing slash
2020-04-28 22:44:56 +00:00
echo " install_user= ${ install_user } " >> ${ tempsetupVarsFile }
echo " install_home= ${ install_home } " >> ${ tempsetupVarsFile }
2019-10-14 10:11:16 +00:00
done
else
echo "::: Cancel selected, exiting...."
exit 1
fi
2016-12-24 05:20:45 +00:00
}
2019-10-14 10:11:16 +00:00
isRepo( ) {
# If the directory does not have a .git folder it is not a repo
echo -n " ::: Checking $1 is a repo... "
2021-01-17 16:35:01 +00:00
cd " ${ 1 } " & > /dev/null || { echo " not found!" ; return 1; }
2019-10-14 10:11:16 +00:00
$SUDO git status & > /dev/null && echo " OK!" ; return 0 || echo " not found!" ; return 1
2016-12-24 05:20:45 +00:00
}
2019-10-14 10:11:16 +00:00
updateRepo( ) {
2019-12-29 17:25:35 +00:00
if [ " ${ UpdateCmd } " = "Repair" ] ; then
echo "::: Repairing an existing installation, not downloading/updating local repos"
2019-11-27 10:59:53 +00:00
else
2019-12-29 17:25:35 +00:00
# Pull the latest commits
echo -n " ::: Updating repo in $1 ... "
2019-12-31 09:43:10 +00:00
### FIXME: Never call rm -rf with a plain variable. Never again as SU!
#$SUDO rm -rf "${1}"
if test -n " $1 " ; then
2020-05-27 14:36:26 +00:00
$SUDO rm -rf " $( dirname " $1 " ) /pivpn "
2019-12-31 09:43:10 +00:00
fi
2020-05-27 14:36:26 +00:00
# Go back to /usr/local/src otherwise git will complain when the current working
# directory has just been deleted (/usr/local/src/pivpn).
cd /usr/local/src && \
2019-12-29 17:25:35 +00:00
$SUDO git clone -q --depth 1 --no-single-branch " ${ 2 } " " ${ 1 } " > /dev/null & spinner $!
cd " ${ 1 } " || exit 1
if [ -z " ${ TESTING +x } " ] ; then
:
else
${ SUDOE } git checkout test
fi
echo " done!"
2019-10-14 10:11:16 +00:00
fi
2016-12-10 05:58:36 +00:00
}
2019-10-14 10:11:16 +00:00
makeRepo( ) {
# Remove the non-repos interface and clone the interface
echo -n " ::: Cloning $2 into $1 ... "
2019-12-08 19:35:41 +00:00
### FIXME: Never call rm -rf with a plain variable. Never again as SU!
#$SUDO rm -rf "${1}"
if test -n " $1 " ; then
2020-05-27 14:36:26 +00:00
$SUDO rm -rf " $( dirname " $1 " ) /pivpn "
2019-12-08 19:35:41 +00:00
fi
2020-05-27 14:36:26 +00:00
# Go back to /usr/local/src otherwhise git will complain when the current working
# directory has just been deleted (/usr/local/src/pivpn).
cd /usr/local/src && \
2019-12-29 17:25:35 +00:00
$SUDO git clone -q --depth 1 --no-single-branch " ${ 2 } " " ${ 1 } " > /dev/null & spinner $!
2019-10-14 14:51:43 +00:00
cd " ${ 1 } " || exit 1
2019-11-27 10:59:53 +00:00
if [ -z " ${ TESTING +x } " ] ; then
2019-10-14 10:11:16 +00:00
:
2019-11-27 10:59:53 +00:00
else
2019-10-14 10:11:16 +00:00
${ SUDOE } git checkout test
fi
echo " done!"
}
2016-05-03 14:32:17 +00:00
2019-10-14 10:11:16 +00:00
getGitFiles( ) {
# Setup git repos for base files
echo ":::"
echo "::: Checking for existing base files..."
if isRepo " ${ 1 } " ; then
updateRepo " ${ 1 } " " ${ 2 } "
else
makeRepo " ${ 1 } " " ${ 2 } "
fi
2016-05-03 14:32:17 +00:00
}
2019-10-14 10:11:16 +00:00
cloneOrUpdateRepos( ) {
2020-05-28 10:09:02 +00:00
# /usr/local should always exist, not sure about the src subfolder though
$SUDO mkdir -p /usr/local/src
2019-10-14 10:11:16 +00:00
# Get Git files
getGitFiles ${ pivpnFilesDir } ${ pivpnGitUrl } || \
{ echo " !!! Unable to clone ${ pivpnGitUrl } into ${ pivpnFilesDir } , unable to continue. " ; \
exit 1; \
}
2016-04-19 18:01:55 +00:00
}
2020-01-07 19:27:19 +00:00
installPiVPN( ) {
$SUDO mkdir -p /etc/pivpn/
askWhichVPN
if [ " $VPN " = "openvpn" ] ; then
2020-03-04 11:48:14 +00:00
pivpnDEV = "tun0"
pivpnNET = "10.8.0.0"
vpnGw = " ${ pivpnNET /.0.0/.0.1 } "
2020-06-07 11:59:51 +00:00
askAboutCustomizing
2020-01-07 19:27:19 +00:00
installOpenVPN
askCustomProto
askCustomPort
askClientDNS
askCustomDomain
askPublicIPOrDNS
askEncryption
confOpenVPN
confOVPN
confNetwork
confLogging
2020-03-04 11:48:14 +00:00
2020-01-07 19:27:19 +00:00
elif [ " $VPN " = "wireguard" ] ; then
2020-03-04 11:48:14 +00:00
# Since WireGuard only uses UDP, askCustomProto() is never called so we
# set the protocol here.
pivpnPROTO = "udp"
pivpnDEV = "wg0"
pivpnNET = "10.6.0.0"
vpnGw = " ${ pivpnNET /.0.0/.0.1 } "
2020-11-14 08:35:51 +00:00
# Forward all traffic through PiVPN (i.e. full-tunnel), may be modified by
# the user after the installation.
ALLOWED_IPS = "0.0.0.0/0, ::0/0"
2020-06-07 11:59:51 +00:00
CUSTOMIZE = 0
2020-03-04 11:48:14 +00:00
2020-01-07 19:27:19 +00:00
installWireGuard
askCustomPort
askClientDNS
askPublicIPOrDNS
confWireGuard
confNetwork
2020-03-04 11:48:14 +00:00
2020-04-28 22:44:56 +00:00
echo " pivpnPROTO= ${ pivpnPROTO } " >> ${ tempsetupVarsFile }
2020-03-04 11:48:14 +00:00
2020-01-07 19:27:19 +00:00
fi
2020-03-04 11:48:14 +00:00
2020-04-28 22:44:56 +00:00
echo " pivpnDEV= ${ pivpnDEV } " >> ${ tempsetupVarsFile }
echo " pivpnNET= ${ pivpnNET } " >> ${ tempsetupVarsFile }
echo " subnetClass= ${ subnetClass } " >> ${ tempsetupVarsFile }
2020-11-14 08:35:51 +00:00
echo " ALLOWED_IPS=\" ${ ALLOWED_IPS } \" " >> ${ tempsetupVarsFile }
2020-01-07 19:27:19 +00:00
}
2019-10-14 10:11:16 +00:00
askWhichVPN( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
2020-09-14 10:25:31 +00:00
if [ " $WIREGUARD_SUPPORT " -eq 1 ] ; then
2020-03-04 11:48:14 +00:00
if [ -z " $VPN " ] ; then
echo ":: No VPN protocol specified, using WireGuard"
VPN = "wireguard"
2019-11-14 14:07:01 +00:00
else
2020-03-04 11:48:14 +00:00
VPN = " ${ VPN ,, } "
if [ " $VPN " = "wireguard" ] ; then
echo "::: WireGuard will be installed"
elif [ " $VPN " = "openvpn" ] ; then
echo "::: OpenVPN will be installed"
else
echo " :: $VPN is not a supported VPN protocol, please specify 'wireguard' or 'openvpn' "
exit 1
fi
fi
2020-09-14 10:25:31 +00:00
else
2020-03-04 11:48:14 +00:00
if [ -z " $VPN " ] ; then
echo ":: No VPN protocol specified, using OpenVPN"
VPN = "openvpn"
else
VPN = " ${ VPN ,, } "
if [ " $VPN " = "openvpn" ] ; then
echo "::: OpenVPN will be installed"
else
echo " :: $VPN is not a supported VPN protocol on $DPKG_ARCH $PLAT , only 'openvpn' is "
exit 1
fi
2019-11-14 14:07:01 +00:00
fi
fi
else
2020-09-14 10:25:31 +00:00
if [ " $WIREGUARD_SUPPORT " -eq 1 ] && [ " $OPENVPN_SUPPORT " -eq 1 ] ; then
2020-04-20 15:33:27 +00:00
chooseVPNCmd = ( whiptail --backtitle "Setup PiVPN" --title "Installation mode" --separate-output --radiolist "WireGuard is a new kind of VPN that provides near-instantaneous connection speed, high performance, and modern cryptography.\\n\\nIt's the recommended choice especially if you use mobile devices where WireGuard is easier on battery than OpenVPN.\\n\\nOpenVPN is still available if you need the traditional, flexible, trusted VPN protocol or if you need features like TCP and custom search domain.\\n\\nChoose a VPN (press space to select):" " ${ r } " " ${ c } " 2)
2020-03-04 11:48:14 +00:00
VPNChooseOptions = ( WireGuard "" on
OpenVPN "" off)
if VPN = $( " ${ chooseVPNCmd [@] } " " ${ VPNChooseOptions [@] } " 2>& 1 >/dev/tty) ; then
echo " ::: Using VPN: $VPN "
VPN = " ${ VPN ,, } "
else
echo "::: Cancel selected, exiting...."
exit 1
fi
2020-09-14 10:25:31 +00:00
elif [ " $OPENVPN_SUPPORT " -eq 1 ] && [ " $WIREGUARD_SUPPORT " -eq 0 ] ; then
2020-03-04 11:48:14 +00:00
echo "::: Using VPN: OpenVPN"
VPN = "openvpn"
2020-09-14 10:25:31 +00:00
elif [ " $OPENVPN_SUPPORT " -eq 0 ] && [ " $WIREGUARD_SUPPORT " -eq 1 ] ; then
echo "::: Using VPN: WireGuard"
VPN = "wireguard"
2019-11-14 14:07:01 +00:00
fi
fi
2020-04-28 22:44:56 +00:00
echo " VPN= ${ VPN } " >> ${ tempsetupVarsFile }
2016-04-19 18:01:55 +00:00
}
2020-06-07 11:59:51 +00:00
askAboutCustomizing( ) {
2020-06-08 07:38:53 +00:00
if [ " ${ runUnattended } " = 'false' ] ; then
if ( whiptail --backtitle "Setup PiVPN" --title "Installation mode" --yesno --defaultno "PiVPN uses the following settings that we believe are good defaults for most users. However, we still want to keep flexibility, so if you need to customize them, choose Yes.\n\n* UDP or TCP protocol: UDP\n* Custom search domain for the DNS field: None\n* Modern features or best compatibility: Modern features (256 bit certificate + additional TLS encryption)" ${ r } ${ c } ) ; then
CUSTOMIZE = 1
else
CUSTOMIZE = 0
fi
2020-06-07 11:59:51 +00:00
fi
}
2019-10-14 10:11:16 +00:00
installOpenVPN( ) {
2020-01-21 12:51:25 +00:00
local PIVPN_DEPS
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
echo "::: Installing OpenVPN from Debian package... "
2020-09-14 10:25:31 +00:00
if [ " $NEED_OPENVPN_REPO " -eq 1 ] ; then
# gnupg is used by apt-key to import the openvpn GPG key into the
# APT keyring
PIVPN_DEPS = ( gnupg)
installDependentPackages PIVPN_DEPS[ @]
2020-03-12 12:00:18 +00:00
2020-10-27 17:40:16 +00:00
# OpenVPN repo's public GPG key (fingerprint 0x30EBF4E73CCE63EEE124DD278E6DA8B4E158C569)
2020-09-14 10:25:31 +00:00
echo "::: Adding repository key..."
2020-10-27 17:40:16 +00:00
if ! $SUDO apt-key add " ${ pivpnFilesDir } " /files/etc/apt/repo-public.gpg; then
echo "::: Can't import OpenVPN GPG key"
exit 1
2020-09-14 10:25:31 +00:00
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2020-09-14 10:25:31 +00:00
echo "::: Adding OpenVPN repository... "
echo " deb https://build.openvpn.net/debian/openvpn/stable $OSCN main " | $SUDO tee /etc/apt/sources.list.d/pivpn-openvpn-repo.list > /dev/null
2020-03-04 11:48:14 +00:00
2020-09-14 10:25:31 +00:00
echo "::: Updating package cache..."
# shellcheck disable=SC2086
2021-01-12 15:30:11 +00:00
updatePackageCache
2020-01-21 12:51:25 +00:00
fi
2019-12-09 16:05:34 +00:00
# grepcidr is used to redact IPs in the debug log whereas expect is used
# to feed easy-rsa with passwords
PIVPN_DEPS = ( openvpn grepcidr expect)
2019-10-14 10:11:16 +00:00
installDependentPackages PIVPN_DEPS[ @]
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
installWireGuard( ) {
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
local PIVPN_DEPS
2019-11-19 16:29:41 +00:00
if [ " $PLAT " = "Raspbian" ] ; then
2019-10-14 13:06:34 +00:00
2020-01-30 13:16:39 +00:00
# If the running kernel is older than the kernel from the repo, dkms will
# install the module for the newer kernel therefore WireGuard will not start.
# Telling the user to update the whole system is probably the easiest way to
# handle this situation.
# This issue is very common for users that flash Raspbian and install PiVPN
# straight, so it's also a good suggestion in such case because they will have
# a lot of outdated packages.
2020-03-16 17:32:39 +00:00
INSTALLED_KERNEL = " $( apt-cache policy raspberrypi-kernel | grep -m1 'Installed: ' | grep -v '(none)' | awk '{print $2}' ) "
CANDIDATE_KERNEL = " $( apt-cache policy raspberrypi-kernel | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}' ) "
2020-01-30 13:16:39 +00:00
if dpkg --compare-versions " ${ CANDIDATE_KERNEL } " gt " ${ INSTALLED_KERNEL } " ; then
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: Installing WireGuard requires the latest kernel. Please upgrade all packages, reboot and run the script again."
echo "::: Commands:"
echo "::: sudo apt-get upgrade -y"
echo "::: sudo shutdown -r now"
2020-02-05 19:29:14 +00:00
echo "::: curl -L https://install.pivpn.io | bash"
2020-01-30 13:16:39 +00:00
exit 1
else
2020-07-23 12:08:06 +00:00
if ( whiptail --title "Install WireGuard" --yesno " Your Raspberry Pi is running kernel package ${ INSTALLED_KERNEL } , however the latest version is ${ CANDIDATE_KERNEL } .\n\nInstalling WireGuard requires the latest kernel, so to continue, first you need to upgrade all packages, then reboot, and then run the script again.\n\nProceed to the upgrade? " ${ r } ${ c } ) ; then
2020-01-30 13:16:39 +00:00
if command -v debconf-apt-progress & > /dev/null; then
# shellcheck disable=SC2086
$SUDO debconf-apt-progress -- ${ PKG_MANAGER } upgrade -y
else
$SUDO ${ PKG_MANAGER } upgrade -y
fi
if ( whiptail --title "Reboot" --yesno "You need to reboot after upgrading to run the new kernel.\n\nWould you like to reboot now?" ${ r } ${ c } ) ; then
2020-02-05 19:29:14 +00:00
whiptail --title "Rebooting" --msgbox "The system will now reboot.\n\nWhen you come back, just run the installation command again:\n\n curl -L https://install.pivpn.io | bash" ${ r } ${ c }
2020-01-30 13:16:39 +00:00
printf "\\nRebooting system...\\n"
$SUDO sleep 3
$SUDO shutdown -r now
else
exit 1
fi
else
echo "::: Can't continue without upgrading the system first, exiting..."
exit 1
fi
fi
fi
2020-03-04 11:48:14 +00:00
echo "::: Installing WireGuard from Debian package... "
2019-10-14 10:11:16 +00:00
2020-12-11 23:35:49 +00:00
if [ -z " $AVAILABLE_WIREGUARD " ] ; then
2020-03-04 11:48:14 +00:00
echo "::: Adding Raspbian repository... "
2020-09-14 10:25:31 +00:00
echo "deb http://raspbian.raspberrypi.org/raspbian/ bullseye main" | $SUDO tee /etc/apt/sources.list.d/pivpn-bullseye-repo.list > /dev/null
2019-10-14 13:06:34 +00:00
2020-03-10 13:14:16 +00:00
# Do not upgrade packages from the bullseye repository except for wireguard
printf 'Package: *\nPin: release n=bullseye\nPin-Priority: -1\n\nPackage: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-Priority: 100\n' | $SUDO tee /etc/apt/preferences.d/pivpn-limit-bullseye > /dev/null
2019-11-19 16:29:41 +00:00
2020-03-10 13:14:16 +00:00
echo "::: Updating package cache..."
# shellcheck disable=SC2086
2021-01-12 15:30:11 +00:00
updatePackageCache
2020-03-10 13:14:16 +00:00
fi
2019-11-16 16:02:15 +00:00
2020-03-04 11:48:14 +00:00
# qrencode is used to generate qrcodes from config file, for use with mobile clients
2020-09-14 10:25:31 +00:00
PIVPN_DEPS = ( raspberrypi-kernel-headers wireguard-tools wireguard-dkms qrencode)
2020-03-04 11:48:14 +00:00
installDependentPackages PIVPN_DEPS[ @]
2019-11-19 16:29:41 +00:00
elif [ " $PLAT " = "Debian" ] ; then
2019-10-14 13:06:34 +00:00
2019-11-07 16:29:21 +00:00
echo "::: Installing WireGuard from Debian package... "
2020-03-10 13:14:16 +00:00
2020-12-11 23:35:49 +00:00
if [ -z " $AVAILABLE_WIREGUARD " ] ; then
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
echo "::: Adding Debian repository... "
2020-09-14 10:25:31 +00:00
echo "deb https://deb.debian.org/debian/ bullseye main" | $SUDO tee /etc/apt/sources.list.d/pivpn-bullseye-repo.list > /dev/null
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2020-03-10 13:14:16 +00:00
printf 'Package: *\nPin: release n=bullseye\nPin-Priority: -1\n\nPackage: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-Priority: 100\n' | $SUDO tee /etc/apt/preferences.d/pivpn-limit-bullseye > /dev/null
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2020-03-10 13:14:16 +00:00
echo "::: Updating package cache..."
# shellcheck disable=SC2086
2021-01-12 15:30:11 +00:00
updatePackageCache
2020-03-10 13:14:16 +00:00
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2020-09-14 10:25:31 +00:00
PIVPN_DEPS = ( wireguard-tools qrencode)
if [ " $WIREGUARD_BUILTIN " -eq 0 ] ; then
# Explicitly install the module if not built-in
PIVPN_DEPS += ( linux-headers-amd64 wireguard-dkms)
fi
2019-10-14 13:06:34 +00:00
installDependentPackages PIVPN_DEPS[ @]
2019-11-19 16:29:41 +00:00
elif [ " $PLAT " = "Ubuntu" ] ; then
2020-03-10 13:14:16 +00:00
echo "::: Installing WireGuard... "
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2020-09-14 14:19:40 +00:00
PIVPN_DEPS = ( wireguard-tools qrencode)
2020-09-14 10:25:31 +00:00
if [ " $WIREGUARD_BUILTIN " -eq 0 ] ; then
PIVPN_DEPS += ( linux-headers-generic wireguard-dkms)
2020-03-10 13:14:16 +00:00
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
2019-11-19 16:29:41 +00:00
installDependentPackages PIVPN_DEPS[ @]
2019-10-14 10:11:16 +00:00
fi
2016-04-19 18:01:55 +00:00
}
2019-11-14 14:07:01 +00:00
askCustomProto( ) {
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $pivpnPROTO " ] ; then
echo "::: No TCP/IP protocol specified, using the default protocol udp"
pivpnPROTO = "udp"
else
pivpnPROTO = " ${ pivpnPROTO ,, } "
if [ " $pivpnPROTO " = "udp" ] || [ " $pivpnPROTO " = "tcp" ] ; then
echo " ::: Using the $pivpnPROTO protocol "
else
echo " :: $pivpnPROTO is not a supported TCP/IP protocol, please specify 'udp' or 'tcp' "
exit 1
fi
fi
2020-04-28 22:44:56 +00:00
echo " pivpnPROTO= ${ pivpnPROTO } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
2019-10-14 10:11:16 +00:00
fi
2016-09-27 12:24:14 +00:00
2020-06-07 11:59:51 +00:00
if [ " $CUSTOMIZE " -eq 0 ] ; then
if [ " $VPN " = "openvpn" ] ; then
pivpnPROTO = "udp"
echo " pivpnPROTO= ${ pivpnPROTO } " >> ${ tempsetupVarsFile }
return
fi
fi
2019-10-14 10:11:16 +00:00
# Set the available protocols into an array so it can be used with a whiptail dialog
2019-11-14 14:07:01 +00:00
if pivpnPROTO = $( whiptail --title "Protocol" --radiolist \
2019-10-14 10:11:16 +00:00
"Choose a protocol (press space to select). Please only choose TCP if you know why you need TCP." ${ r } ${ c } 2 \
"UDP" "" ON \
"TCP" "" OFF 3>& 1 1>& 2 2>& 3)
then
# Convert option into lowercase (UDP->udp)
2019-11-14 14:07:01 +00:00
pivpnPROTO = " ${ pivpnPROTO ,, } "
2019-10-14 10:11:16 +00:00
echo " ::: Using protocol: $pivpnPROTO "
2020-04-28 22:44:56 +00:00
echo " pivpnPROTO= ${ pivpnPROTO } " >> ${ tempsetupVarsFile }
2019-10-14 10:11:16 +00:00
else
echo "::: Cancel selected, exiting...."
exit 1
fi
}
2016-09-27 12:24:14 +00:00
2019-10-14 10:11:16 +00:00
askCustomPort( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $pivpnPORT " ] ; then
if [ " $VPN " = "wireguard" ] ; then
echo "::: No port specified, using the default port 51820"
pivpnPORT = 51820
elif [ " $VPN " = "openvpn" ] ; then
if [ " $pivpnPROTO " = "udp" ] ; then
echo "::: No port specified, using the default port 1194"
pivpnPORT = 1194
elif [ " $pivpnPROTO " = "tcp" ] ; then
echo "::: No port specified, using the default port 443"
pivpnPORT = 443
fi
fi
else
if [ [ " $pivpnPORT " = ~ ^[ 0-9] +$ ] ] && [ " $pivpnPORT " -ge 1 ] && [ " $pivpnPORT " -le 65535 ] ; then
echo " ::: Using port $pivpnPORT "
else
echo " ::: $pivpnPORT is not a valid port, use a port within the range [1,65535] (inclusive) "
exit 1
fi
fi
2020-04-28 22:44:56 +00:00
echo " pivpnPORT= ${ pivpnPORT } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
2019-10-14 10:11:16 +00:00
until [ [ $PORTNumCorrect = True ] ]
do
portInvalid = "Invalid"
2019-11-14 14:07:01 +00:00
if [ " $VPN " = "wireguard" ] ; then
2019-10-14 10:11:16 +00:00
DEFAULT_PORT = 51820
2019-11-14 14:07:01 +00:00
elif [ " $VPN " = "openvpn" ] ; then
2019-10-14 10:11:16 +00:00
if [ " $pivpnPROTO " = "udp" ] ; then
DEFAULT_PORT = 1194
else
DEFAULT_PORT = 443
fi
fi
2019-12-08 19:14:23 +00:00
if pivpnPORT = $( whiptail --title " Default $VPN Port " --inputbox " You can modify the default $VPN port. \\nEnter a new value or hit 'Enter' to retain the default " ${ r } ${ c } $DEFAULT_PORT 3>& 1 1>& 2 2>& 3)
2019-10-14 10:11:16 +00:00
then
if [ [ " $pivpnPORT " = ~ ^[ 0-9] +$ ] ] && [ " $pivpnPORT " -ge 1 ] && [ " $pivpnPORT " -le 65535 ] ; then
:
else
pivpnPORT = $portInvalid
fi
else
echo "::: Cancel selected, exiting...."
exit 1
fi
if [ [ $pivpnPORT = = " $portInvalid " ] ] ; then
2019-12-08 19:14:23 +00:00
whiptail --msgbox --backtitle "Invalid Port" --title "Invalid Port" "You entered an invalid Port number.\\n Please enter a number from 1 - 65535.\\n If you are not sure, please just keep the default." ${ r } ${ c }
2019-10-14 10:11:16 +00:00
PORTNumCorrect = False
else
2019-12-08 19:14:23 +00:00
if ( whiptail --backtitle "Specify Custom Port" --title "Confirm Custom Port Number" --yesno " Are these settings correct?\\n PORT: $pivpnPORT " ${ r } ${ c } ) then
2019-10-14 10:11:16 +00:00
PORTNumCorrect = True
else
# If the settings are wrong, the loop continues
PORTNumCorrect = False
fi
fi
done
# write out the port
2020-04-28 22:44:56 +00:00
echo " pivpnPORT= ${ pivpnPORT } " >> ${ tempsetupVarsFile }
2016-04-28 02:13:00 +00:00
}
2019-11-07 16:29:21 +00:00
askClientDNS( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $pivpnDNS1 " ] && [ -n " $pivpnDNS2 " ] ; then
pivpnDNS1 = " $pivpnDNS2 "
unset pivpnDNS2
elif [ -z " $pivpnDNS1 " ] && [ -z " $pivpnDNS2 " ] ; then
2019-12-24 09:18:11 +00:00
pivpnDNS1 = "9.9.9.9"
pivpnDNS2 = "149.112.112.112"
2020-01-03 16:43:23 +00:00
echo " ::: No DNS provider specified, using Quad9 DNS ( $pivpnDNS1 $pivpnDNS2 ) "
2019-11-14 14:07:01 +00:00
fi
local INVALID_DNS_SETTINGS = 0
if ! validIP " $pivpnDNS1 " ; then
INVALID_DNS_SETTINGS = 1
echo " ::: Invalid DNS $pivpnDNS1 "
fi
if [ -n " $pivpnDNS2 " ] && ! validIP " $pivpnDNS2 " ; then
INVALID_DNS_SETTINGS = 1
echo " ::: Invalid DNS $pivpnDNS2 "
fi
if [ " $INVALID_DNS_SETTINGS " -eq 0 ] ; then
echo " ::: Using DNS $pivpnDNS1 $pivpnDNS2 "
else
exit 1
fi
2020-04-28 22:44:56 +00:00
echo " pivpnDNS1= ${ pivpnDNS1 } " >> ${ tempsetupVarsFile }
echo " pivpnDNS2= ${ pivpnDNS2 } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
2019-11-07 16:29:21 +00:00
# Detect and offer to use Pi-hole
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if command -v pihole > /dev/null; then
2019-11-07 16:29:21 +00:00
if ( whiptail --backtitle "Setup PiVPN" --title "Pi-hole" --yesno "We have detected a Pi-hole installation, do you want to use it as the DNS server for the VPN, so you get ad blocking on the go?" ${ r } ${ c } ) ; then
2020-02-13 10:30:13 +00:00
if [ ! -r " $piholeSetupVars " ] ; then
echo " ::: Unable to read $piholeSetupVars "
exit 1
fi
# Add a custom hosts file for VPN clients so they appear as 'name.pivpn' in the
# Pi-hole dashboard as well as resolve by their names.
echo " addn-hosts=/etc/pivpn/hosts. $VPN " | $SUDO tee " $dnsmasqConfig " > /dev/null
# Then create an empty hosts file or clear if it exists.
2020-02-07 17:07:15 +00:00
$SUDO bash -c " > /etc/pivpn/hosts. $VPN "
2020-02-13 10:30:13 +00:00
2020-07-24 12:44:59 +00:00
# Setting Pi-hole to "Listen on all interfaces" allows dnsmasq to listen on the
# VPN interface while permitting queries only from hosts whose address is on
# the LAN and VPN subnets.
$SUDO pihole -a -i local
2020-02-13 10:30:13 +00:00
# Use the Raspberry Pi VPN IP as DNS server.
2019-12-27 14:48:42 +00:00
pivpnDNS1 = " $vpnGw "
2020-02-13 10:30:13 +00:00
2020-04-28 22:44:56 +00:00
echo " pivpnDNS1= ${ pivpnDNS1 } " >> ${ tempsetupVarsFile }
echo " pivpnDNS2= ${ pivpnDNS2 } " >> ${ tempsetupVarsFile }
2019-11-07 16:29:21 +00:00
return
fi
fi
2020-06-07 12:08:48 +00:00
DNSChoseCmd = ( whiptail --backtitle "Setup PiVPN" --title "DNS Provider" --separate-output --radiolist " Select the DNS Provider for your VPN Clients (press space to select).\nTo use your own, select Custom.\n\nIn case you have a local resolver running, i.e. unbound, select \"PiVPN-is-local-DNS\" and make sure your resolver is listening on \" $vpnGw \", allowing requests from \" ${ pivpnNET } / ${ subnetClass } \". " " ${ r } " " ${ c } " 6)
2019-12-24 09:18:11 +00:00
DNSChooseOptions = ( Quad9 "" on
2019-10-14 10:11:16 +00:00
OpenDNS "" off
Level3 "" off
DNS.WATCH "" off
Norton "" off
FamilyShield "" off
CloudFlare "" off
2019-12-24 09:18:11 +00:00
Google "" off
2019-12-08 15:13:26 +00:00
PiVPN-is-local-DNS "" off
2019-10-14 10:11:16 +00:00
Custom "" off)
if DNSchoices = $( " ${ DNSChoseCmd [@] } " " ${ DNSChooseOptions [@] } " 2>& 1 >/dev/tty)
then
if [ [ ${ DNSchoices } != "Custom" ] ] ; then
echo " ::: Using ${ DNSchoices } servers. "
2019-12-24 09:18:11 +00:00
declare -A DNS_MAP = ( [ "Quad9" ] = "9.9.9.9 149.112.112.112"
2019-10-14 10:11:16 +00:00
[ "OpenDNS" ] = "208.67.222.222 208.67.220.220"
[ "Level3" ] = "209.244.0.3 209.244.0.4"
[ "DNS.WATCH" ] = "84.200.69.80 84.200.70.40"
[ "Norton" ] = "199.85.126.10 199.85.127.10"
[ "FamilyShield" ] = "208.67.222.123 208.67.220.123"
2019-12-08 15:13:26 +00:00
[ "CloudFlare" ] = "1.1.1.1 1.0.0.1"
2019-12-24 09:18:11 +00:00
[ "Google" ] = "8.8.8.8 8.8.4.4"
2019-12-09 11:41:40 +00:00
[ "PiVPN-is-local-DNS" ] = " $vpnGw " )
2019-10-14 10:11:16 +00:00
pivpnDNS1 = $( awk '{print $1}' <<< " ${ DNS_MAP [ " ${ DNSchoices } " ] } " )
pivpnDNS2 = $( awk '{print $2}' <<< " ${ DNS_MAP [ " ${ DNSchoices } " ] } " )
else
until [ [ $DNSSettingsCorrect = True ] ] ; do
strInvalid = "Invalid"
2019-12-24 09:18:11 +00:00
if pivpnDNS = $( whiptail --backtitle "Specify Upstream DNS Provider(s)" --inputbox "Enter your desired upstream DNS provider(s), separated by a comma.\\n\\nFor example '1.1.1.1, 9.9.9.9'" ${ r } ${ c } "" 3>& 1 1>& 2 2>& 3)
2019-10-14 10:11:16 +00:00
then
pivpnDNS1 = $( echo " $pivpnDNS " | sed 's/[, \t]\+/,/g' | awk -F, '{print$1}' )
pivpnDNS2 = $( echo " $pivpnDNS " | sed 's/[, \t]\+/,/g' | awk -F, '{print$2}' )
if ! validIP " $pivpnDNS1 " || [ ! " $pivpnDNS1 " ] ; then
pivpnDNS1 = $strInvalid
fi
if ! validIP " $pivpnDNS2 " && [ " $pivpnDNS2 " ] ; then
pivpnDNS2 = $strInvalid
fi
else
echo "::: Cancel selected, exiting...."
exit 1
fi
if [ [ $pivpnDNS1 = = " $strInvalid " ] ] || [ [ $pivpnDNS2 = = " $strInvalid " ] ] ; then
2019-12-08 19:14:23 +00:00
whiptail --msgbox --backtitle "Invalid IP" --title "Invalid IP" " One or both entered IP addresses were invalid. Please try again.\\n\\n DNS Server 1: $pivpnDNS1 \\n DNS Server 2: $pivpnDNS2 " ${ r } ${ c }
2019-10-14 10:11:16 +00:00
if [ [ $pivpnDNS1 = = " $strInvalid " ] ] ; then
pivpnDNS1 = ""
fi
if [ [ $pivpnDNS2 = = " $strInvalid " ] ] ; then
pivpnDNS2 = ""
fi
DNSSettingsCorrect = False
else
2019-12-08 19:14:23 +00:00
if ( whiptail --backtitle "Specify Upstream DNS Provider(s)" --title "Upstream DNS Provider(s)" --yesno " Are these settings correct?\\n DNS Server 1: $pivpnDNS1 \\n DNS Server 2: $pivpnDNS2 " ${ r } ${ c } ) then
2019-10-14 10:11:16 +00:00
DNSSettingsCorrect = True
else
# If the settings are wrong, the loop continues
DNSSettingsCorrect = False
fi
fi
done
fi
else
echo "::: Cancel selected. Exiting..."
exit 1
fi
2020-04-28 22:44:56 +00:00
echo " pivpnDNS1= ${ pivpnDNS1 } " >> ${ tempsetupVarsFile }
echo " pivpnDNS2= ${ pivpnDNS2 } " >> ${ tempsetupVarsFile }
2016-04-23 22:18:48 +00:00
}
2019-11-14 14:07:01 +00:00
#Call this function to use a regex to check user input for a valid custom domain
validDomain( ) {
2020-05-23 13:26:03 +00:00
local domain = " $1 "
grep -qP '(?=^.{4,253}$)(^(?:[a-zA-Z0-9](?:(?:[a-zA-Z0-9\-]){0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$)' <<< " $domain "
2019-11-14 14:07:01 +00:00
}
2019-03-10 17:55:14 +00:00
#This procedure allows a user to specify a custom search domain if they have one.
2019-10-14 10:11:16 +00:00
askCustomDomain( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
2019-11-16 20:25:34 +00:00
if [ -n " $pivpnSEARCHDOMAIN " ] ; then
if validDomain " $pivpnSEARCHDOMAIN " ; then
echo " ::: Using custom domain $pivpnSEARCHDOMAIN "
2019-11-14 14:07:01 +00:00
else
2019-11-16 20:25:34 +00:00
echo " ::: Custom domain $pivpnSEARCHDOMAIN is not valid "
2019-11-14 14:07:01 +00:00
exit 1
fi
else
echo "::: Skipping custom domain"
fi
2020-04-28 22:44:56 +00:00
echo " pivpnSEARCHDOMAIN= ${ pivpnSEARCHDOMAIN } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
2020-06-07 11:59:51 +00:00
if [ " $CUSTOMIZE " -eq 0 ] ; then
if [ " $VPN " = "openvpn" ] ; then
echo " pivpnSEARCHDOMAIN= ${ pivpnSEARCHDOMAIN } " >> ${ tempsetupVarsFile }
return
fi
fi
2019-10-14 10:11:16 +00:00
DomainSettingsCorrect = False
2019-12-08 19:14:23 +00:00
if ( whiptail --backtitle "Custom Search Domain" --title "Custom Search Domain" --yesno --defaultno "Would you like to add a custom search domain? \\n (This is only for advanced users who have their own domain)\\n" ${ r } ${ c } ) ; then
2019-10-14 10:11:16 +00:00
until [ [ $DomainSettingsCorrect = True ] ]
do
2019-12-08 19:14:23 +00:00
if pivpnSEARCHDOMAIN = $( whiptail --inputbox "Enter Custom Domain\\nFormat: mydomain.com" ${ r } ${ c } --title "Custom Domain" 3>& 1 1>& 2 2>& 3) ; then
2019-11-16 20:25:34 +00:00
if validDomain " $pivpnSEARCHDOMAIN " ; then
2019-12-08 19:14:23 +00:00
if ( whiptail --backtitle "Custom Search Domain" --title "Custom Search Domain" --yesno " Are these settings correct?\\n Custom Search Domain: $pivpnSEARCHDOMAIN " ${ r } ${ c } ) ; then
2019-10-14 10:11:16 +00:00
DomainSettingsCorrect = True
else
# If the settings are wrong, the loop continues
DomainSettingsCorrect = False
fi
else
2019-12-08 19:14:23 +00:00
whiptail --msgbox --backtitle "Invalid Domain" --title "Invalid Domain" " Domain is invalid. Please try again.\\n\\n DOMAIN: $pivpnSEARCHDOMAIN \\n " ${ r } ${ c }
2019-10-14 10:11:16 +00:00
DomainSettingsCorrect = False
fi
else
echo "::: Cancel selected. Exiting..."
exit 1
fi
done
fi
2019-11-14 14:07:01 +00:00
2020-04-28 22:44:56 +00:00
echo " pivpnSEARCHDOMAIN= ${ pivpnSEARCHDOMAIN } " >> ${ tempsetupVarsFile }
2019-10-14 10:11:16 +00:00
}
askPublicIPOrDNS( ) {
if ! IPv4pub = $( dig +short myip.opendns.com @208.67.222.222) || ! validIP " $IPv4pub " ; then
echo "dig failed, now trying to curl checkip.amazonaws.com"
if ! IPv4pub = $( curl -s https://checkip.amazonaws.com) || ! validIP " $IPv4pub " ; then
echo "checkip.amazonaws.com failed, please check your internet connection/DNS"
exit 1
fi
fi
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $pivpnHOST " ] ; then
echo " ::: No IP or domain name specified, using public IP $IPv4pub "
pivpnHOST = " $IPv4pub "
else
if validIP " $pivpnHOST " ; then
echo " ::: Using public IP $pivpnHOST "
elif validDomain " $pivpnHOST " ; then
echo " ::: Using domain name $pivpnHOST "
else
echo " ::: $pivpnHOST is not a valid IP or domain name "
exit 1
fi
fi
2020-04-28 22:44:56 +00:00
echo " pivpnHOST= ${ pivpnHOST } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
local publicDNSCorrect
local publicDNSValid
if METH = $( whiptail --title "Public IP or DNS" --radiolist "Will clients use a Public IP or DNS Name to connect to your server (press space to select)?" ${ r } ${ c } 2 \
2019-10-14 10:11:16 +00:00
" $IPv4pub " "Use this public IP" "ON" \
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
"DNS Entry" "Use a public DNS" "OFF" 3>& 1 1>& 2 2>& 3) ; then
2019-10-14 10:11:16 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if [ " $METH " = " $IPv4pub " ] ; then
pivpnHOST = " ${ IPv4pub } "
else
until [ [ ${ publicDNSCorrect } = True ] ] ; do
2019-10-14 10:11:16 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
until [ [ ${ publicDNSValid } = True ] ] ; do
if PUBLICDNS = $( whiptail --title "PiVPN Setup" --inputbox "What is the public DNS name of this Server?" ${ r } ${ c } 3>& 1 1>& 2 2>& 3) ; then
if validDomain " $PUBLICDNS " ; then
publicDNSValid = True
pivpnHOST = " ${ PUBLICDNS } "
else
whiptail --msgbox --backtitle "PiVPN Setup" --title "Invalid DNS name" " This DNS name is invalid. Please try again.\\n\\n DNS name: $PUBLICDNS \\n " ${ r } ${ c }
publicDNSValid = False
fi
else
echo "::: Cancel selected. Exiting..."
exit 1
fi
done
if ( whiptail --backtitle "PiVPN Setup" --title "Confirm DNS Name" --yesno " Is this correct?\\n\\n Public DNS Name: $PUBLICDNS " ${ r } ${ c } ) then
publicDNSCorrect = True
else
publicDNSCorrect = False
publicDNSValid = False
fi
done
fi
2019-10-14 10:11:16 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
echo "::: Cancel selected. Exiting..."
exit 1
2019-10-14 10:11:16 +00:00
fi
2020-04-28 22:44:56 +00:00
echo " pivpnHOST= ${ pivpnHOST } " >> ${ tempsetupVarsFile }
2019-03-10 17:55:14 +00:00
}
2019-10-14 10:11:16 +00:00
askEncryption( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
2020-01-21 12:51:25 +00:00
2020-01-21 14:54:20 +00:00
if [ -z " $TWO_POINT_FOUR " ] || [ " $TWO_POINT_FOUR " -eq 1 ] ; then
TWO_POINT_FOUR = 1
2020-01-21 12:51:25 +00:00
echo "::: Using OpenVPN 2.4 features"
if [ -z " $pivpnENCRYPT " ] ; then
pivpnENCRYPT = 256
echo "::: Using a 256 bit certificate"
else
if [ " $pivpnENCRYPT " -eq 256 ] || [ " $pivpnENCRYPT " -eq 384 ] || [ " $pivpnENCRYPT " -eq 521 ] ; then
echo " ::: Using a ${ pivpnENCRYPT } -bit certificate "
else
echo " ::: ${ pivpnENCRYPT } is not a valid certificate size, use 256, 384, or 521 "
exit 1
fi
fi
2019-11-14 14:07:01 +00:00
else
2020-01-21 14:54:20 +00:00
TWO_POINT_FOUR = 0
2020-01-21 12:51:25 +00:00
echo "::: Using traditional OpenVPN configuration"
if [ -z " $pivpnENCRYPT " ] ; then
pivpnENCRYPT = 2048
echo "::: Using a 2048 bit certificate"
2019-11-14 14:07:01 +00:00
else
2020-01-21 12:51:25 +00:00
if [ " $pivpnENCRYPT " -eq 2048 ] || [ " $pivpnENCRYPT " -eq 3072 ] || [ " $pivpnENCRYPT " -eq 4096 ] ; then
echo " ::: Using a ${ pivpnENCRYPT } -bit certificate "
else
echo " ::: ${ pivpnENCRYPT } is not a valid certificate size, use 2048, 3072, or 4096 "
exit 1
fi
2019-11-14 14:07:01 +00:00
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if [ -z " $USE_PREDEFINED_DH_PARAM " ] ; then
USE_PREDEFINED_DH_PARAM = 1
echo "::: Pre-defined DH parameters will be used"
2020-01-21 12:51:25 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if [ " $USE_PREDEFINED_DH_PARAM " -eq 1 ] ; then
echo "::: Pre-defined DH parameters will be used"
else
echo "::: DH parameters will be generated locally"
fi
2020-01-21 12:51:25 +00:00
fi
2019-11-14 14:07:01 +00:00
fi
2020-04-28 22:44:56 +00:00
echo " TWO_POINT_FOUR= ${ TWO_POINT_FOUR } " >> ${ tempsetupVarsFile }
echo " pivpnENCRYPT= ${ pivpnENCRYPT } " >> ${ tempsetupVarsFile }
echo " USE_PREDEFINED_DH_PARAM= ${ USE_PREDEFINED_DH_PARAM } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
2020-06-07 11:59:51 +00:00
if [ " $CUSTOMIZE " -eq 0 ] ; then
if [ " $VPN " = "openvpn" ] ; then
TWO_POINT_FOUR = 1
pivpnENCRYPT = 256
echo " TWO_POINT_FOUR= ${ TWO_POINT_FOUR } " >> ${ tempsetupVarsFile }
echo " pivpnENCRYPT= ${ pivpnENCRYPT } " >> ${ tempsetupVarsFile }
echo " USE_PREDEFINED_DH_PARAM= ${ USE_PREDEFINED_DH_PARAM } " >> ${ tempsetupVarsFile }
return
fi
fi
2020-01-21 12:51:25 +00:00
if ( whiptail --backtitle "Setup OpenVPN" --title "Installation mode" --yesno "OpenVPN 2.4 can take advantage of Elliptic Curves to provide higher connection speed and improved security over RSA, while keeping smaller certificates.\\n\\nMoreover, the 'tls-crypt' directive encrypts the certificates being used while authenticating, increasing privacy.\\n\\nIf your clients do run OpenVPN 2.4 or later you can enable these features, otherwise choose 'No' for best compatibility." " ${ r } " " ${ c } " ) ; then
2020-01-21 14:54:20 +00:00
TWO_POINT_FOUR = 1
2020-01-21 12:51:25 +00:00
pivpnENCRYPT = $( whiptail --backtitle "Setup OpenVPN" --title "ECDSA certificate size" --radiolist \
"Choose the desired size of your certificate (press space to select):\\nThis is a certificate that will be generated on your system. The larger the certificate, the more time this will take. For most applications, it is recommended to use 256 bits. You can increase the number of bits if you care about, however, consider that 256 bits are already as secure as 3072 bit RSA." ${ r } ${ c } 3 \
"256" "Use a 256-bit certificate (recommended level)" ON \
"384" "Use a 384-bit certificate" OFF \
"521" "Use a 521-bit certificate (paranoid level)" OFF 3>& 1 1>& 2 2>& 3)
else
2020-01-21 14:54:20 +00:00
TWO_POINT_FOUR = 0
2020-01-21 12:51:25 +00:00
pivpnENCRYPT = $( whiptail --backtitle "Setup OpenVPN" --title "RSA certificate size" --radiolist \
"Choose the desired size of your certificate (press space to select):\\nThis is a certificate that will be generated on your system. The larger the certificate, the more time this will take. For most applications, it is recommended to use 2048 bits. If you are paranoid about ... things... then grab a cup of joe and pick 4096 bits." ${ r } ${ c } 3 \
2019-10-14 10:11:16 +00:00
"2048" "Use a 2048-bit certificate (recommended level)" ON \
"3072" "Use a 3072-bit certificate " OFF \
"4096" "Use a 4096-bit certificate (paranoid level)" OFF 3>& 1 1>& 2 2>& 3)
2020-01-21 12:51:25 +00:00
fi
2019-10-14 10:11:16 +00:00
exitstatus = $?
if [ $exitstatus != 0 ] ; then
echo "::: Cancel selected. Exiting..."
exit 1
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if ( [ " $pivpnENCRYPT " -ge 2048 ] && whiptail --backtitle "Setup OpenVPN" --title "Generate Diffie-Hellman Parameters" --yesno "Generating DH parameters can take many hours on a Raspberry Pi. You can instead use Pre-defined DH parameters recommended by the Internet Engineering Task Force.\\n\\nMore information about those can be found here: https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups\\n\\nIf you want unique parameters, choose 'No' and new Diffie-Hellman parameters will be generated on your device." ${ r } ${ c } ) ; then
USE_PREDEFINED_DH_PARAM = 1
2019-10-14 10:11:16 +00:00
else
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
USE_PREDEFINED_DH_PARAM = 0
2019-10-14 10:11:16 +00:00
fi
2020-04-28 22:44:56 +00:00
echo " TWO_POINT_FOUR= ${ TWO_POINT_FOUR } " >> ${ tempsetupVarsFile }
echo " pivpnENCRYPT= ${ pivpnENCRYPT } " >> ${ tempsetupVarsFile }
echo " USE_PREDEFINED_DH_PARAM= ${ USE_PREDEFINED_DH_PARAM } " >> ${ tempsetupVarsFile }
2019-10-14 10:11:16 +00:00
}
2020-02-16 08:09:09 +00:00
cidrToMask( ) {
# Source: https://stackoverflow.com/a/20767392
set -- $(( 5 - ( $1 / 8 ) )) 255 255 255 255 $(( ( 255 << ( 8 - ( $1 % 8 )) ) & 255 ) ) 0 0 0
[ $1 -gt 1 ] && shift $1 || shift
echo ${ 1 -0 } .${ 2 -0 } .${ 3 -0 } .${ 4 -0 }
}
2019-10-14 10:11:16 +00:00
confOpenVPN( ) {
# Grab the existing Hostname
host_name = $( hostname -s)
# Generate a random UUID for this server so that we can use verify-x509-name later that is unique for this server installation.
NEW_UUID = $( </proc/sys/kernel/random/uuid)
# Create a unique server name using the host name and UUID
SERVER_NAME = " ${ host_name } _ ${ NEW_UUID } "
2019-11-16 13:58:58 +00:00
# Backup the openvpn folder
OPENVPN_BACKUP = " openvpn_ $( date +%Y-%m-%d-%H%M%S) .tar.gz "
echo " ::: Backing up the openvpn folder to /etc/ ${ OPENVPN_BACKUP } "
2020-02-10 16:58:32 +00:00
CURRENT_UMASK = $( umask )
umask 0077
2019-11-18 11:42:04 +00:00
$SUDO tar czf " /etc/ ${ OPENVPN_BACKUP } " /etc/openvpn & > /dev/null
2020-02-10 16:58:32 +00:00
umask " $CURRENT_UMASK "
2019-11-16 13:58:58 +00:00
if [ -f /etc/openvpn/server.conf ] ; then
$SUDO rm /etc/openvpn/server.conf
fi
2020-02-09 17:51:30 +00:00
if [ -d /etc/openvpn/ccd ] ; then
$SUDO rm -rf /etc/openvpn/ccd
fi
# Create folder to store client specific directives used to push static IPs
$SUDO mkdir /etc/openvpn/ccd
2019-10-14 10:11:16 +00:00
# If easy-rsa exists, remove it
if [ [ -d /etc/openvpn/easy-rsa/ ] ] ; then
$SUDO rm -rf /etc/openvpn/easy-rsa/
fi
# Get easy-rsa
2020-06-06 13:39:37 +00:00
wget -qO- " ${ easyrsaRel } " | $SUDO tar xz --one-top-level= /etc/openvpn/easy-rsa --strip-components 1
if ! test -s /etc/openvpn/easy-rsa/easyrsa; then
echo " $0 : ERR: Failed to download EasyRSA. "
exit 1
fi
2019-10-14 10:11:16 +00:00
# fix ownership
$SUDO chown -R root:root /etc/openvpn/easy-rsa
$SUDO mkdir /etc/openvpn/easy-rsa/pki
2019-11-16 13:58:58 +00:00
$SUDO chmod 700 /etc/openvpn/easy-rsa/pki
2019-10-14 10:11:16 +00:00
2020-01-08 01:12:13 +00:00
cd /etc/openvpn/easy-rsa || exit 1
2019-10-14 10:11:16 +00:00
2020-01-21 14:54:20 +00:00
if [ " $TWO_POINT_FOUR " -eq 1 ] ; then
2020-01-21 12:51:25 +00:00
pivpnCERT = "ec"
pivpnTLSPROT = "tls-crypt"
else
pivpnCERT = "rsa"
pivpnTLSPROT = "tls-auth"
fi
2019-10-14 10:11:16 +00:00
# Write out new vars file
echo " if [ -z \"\$EASYRSA_CALLER\" ]; then
echo \" Nope.\" >& 2
return 1
2016-12-04 05:20:37 +00:00
fi
2019-10-14 10:11:16 +00:00
set_var EASYRSA \" /etc/openvpn/easy-rsa\"
set_var EASYRSA_PKI \" \$ EASYRSA/pki\"
2018-09-04 10:06:52 +00:00
set_var EASYRSA_CRL_DAYS 3650
2020-01-21 12:51:25 +00:00
set_var EASYRSA_ALGO ${ pivpnCERT } " | $SUDO tee vars >/dev/null
# Set certificate type
if [ " $pivpnENCRYPT " -ge 2048 ] ; then
echo " set_var EASYRSA_KEY_SIZE ${ pivpnENCRYPT } " | $SUDO tee -a vars >/dev/null
else
declare -A ECDSA_MAP = ( [ "256" ] = "prime256v1" [ "384" ] = "secp384r1" [ "521" ] = "secp521r1" )
echo " set_var EASYRSA_CURVE ${ ECDSA_MAP [ " ${ pivpnENCRYPT } " ] } " | $SUDO tee -a vars >/dev/null
fi
2019-10-14 10:11:16 +00:00
# Remove any previous keys
${ SUDOE } ./easyrsa --batch init-pki
# Build the certificate authority
2019-12-08 19:14:23 +00:00
printf "::: Building CA...\\n"
2019-10-14 10:11:16 +00:00
${ SUDOE } ./easyrsa --batch build-ca nopass
2019-12-08 19:14:23 +00:00
printf "\\n::: CA Complete.\\n"
2019-10-14 10:11:16 +00:00
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if [ " $pivpnCERT " = "rsa" ] && [ " $USE_PREDEFINED_DH_PARAM " -ne 1 ] ; then
2020-01-21 12:51:25 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: The server key, Diffie-Hellman parameters, and HMAC key will now be generated."
else
whiptail --msgbox --backtitle "Setup OpenVPN" --title "Server Information" "The server key, Diffie-Hellman parameters, and HMAC key will now be generated." ${ r } ${ c }
fi
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
elif [ " $pivpnCERT " = "ec" ] || { [ " $pivpnCERT " = "rsa" ] && [ " $USE_PREDEFINED_DH_PARAM " -eq 1 ] ; } ; then
2020-01-21 12:51:25 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: The server key and HMAC key will now be generated."
else
whiptail --msgbox --backtitle "Setup OpenVPN" --title "Server Information" "The server key and HMAC key will now be generated." ${ r } ${ c }
fi
2019-11-14 16:42:56 +00:00
fi
2019-10-14 10:11:16 +00:00
# Build the server
2019-12-08 19:14:23 +00:00
EASYRSA_CERT_EXPIRE = 3650 ${ SUDOE } ./easyrsa build-server-full " ${ SERVER_NAME } " nopass
2019-10-14 10:11:16 +00:00
2020-01-21 12:51:25 +00:00
if [ " $pivpnCERT " = "rsa" ] ; then
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
if [ " ${ USE_PREDEFINED_DH_PARAM } " -eq 1 ] ; then
# Use Diffie-Hellman parameters from RFC 7919 (FFDHE)
${ SUDOE } install -m 644 " ${ pivpnFilesDir } " /files/etc/openvpn/easy-rsa/pki/ffdhe" ${ pivpnENCRYPT } " .pem pki/dh" ${ pivpnENCRYPT } " .pem
2020-01-21 12:51:25 +00:00
else
# Generate Diffie-Hellman key exchange
${ SUDOE } ./easyrsa gen-dh
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
${ SUDOE } mv pki/dh.pem pki/dh" ${ pivpnENCRYPT } " .pem
2020-01-21 12:51:25 +00:00
fi
2019-10-14 10:11:16 +00:00
fi
# Generate static HMAC key to defend against DDoS
${ SUDOE } openvpn --genkey --secret pki/ta.key
# Generate an empty Certificate Revocation List
${ SUDOE } ./easyrsa gen-crl
${ SUDOE } cp pki/crl.pem /etc/openvpn/crl.pem
2019-12-08 19:41:11 +00:00
if ! getent passwd openvpn; then
2019-12-29 17:25:35 +00:00
${ SUDOE } adduser --system --home /var/lib/openvpn/ --group --disabled-login ${ debianOvpnUserGroup % : * }
2019-12-08 15:39:46 +00:00
fi
2019-12-08 19:41:11 +00:00
${ SUDOE } chown " $debianOvpnUserGroup " /etc/openvpn/crl.pem
2019-10-14 10:11:16 +00:00
# Write config file for server using the template.txt file
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
$SUDO install -m 644 " $pivpnFilesDir " /files/etc/openvpn/server_config.txt /etc/openvpn/server.conf
2019-10-14 10:11:16 +00:00
# Apply client DNS settings
${ SUDOE } sed -i '0,/\(dhcp-option DNS \)/ s/\(dhcp-option DNS \).*/\1' ${ pivpnDNS1 } '\"/' /etc/openvpn/server.conf
if [ -z ${ pivpnDNS2 } ] ; then
${ SUDOE } sed -i '/\(dhcp-option DNS \)/{n;N;d}' /etc/openvpn/server.conf
else
${ SUDOE } sed -i '0,/\(dhcp-option DNS \)/! s/\(dhcp-option DNS \).*/\1' ${ pivpnDNS2 } '\"/' /etc/openvpn/server.conf
fi
# Set the user encryption key size
2019-12-08 19:14:23 +00:00
$SUDO sed -i " s#\\(dh /etc/openvpn/easy-rsa/pki/dh\\).*#\\1 ${ pivpnENCRYPT } .pem# " /etc/openvpn/server.conf
2019-10-14 10:11:16 +00:00
2020-01-21 12:51:25 +00:00
if [ " $pivpnTLSPROT " = "tls-crypt" ] ; then
#If they enabled 2.4 use tls-crypt instead of tls-auth to encrypt control channel
$SUDO sed -i "s/tls-auth \/etc\/openvpn\/easy-rsa\/pki\/ta.key 0/tls-crypt \/etc\/openvpn\/easy-rsa\/pki\/ta.key/" /etc/openvpn/server.conf
fi
if [ " $pivpnCERT " = "ec" ] ; then
#If they enabled 2.4 disable dh parameters and specify the matching curve from the ECDSA certificate
$SUDO sed -i " s/\(dh \/etc\/openvpn\/easy-rsa\/pki\/dh\).*/dh none\necdh-curve ${ ECDSA_MAP [ " ${ pivpnENCRYPT } " ] } / " /etc/openvpn/server.conf
elif [ " $pivpnCERT " = "rsa" ] ; then
# Otherwise set the user encryption key size
$SUDO sed -i " s#\\(dh /etc/openvpn/easy-rsa/pki/dh\\).*#\\1 ${ pivpnENCRYPT } .pem# " /etc/openvpn/server.conf
fi
2020-02-16 08:09:09 +00:00
# if they modified VPN network put value in server.conf
if [ " $pivpnNET " != "10.8.0.0" ] ; then
$SUDO sed -i " s/10.8.0.0/ ${ pivpnNET } /g " /etc/openvpn/server.conf
fi
# if they modified VPN subnet class put value in server.conf
if [ " $( cidrToMask " $subnetClass " ) " != "255.255.255.0" ] ; then
$SUDO sed -i " s/255.255.255.0/ $( cidrToMask " $subnetClass " ) /g " /etc/openvpn/server.conf
fi
2019-10-14 10:11:16 +00:00
# if they modified port put value in server.conf
if [ " $pivpnPORT " != 1194 ] ; then
$SUDO sed -i " s/1194/ ${ pivpnPORT } /g " /etc/openvpn/server.conf
fi
# if they modified protocol put value in server.conf
if [ " $pivpnPROTO " != "udp" ] ; then
$SUDO sed -i "s/proto udp/proto tcp/g" /etc/openvpn/server.conf
fi
2019-11-16 20:25:34 +00:00
if [ -n " $pivpnSEARCHDOMAIN " ] ; then
2019-12-08 19:14:23 +00:00
$SUDO sed -i " 0,/\\(.*dhcp-option.*\\)/s//push \"dhcp-option DOMAIN ${ pivpnSEARCHDOMAIN } \" \\n&/ " /etc/openvpn/server.conf
2019-11-14 14:07:01 +00:00
fi
2019-10-14 10:11:16 +00:00
# write out server certs to conf file
2019-12-08 19:14:23 +00:00
$SUDO sed -i " s#\\(key /etc/openvpn/easy-rsa/pki/private/\\).*#\\1 ${ SERVER_NAME } .key# " /etc/openvpn/server.conf
$SUDO sed -i " s#\\(cert /etc/openvpn/easy-rsa/pki/issued/\\).*#\\1 ${ SERVER_NAME } .crt# " /etc/openvpn/server.conf
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
confOVPN( ) {
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
$SUDO install -m 644 " $pivpnFilesDir " /files/etc/openvpn/easy-rsa/pki/Default.txt /etc/openvpn/easy-rsa/pki/Default.txt
2019-10-14 10:11:16 +00:00
$SUDO sed -i 's/IPv4pub/' " $pivpnHOST " '/' /etc/openvpn/easy-rsa/pki/Default.txt
# if they modified port put value in Default.txt for clients to use
if [ " $pivpnPORT " != 1194 ] ; then
$SUDO sed -i -e " s/1194/ ${ pivpnPORT } /g " /etc/openvpn/easy-rsa/pki/Default.txt
fi
# if they modified protocol put value in Default.txt for clients to use
if [ " $pivpnPROTO " != "udp" ] ; then
$SUDO sed -i -e "s/proto udp/proto tcp/g" /etc/openvpn/easy-rsa/pki/Default.txt
fi
2016-05-03 14:32:17 +00:00
2019-10-14 10:11:16 +00:00
# verify server name to strengthen security
$SUDO sed -i " s/SRVRNAME/ ${ SERVER_NAME } / " /etc/openvpn/easy-rsa/pki/Default.txt
2020-01-21 12:51:25 +00:00
if [ " $pivpnTLSPROT " = "tls-crypt" ] ; then
#If they enabled 2.4 remove key-direction options since it's not required
$SUDO sed -i "/key-direction 1/d" /etc/openvpn/easy-rsa/pki/Default.txt
fi
2016-05-03 14:32:17 +00:00
}
2019-10-14 10:11:16 +00:00
confWireGuard( ) {
2020-10-24 11:41:07 +00:00
# Reload job type is not yet available in wireguard-tools shipped with Ubuntu 20.04
2020-12-05 10:35:56 +00:00
if ! grep -q 'ExecReload' /lib/systemd/system/wg-quick@.service; then
2020-10-24 11:41:07 +00:00
echo "::: Adding additional reload job type for wg-quick unit"
2020-10-25 10:37:59 +00:00
$SUDO install -D -m 644 " ${ pivpnFilesDir } " /files/etc/systemd/system/wg-quick@.service.d/override.conf /etc/systemd/system/wg-quick@.service.d/override.conf
2020-10-24 11:41:07 +00:00
$SUDO systemctl daemon-reload
fi
2019-10-14 13:06:34 +00:00
if [ -d /etc/wireguard ] ; then
2019-11-16 13:58:58 +00:00
# Backup the wireguard folder
WIREGUARD_BACKUP = " wireguard_ $( date +%Y-%m-%d-%H%M%S) .tar.gz "
echo " ::: Backing up the wireguard folder to /etc/ ${ WIREGUARD_BACKUP } "
2020-02-10 16:58:32 +00:00
CURRENT_UMASK = $( umask )
umask 0077
2019-11-18 11:42:04 +00:00
$SUDO tar czf " /etc/ ${ WIREGUARD_BACKUP } " /etc/wireguard & > /dev/null
2020-02-10 16:58:32 +00:00
umask " $CURRENT_UMASK "
2019-11-16 13:58:58 +00:00
if [ -f /etc/wireguard/wg0.conf ] ; then
$SUDO rm /etc/wireguard/wg0.conf
fi
else
# If compiled from source, the wireguard folder is not being created
2019-10-14 13:06:34 +00:00
$SUDO mkdir /etc/wireguard
fi
2019-11-16 13:58:58 +00:00
# Ensure that only root is able to enter the wireguard folder
$SUDO chown root:root /etc/wireguard
$SUDO chmod 700 /etc/wireguard
2019-11-14 16:42:56 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
2020-04-21 08:52:35 +00:00
echo "::: The Server Keys will now be generated."
2019-11-14 16:42:56 +00:00
else
2020-04-21 08:52:35 +00:00
whiptail --title "Server Information" --msgbox "The Server Keys will now be generated." " ${ r } " " ${ c } "
2019-11-14 14:07:01 +00:00
fi
2019-12-29 17:25:35 +00:00
# Remove configs and keys folders to make space for a new server when using 'Repair' or 'Reconfigure'
# over an existing installation
$SUDO rm -rf /etc/wireguard/configs
$SUDO rm -rf /etc/wireguard/keys
2019-11-16 13:58:58 +00:00
$SUDO mkdir -p /etc/wireguard/configs
2019-10-14 10:11:16 +00:00
$SUDO touch /etc/wireguard/configs/clients.txt
2019-11-16 13:58:58 +00:00
$SUDO mkdir -p /etc/wireguard/keys
2019-10-14 10:11:16 +00:00
# Generate private key and derive public key from it
wg genkey | $SUDO tee /etc/wireguard/keys/server_priv & > /dev/null
$SUDO cat /etc/wireguard/keys/server_priv | wg pubkey | $SUDO tee /etc/wireguard/keys/server_pub & > /dev/null
2020-04-21 08:52:35 +00:00
echo "::: Server Keys have been generated."
2019-10-14 10:11:16 +00:00
echo " [Interface]
PrivateKey = $( $SUDO cat /etc/wireguard/keys/server_priv)
2019-12-09 11:41:40 +00:00
Address = ${ vpnGw } /${ subnetClass }
2019-10-14 10:11:16 +00:00
ListenPort = ${ pivpnPORT } " | $SUDO tee /etc/wireguard/wg0.conf &> /dev/null
echo "::: Server config generated."
2016-04-19 18:01:55 +00:00
}
2019-10-14 10:11:16 +00:00
confNetwork( ) {
# Enable forwarding of internet traffic
$SUDO sed -i '/net.ipv4.ip_forward=1/s/^#//g' /etc/sysctl.conf
2019-11-18 11:42:04 +00:00
$SUDO sysctl -p > /dev/null
2019-10-14 10:11:16 +00:00
2019-12-29 17:25:35 +00:00
if [ " $USING_UFW " -eq 1 ] ; then
echo "::: Detected UFW is enabled."
echo "::: Adding UFW rules..."
### Basic safeguard: if file is empty, there's been something weird going on.
### Note: no safeguard against imcomplete content as a result of previous failures.
if test -s /etc/ufw/before.rules; then
$SUDO cp -f /etc/ufw/before.rules /etc/ufw/before.rules.pre-pivpn
2019-10-14 10:11:16 +00:00
else
2019-12-29 17:25:35 +00:00
echo " $0 : ERR: Sorry, won't touch empty file \"/etc/ufw/before.rules\". " ;
exit 1;
fi
### If there is already a "*nat" section just add our POSTROUTING MASQUERADE
if $SUDO grep -q "*nat" /etc/ufw/before.rules; then
### Onyl add the NAT rule if it isn't already there
if ! $SUDO grep -q " ${ VPN } -nat-rule " /etc/ufw/before.rules; then
$SUDO sed " /^*nat/{n;s/\(:POSTROUTING ACCEPT .*\)/\1\n-I POSTROUTING -s ${ pivpnNET } \/ ${ subnetClass } -o ${ IPv4dev } -j MASQUERADE -m comment --comment ${ VPN } -nat-rule/} " -i /etc/ufw/before.rules
2019-12-10 15:49:40 +00:00
fi
2019-12-29 17:25:35 +00:00
else
$SUDO sed " /delete these required/i *nat\n:POSTROUTING ACCEPT [0:0]\n-I POSTROUTING -s ${ pivpnNET } \/ ${ subnetClass } -o ${ IPv4dev } -j MASQUERADE -m comment --comment ${ VPN } -nat-rule\nCOMMIT\n " -i /etc/ufw/before.rules
2019-10-14 10:11:16 +00:00
fi
2019-12-29 17:25:35 +00:00
# Insert rules at the beginning of the chain (in case there are other rules that may drop the traffic)
$SUDO ufw insert 1 allow " ${ pivpnPORT } " /" ${ pivpnPROTO } " >/dev/null
$SUDO ufw route insert 1 allow in on " ${ pivpnDEV } " from " ${ pivpnNET } / ${ subnetClass } " out on " ${ IPv4dev } " to any >/dev/null
$SUDO ufw reload >/dev/null
echo "::: UFW configuration completed."
elif [ " $USING_UFW " -eq 0 ] ; then
2019-10-14 10:11:16 +00:00
# Now some checks to detect which rules we need to add. On a newly installed system all policies
# should be ACCEPT, so the only required rule would be the MASQUERADE one.
2019-12-29 17:25:35 +00:00
if ! $SUDO iptables -t nat -S | grep -q " ${ VPN } -nat-rule " ; then
$SUDO iptables -t nat -I POSTROUTING -s " ${ pivpnNET } / ${ subnetClass } " -o " ${ IPv4dev } " -j MASQUERADE -m comment --comment " ${ VPN } -nat-rule "
fi
2019-10-14 10:11:16 +00:00
# Count how many rules are in the INPUT and FORWARD chain. When parsing input from
# iptables -S, '^-P' skips the policies and 'ufw-' skips ufw chains (in case ufw was found
# installed but not enabled).
# Grep returns non 0 exit code where there are no matches, however that would make the script exit,
# for this reasons we use '|| true' to force exit code 0
INPUT_RULES_COUNT = " $( $SUDO iptables -S INPUT | grep -vcE '(^-P|ufw-)' ) "
FORWARD_RULES_COUNT = " $( $SUDO iptables -S FORWARD | grep -vcE '(^-P|ufw-)' ) "
INPUT_POLICY = " $( $SUDO iptables -S INPUT | grep '^-P' | awk '{print $3}' ) "
FORWARD_POLICY = " $( $SUDO iptables -S FORWARD | grep '^-P' | awk '{print $3}' ) "
# If rules count is not zero, we assume we need to explicitly allow traffic. Same conclusion if
# there are no rules and the policy is not ACCEPT. Note that rules are being added to the top of the
# chain (using -I).
if [ " $INPUT_RULES_COUNT " -ne 0 ] || [ " $INPUT_POLICY " != "ACCEPT" ] ; then
2020-01-20 20:51:36 +00:00
if $SUDO iptables -S | grep -q " ${ VPN } -input-rule " ; then
2019-12-29 17:25:35 +00:00
INPUT_CHAIN_EDITED = 0
else
$SUDO iptables -I INPUT 1 -i " ${ IPv4dev } " -p " ${ pivpnPROTO } " --dport " ${ pivpnPORT } " -j ACCEPT -m comment --comment " ${ VPN } -input-rule "
fi
2019-10-14 10:11:16 +00:00
INPUT_CHAIN_EDITED = 1
else
INPUT_CHAIN_EDITED = 0
fi
if [ " $FORWARD_RULES_COUNT " -ne 0 ] || [ " $FORWARD_POLICY " != "ACCEPT" ] ; then
2020-01-20 20:51:36 +00:00
if $SUDO iptables -S | grep -q " ${ VPN } -forward-rule " ; then
2019-12-29 17:25:35 +00:00
FORWARD_CHAIN_EDITED = 0
else
$SUDO iptables -I FORWARD 1 -d " ${ pivpnNET } / ${ subnetClass } " -i " ${ IPv4dev } " -o " ${ pivpnDEV } " -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT -m comment --comment " ${ VPN } -forward-rule "
$SUDO iptables -I FORWARD 2 -s " ${ pivpnNET } / ${ subnetClass } " -i " ${ pivpnDEV } " -o " ${ IPv4dev } " -j ACCEPT -m comment --comment " ${ VPN } -forward-rule "
fi
2019-10-14 10:11:16 +00:00
FORWARD_CHAIN_EDITED = 1
else
FORWARD_CHAIN_EDITED = 0
fi
case ${ PLAT } in
2019-11-19 16:29:41 +00:00
Debian| Raspbian| Ubuntu)
2019-10-14 10:11:16 +00:00
$SUDO iptables-save | $SUDO tee /etc/iptables/rules.v4 > /dev/null
; ;
esac
2020-04-28 22:44:56 +00:00
echo " INPUT_CHAIN_EDITED= ${ INPUT_CHAIN_EDITED } " >> ${ tempsetupVarsFile }
echo " FORWARD_CHAIN_EDITED= ${ FORWARD_CHAIN_EDITED } " >> ${ tempsetupVarsFile }
2019-10-14 10:11:16 +00:00
2019-12-29 17:25:35 +00:00
fi
2016-04-19 18:01:55 +00:00
}
2018-04-02 10:07:58 +00:00
confLogging( ) {
2019-11-16 13:58:58 +00:00
echo " if \$programname == 'ovpn-server' then /var/log/openvpn.log
2019-03-03 09:18:45 +00:00
if \$ programname = = 'ovpn-server' then stop" | $SUDO tee /etc/rsyslog.d/30-openvpn.conf > /dev/null
2018-02-15 09:14:03 +00:00
2018-04-02 10:07:58 +00:00
echo " /var/log/openvpn.log
2018-02-15 09:14:03 +00:00
{
2019-10-14 10:11:16 +00:00
rotate 4
weekly
missingok
notifempty
compress
delaycompress
sharedscripts
postrotate
invoke-rc.d rsyslog rotate >/dev/null 2>& 1 || true
endscript
2018-04-02 10:07:58 +00:00
} " | $SUDO tee /etc/logrotate.d/openvpn > /dev/null
2018-02-15 09:14:03 +00:00
2019-11-16 13:58:58 +00:00
# Restart the logging service
2019-10-14 10:11:16 +00:00
case ${ PLAT } in
2019-11-19 16:29:41 +00:00
Debian| Raspbian| Ubuntu)
2019-10-14 10:11:16 +00:00
$SUDO systemctl restart rsyslog.service || true
; ;
esac
2018-02-15 09:14:03 +00:00
}
2017-03-13 04:00:28 +00:00
2019-12-29 17:25:35 +00:00
restartServices( ) {
echo "::: Restarting services..."
case ${ PLAT } in
Debian| Raspbian| Ubuntu)
if [ " $VPN " = "openvpn" ] ; then
$SUDO systemctl enable openvpn.service & > /dev/null
$SUDO systemctl restart openvpn.service
elif [ " $VPN " = "wireguard" ] ; then
$SUDO systemctl enable wg-quick@wg0.service & > /dev/null
$SUDO systemctl restart wg-quick@wg0.service
fi
; ;
esac
}
2019-10-14 10:11:16 +00:00
askUnattendedUpgrades( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
if [ -z " $UNATTUPG " ] ; then
UNATTUPG = 1
echo "::: No preference regarding unattended upgrades, assuming yes"
else
if [ " $UNATTUPG " -eq 1 ] ; then
echo "::: Enabling unattended upgrades"
else
echo "::: Skipping unattended upgrades"
fi
fi
2020-04-28 22:44:56 +00:00
echo " UNATTUPG= ${ UNATTUPG } " >> ${ tempsetupVarsFile }
2019-11-14 14:07:01 +00:00
return
fi
2019-12-08 19:14:23 +00:00
whiptail --msgbox --backtitle "Security Updates" --title "Unattended Upgrades" "Since this server will have at least one port open to the internet, it is recommended you enable unattended-upgrades.\\nThis feature will check daily for security package updates only and apply them when necessary.\\nIt will NOT automatically reboot the server so to fully apply some updates you should periodically reboot." ${ r } ${ c }
2017-03-13 04:00:28 +00:00
2019-10-14 10:11:16 +00:00
if ( whiptail --backtitle "Security Updates" --title "Unattended Upgrades" --yesno "Do you want to enable unattended upgrades of security patches to this server?" ${ r } ${ c } ) ; then
UNATTUPG = 1
else
UNATTUPG = 0
fi
2017-03-13 04:00:28 +00:00
2020-04-28 22:44:56 +00:00
echo " UNATTUPG= ${ UNATTUPG } " >> ${ tempsetupVarsFile }
2017-03-13 04:00:28 +00:00
}
2019-10-14 10:11:16 +00:00
confUnattendedUpgrades( ) {
2019-12-08 19:14:23 +00:00
local PIVPN_DEPS
Merge test (#929)
* added link to server status dashboard
* Replaced Header with bold instead
* More safeguards, some fixes, standardized some code, WireGuard update script, removed redundant code
- Add curl as a dependency for those who run the script without 'curl URL | bash'.
- Use POSIX 'command -v' instead of 'hash'.
- Check if packages have actually been installed and abort execution if they have not.
- Fixed issue with getStaticIPv4Settings() that prevented existing network settings
to be used as static IP settings when running the script unattended with empty
$IPv4addr and $IPv4gw variables.
- Exit if processing wireguard-linux-compat fails.
- Exit if 50unattended-upgrades fails to extract.
- Exit clientSTAT.sh if the wg0 interface is not available.
- Moved the Self Check to a single script since dedicated versions were very similar.
- Add 'pivpn -wg' to update WireGuard for users running Raspbian with armv6l kernel.
* Fixed cosmetic issue with spinner, added missing spinner to some APT commands
* Detect current netmask, validate user input when configuring a static IP
* Inform the user when updating the package cache, which can be slow on some RPis
* Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct
* Restart pihole in the more appropriate restartServices() function
* Improve static IP selection, validate public DNS name of the server
- Default to 'No' when asking if the RPi has DHCP reservation, considered
that the user may not be fully aware, furthermore, setting a static IP
anyways doesn't do harm.
- Validate existing IPv4 settings (address, gateway, DNS) to avoid filling
'/etc/dhcpcd.conf' with invalid data.
- Validate public DNS name of the server inside askPublicIPOrDNS() function
* Check DH parameters, fix 'pivpn -c', improvements when dealing with external repositories
- Added a basic sanity check to downloaded DH paramenters, which doubles as a
check for missing .pem file.
- Fix 'pivpn -c' showing the month number instead of the day of the month when
using WireGuard.
- Removing APT keys is risky, it would break APT update/upgrade if the user
already was already using the unstable repo.
- Replaced 'Checking for $i... installed' in favor of a more clear 'Checking for
$i... already installed'.
- Check whether the OpenVPN repo and the Debian unstable repo are already used.
* Improvements to getStaticIPv4Settings()
- Use a regular expression to extract IPs from the 'ip' command. With this,
there is a little need to validate output. Even though the regex will match
invalid IPs like 192.168.23.444, 'ip' can't return them, and even if it did,
the script would not have reached this function due to previous functions
using the network with broken routes and addresses.
- Get the IP address from the selected interface rather then from the 'ip route'
command as it's not guaranteed that such IP is the same of the interface the
user decided to use (though on a Raspberry Pi inside a home LAN, most likely
it is, but it also maskes easier to get the IP in the CIDR notation with a
single 'ip | grep' pipe).
* Moved command substitution to specific functions to avoid unnecessary execution
- Moved $availableInterfaces and $CurrentIPv4gw from the script header to
their relevant function, considered that if the OS is not Raspbian a static
IP is not set, so those variables are not used.
* Copy files from git repo using the 'install' command, switch DH params from 2ton.com.au to RFC 7919
- Now using DH parameters suggested by the RFC 7919 for use by TLS servers (the user can
still generate his own if he wishes).
https://wiki.mozilla.org/Security/Archive/Server_Side_TLS_4.0#Pre-defined_DHE_groups
2020-01-31 15:40:09 +00:00
PIVPN_DEPS = ( unattended-upgrades)
2019-11-16 13:58:58 +00:00
installDependentPackages PIVPN_DEPS[ @]
2020-07-23 09:07:19 +00:00
aptConfDir = "/etc/apt/apt.conf.d"
2019-11-14 14:07:01 +00:00
2019-11-19 16:29:41 +00:00
if [ " $PLAT " = "Ubuntu" ] ; then
2017-03-13 06:44:29 +00:00
2019-11-19 16:29:41 +00:00
# Ubuntu 50unattended-upgrades should already just have security enabled
# so we just need to configure the 10periodic file
echo " APT::Periodic::Update-Package-Lists \"1\";
APT::Periodic::Download-Upgradeable-Packages \" 1\" ;
APT::Periodic::AutocleanInterval \" 5\" ;
2019-12-08 19:14:23 +00:00
APT::Periodic::Unattended-Upgrade \" 1\" ; " | $SUDO tee " ${ aptConfDir } /10periodic" > /dev/null
2019-11-19 16:29:41 +00:00
else
2019-11-16 13:58:58 +00:00
2020-07-23 09:07:19 +00:00
# Raspbian's unattended-upgrades package downloads Debian's config, so we copy over the proper config
# Source: https://github.com/mvo5/unattended-upgrades/blob/master/data/50unattended-upgrades.Raspbian
2019-11-19 16:29:41 +00:00
if [ " $PLAT " = "Raspbian" ] ; then
2020-07-23 09:07:19 +00:00
$SUDO install -m 644 " ${ pivpnFilesDir } /files ${ aptConfDir } /50unattended-upgrades.Raspbian " " ${ aptConfDir } /50unattended-upgrades "
2019-11-19 16:29:41 +00:00
fi
# Add the remaining settings for all other distributions
echo " APT::Periodic::Enable \"1\";
2019-11-16 13:58:58 +00:00
APT::Periodic::Update-Package-Lists \" 1\" ;
APT::Periodic::Download-Upgradeable-Packages \" 1\" ;
APT::Periodic::Unattended-Upgrade \" 1\" ;
APT::Periodic::AutocleanInterval \" 7\" ;
2019-12-08 19:14:23 +00:00
APT::Periodic::Verbose \" 0\" ; " | $SUDO tee " ${ aptConfDir } /02periodic" > /dev/null
2019-11-19 16:29:41 +00:00
fi
2020-03-04 11:48:14 +00:00
# Enable automatic updates via the bullseye repository when installing from debian package
if [ " $VPN " = "wireguard" ] ; then
2020-09-14 10:25:31 +00:00
if [ -f /etc/apt/sources.list.d/pivpn-bullseye-repo.list ] ; then
2020-03-04 11:48:14 +00:00
if ! grep -q " \"o= $PLAT ,n=bullseye\"; " " ${ aptConfDir } /50unattended-upgrades " ; then
$SUDO sed -i " /Unattended-Upgrade::Origins-Pattern {/a\"o= $PLAT ,n=bullseye\"; " " ${ aptConfDir } /50unattended-upgrades "
fi
2019-11-19 16:29:41 +00:00
fi
fi
2016-04-19 18:01:55 +00:00
}
2019-10-14 14:51:43 +00:00
installScripts( ) {
2020-05-28 10:09:02 +00:00
# Ensure /opt exists (issue #607)
$SUDO mkdir -p /opt
2020-05-27 14:36:26 +00:00
if [ [ ${ VPN } = = 'wireguard' ] ] ; then
othervpn = 'openvpn'
else
othervpn = 'wireguard'
fi
# Symlink scripts from /usr/local/src/pivpn to their various locations
2020-05-01 23:06:09 +00:00
echo -n -e " ::: Installing scripts to ${ pivpnScriptDir } ...\n "
2020-05-13 19:49:48 +00:00
2020-05-27 14:36:26 +00:00
# if the other protocol file exists it has been installed
if [ -r " ${ setupConfigDir } / ${ othervpn } / ${ setupVarsFile } " ] ; then
# Both are installed, no bash completion, unlink if already there
$SUDO unlink /etc/bash_completion.d/pivpn
# Unlink the protocol specific pivpn script and symlink the common
# script to the location instead
$SUDO unlink /usr/local/bin/pivpn
2020-12-05 11:28:14 +00:00
$SUDO ln -sf -T " ${ pivpnFilesDir } /scripts/pivpn " /usr/local/bin/pivpn
2020-05-13 19:49:48 +00:00
else
2020-05-27 14:36:26 +00:00
# Only one protocol is installed, symlink bash completion, the pivpn script
# and the script directory
2020-12-05 11:28:14 +00:00
$SUDO ln -sf -T " ${ pivpnFilesDir } /scripts/ ${ VPN } /bash-completion " /etc/bash_completion.d/pivpn
$SUDO ln -sf -T " ${ pivpnFilesDir } /scripts/ ${ VPN } /pivpn.sh " /usr/local/bin/pivpn
$SUDO ln -sf " ${ pivpnFilesDir } /scripts/ " " ${ pivpnScriptDir } "
2020-05-27 14:36:26 +00:00
# shellcheck disable=SC1091
. /etc/bash_completion.d/pivpn
fi
2019-10-14 10:11:16 +00:00
echo " done."
}
2017-03-13 04:00:28 +00:00
2019-10-14 10:11:16 +00:00
displayFinalMessage( ) {
2019-11-14 14:07:01 +00:00
if [ " ${ runUnattended } " = 'true' ] ; then
echo "::: Installation Complete!"
2020-05-04 23:05:10 +00:00
echo "::: Now run 'pivpn add' to create the client profiles."
2019-11-14 16:42:56 +00:00
echo "::: Run 'pivpn help' to see what else you can do!"
echo
echo "::: If you run into any issue, please read all our documentation carefully."
echo "::: All incomplete posts or bug reports will be ignored or deleted."
echo
echo "::: Thank you for using PiVPN."
2019-11-14 14:07:01 +00:00
echo "::: It is strongly recommended you reboot after installation."
return
fi
2019-10-14 10:11:16 +00:00
# Final completion message to user
2020-05-04 23:05:10 +00:00
whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" " Now run 'pivpn add' to create the client profiles.
2019-12-08 19:14:23 +00:00
Run 'pivpn help' to see what else you can do !\\ n\\ nIf you run into any issue, please read all our documentation carefully.
All incomplete posts or bug reports will be ignored or deleted.\\ n\\ nThank you for using PiVPN." ${ r } ${ c }
2019-10-14 10:11:16 +00:00
if ( whiptail --title "Reboot" --yesno --defaultno "It is strongly recommended you reboot after installation. Would you like to reboot now?" ${ r } ${ c } ) ; then
whiptail --title "Rebooting" --msgbox "The system will now reboot." ${ r } ${ c }
2019-12-08 19:14:23 +00:00
printf "\\nRebooting system...\\n"
2019-10-14 10:11:16 +00:00
$SUDO sleep 3
$SUDO shutdown -r now
fi
2017-03-13 04:00:28 +00:00
}
2016-12-24 05:20:45 +00:00
2019-10-14 10:11:16 +00:00
main " $@ "